Changeset 32416 in webkit

Timestamp:

Apr 22, 2008 5:45:53 PM (16 years ago)

Author:

hyatt@apple.com

Message:

2008-04-22 David Hyatt <​hyatt@apple.com>

Fix for bug 18688, background-color stopped painting on inlines. Fix a virtual function
misnaming that led to the derived class not getting called properly.

Reviewed by Mark Rowe

• ChangeLog:
• rendering/InlineFlowBox.cpp: (WebCore::InlineFlowBox::paintFillLayer):
• rendering/RenderObject.h: (WebCore::RenderObject::paintFillLayerExtended):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineFlowBox.cpp (modified) (2 diffs)
• rendering/RenderObject.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-22  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 18688, background-color stopped painting on inlines.  Fix a virtual function
+        misnaming that led to the derived class not getting called properly.
+
+        Reviewed by Mark Rowe
+
+        * ChangeLog:
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::paintFillLayer):
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::paintFillLayerExtended):
+
 2008-04-22  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/rendering/InlineFlowBox.cpp

@@ -668 +668 @@
     bool hasFillImage = img && img->canRender(object()->style()->effectiveZoom());
     if ((!hasFillImage && !object()->style()->hasBorderRadius()) || (!prevLineBox() && !nextLineBox()) || !parent())
-        object()->paintFillExtended(paintInfo, c, fillLayer, my, mh, tx, ty, w, h, this);
+        object()->paintFillLayerExtended(paintInfo, c, fillLayer, my, mh, tx, ty, w, h, this);
     else {
         // We have a fill image that spans multiple lines.
@@ -687 +687 @@
         paintInfo.context->save();
         paintInfo.context->clip(IntRect(tx, ty, width(), height()));
-        object()->paintFillExtended(paintInfo, c, fillLayer, my, mh, startX, ty, totalWidth, h, this);
+        object()->paintFillLayerExtended(paintInfo, c, fillLayer, my, mh, startX, ty, totalWidth, h, this);
         paintInfo.context->restore();
     }

trunk/WebCore/rendering/RenderObject.h

@@ -477 +477 @@
     virtual void paintBoxDecorations(PaintInfo&, int tx, int ty) { }
     virtual void paintMask(PaintInfo&, int tx, int ty) { }
-    virtual void paintFillExtended(const PaintInfo&, const Color&, const FillLayer*,
-                                   int clipy, int cliph, int tx, int ty, int width, int height,
-                                   InlineFlowBox* box = 0) { }
+    virtual void paintFillLayerExtended(const PaintInfo&, const Color&, const FillLayer*,
+                                        int clipy, int cliph, int tx, int ty, int width, int height,
+                                        InlineFlowBox* box = 0) { }