[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 be4840d5ad28c5d063a8b16b28b7e84bcb0197d4
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 3 23:18:17 2003 +0000

    	Fix for 3471314, make sure to check the outline phase before painting backgrounds of iframes.
    
            Reviewed by mjs
    
            * khtml/rendering/render_replaced.cpp:
            (RenderReplaced::paint):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5371 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 97c47ee..fd7c88e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-11-03  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3471314, make sure to check the outline phase before painting backgrounds of iframes.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_replaced.cpp:
+        (RenderReplaced::paint):
+
+2003-11-03  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3470855, links with script action stay focused when clicking.
 
 	Fix for 3470858, clicking and dragging a link and then releasing doesn't clear the glow ring.
diff --git a/WebCore/khtml/rendering/render_replaced.cpp b/WebCore/khtml/rendering/render_replaced.cpp
index 2ab7864..bfecb45 100644
--- a/WebCore/khtml/rendering/render_replaced.cpp
+++ b/WebCore/khtml/rendering/render_replaced.cpp
@@ -72,7 +72,7 @@ void RenderReplaced::paint(QPainter *p, int _x, int _y, int _w, int _h,
     if((_tx >= _x + _w) || (_tx + m_width <= _x))
         return;
 
-    if(shouldPaintBackgroundOrBorder()) 
+    if(shouldPaintBackgroundOrBorder() && paintAction != PaintActionOutline) 
         paintBoxDecorations(p, _x, _y, _w, _h, _tx, _ty);
 
     paintObject(p, _x, _y, _w, _h, _tx, _ty, paintAction);

-- 
WebKit Debian packaging