[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 9c864317d872073e831e368ecdba6a2acc915490
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 24 01:51:17 2003 +0000

    	Fix opacity to respect clipping.
    
            Reviewed by rjw
    
            * khtml/rendering/render_layer.cpp:
            (RenderLayer::paint):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4699 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0d50ba0..5f9ae38 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-07-23  Dave Hyatt  <hyatt at apple.com>
+
+	Fix opacity to respect clipping.
+	
+        Reviewed by rjw
+
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::paint):
+
 2003-07-23  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0d50ba0..5f9ae38 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-07-23  Dave Hyatt  <hyatt at apple.com>
+
+	Fix opacity to respect clipping.
+	
+        Reviewed by rjw
+
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::paint):
+
 2003-07-23  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index 1298e9e..b3864cc 100644
--- a/WebCore/khtml/rendering/render_layer.cpp
+++ b/WebCore/khtml/rendering/render_layer.cpp
@@ -621,10 +621,8 @@ RenderLayer::paint(QPainter *p, int x, int y, int w, int h, bool selectionOnly)
         // bounds.  This is really disgusting (that paint only sets up the right paint
         // position after you call into it). -dwh
         //printf("Painting layer at %d %d\n", elt->absBounds.x(), elt->absBounds.y());
-    
-        // This is called to update our transparency state.
-        updateTransparentState(p, elt->layer, currentTransparentLayer);
-        
+
+        bool updatedTransparentState = false;
         if (elt->clipOriginator) {
             // We originated a clip (we're either positioned or an element with
             // overflow: hidden).  We need to paint our background and border, subject
@@ -632,7 +630,11 @@ RenderLayer::paint(QPainter *p, int x, int y, int w, int h, bool selectionOnly)
             if (elt->backgroundClipRect != currRect) {
                 if (currRect != paintRect)
                     p->restore(); // Pop the clip.
-                    
+
+                // This is called to update our transparency state.
+                updateTransparentState(p, elt->layer, currentTransparentLayer);
+                updatedTransparentState = true;
+                
                 currRect = elt->backgroundClipRect;
                 
                 // Now apply the clip rect.
@@ -671,6 +673,12 @@ RenderLayer::paint(QPainter *p, int x, int y, int w, int h, bool selectionOnly)
         if (elt->clipRect != currRect) {
             if (currRect != paintRect)
                 p->restore(); // Pop the clip.
+
+            if (!updatedTransparentState) {
+                // This is called to update our transparency state.
+                updateTransparentState(p, elt->layer, currentTransparentLayer);
+                updatedTransparentState = true;
+            }
             
             currRect = elt->clipRect;
             if (currRect != paintRect) {
@@ -692,6 +700,12 @@ RenderLayer::paint(QPainter *p, int x, int y, int w, int h, bool selectionOnly)
             }
         }
 
+        if (!updatedTransparentState) {
+            // This is called to update our transparency state.
+            updateTransparentState(p, elt->layer, currentTransparentLayer);
+            updatedTransparentState = true;
+        }
+        
         if (currRect.isEmpty())
             continue;
         

-- 
WebKit Debian packaging