Changeset 176147 in webkit

Timestamp:

Nov 14, 2014 4:26:56 PM (9 years ago)

Author:

Alan Bujtas

Message:

Remove computeTextPaintStyle's RenderText dependency.
​https://bugs.webkit.org/show_bug.cgi?id=138754

Reviewed by Simon Fraser.

So that we can compute text paint style across renderers in simple line layout.

No change in functionality.

• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::paint):

• rendering/SimpleLineLayoutFunctions.cpp:

(WebCore::SimpleLineLayout::paintFlow):

• rendering/TextPaintStyle.cpp:

(WebCore::computeTextPaintStyle):

• rendering/TextPaintStyle.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineTextBox.cpp (modified) (1 diff)
• rendering/SimpleLineLayoutFunctions.cpp (modified) (1 diff)
• rendering/TextPaintStyle.cpp (modified) (3 diffs)
• rendering/TextPaintStyle.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-14  Zalan Bujtas  <zalan@apple.com>
+
+        Remove computeTextPaintStyle's RenderText dependency.
+        https://bugs.webkit.org/show_bug.cgi?id=138754
+
+        Reviewed by Simon Fraser.
+
+        So that we can compute text paint style across renderers in simple line layout.
+
+        No change in functionality.
+
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::paint):
+        * rendering/SimpleLineLayoutFunctions.cpp:
+        (WebCore::SimpleLineLayout::paintFlow):
+        * rendering/TextPaintStyle.cpp:
+        (WebCore::computeTextPaintStyle):
+        * rendering/TextPaintStyle.h:
+
 2014-11-14  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -531 +531 @@
 
     // Determine the text colors and selection colors.
-    TextPaintStyle textPaintStyle = computeTextPaintStyle(renderer(), lineStyle, paintInfo);
+    TextPaintStyle textPaintStyle = computeTextPaintStyle(renderer().frame(), lineStyle, paintInfo);
 
     bool paintSelectedTextOnly;

trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp

@@ -68 +68 @@
         return;
 
-    RenderText& textRenderer = downcast<RenderText>(*flow.firstChild());
-    ASSERT(!textRenderer.firstTextBox());
-
     bool debugBordersEnabled = flow.frame().settings().simpleLineLayoutDebugBordersEnabled();
 
     GraphicsContext& context = *paintInfo.context;
-
     const Font& font = style.font();
-    TextPaintStyle textPaintStyle = computeTextPaintStyle(textRenderer, style, paintInfo);
+    TextPaintStyle textPaintStyle = computeTextPaintStyle(flow.frame(), style, paintInfo);
     GraphicsContextStateSaver stateSaver(context, textPaintStyle.strokeWidth > 0);
 

trunk/Source/WebCore/rendering/TextPaintStyle.cpp

@@ -75 +75 @@
 }
 
-TextPaintStyle computeTextPaintStyle(const RenderText& renderer, const RenderStyle& lineStyle, const PaintInfo& paintInfo)
+TextPaintStyle computeTextPaintStyle(const Frame& frame, const RenderStyle& lineStyle, const PaintInfo& paintInfo)
 {
     TextPaintStyle paintStyle(lineStyle.colorSpace());
@@ -92 +92 @@
 
     if (lineStyle.insideDefaultButton()) {
-        Page* page = renderer.frame().page();
+        Page* page = frame.page();
         if (page && page->focusController().isActive()) {
-            paintStyle.fillColor = renderer.theme().systemColor(CSSValueActivebuttontext);
+            paintStyle.fillColor = page->theme().systemColor(CSSValueActivebuttontext);
             return paintStyle;
         }
@@ -102 +102 @@
 
     bool forceBackgroundToWhite = false;
-    if (renderer.document().printing()) {
+    if (frame.document() && frame.document()->printing()) {
         if (lineStyle.printColorAdjust() == PrintColorAdjustEconomy)
             forceBackgroundToWhite = true;
-        if (renderer.frame().settings().shouldPrintBackgrounds())
+        if (frame.settings().shouldPrintBackgrounds())
             forceBackgroundToWhite = false;
     }

trunk/Source/WebCore/rendering/TextPaintStyle.h

@@ -32 +32 @@
 namespace WebCore {
 
+class Frame;
 class GraphicsContext;
 class RenderText;
@@ -52 +53 @@
 };
 
-TextPaintStyle computeTextPaintStyle(const RenderText&, const RenderStyle&, const PaintInfo&);
+TextPaintStyle computeTextPaintStyle(const Frame&, const RenderStyle&, const PaintInfo&);
 TextPaintStyle computeTextSelectionPaintStyle(const TextPaintStyle&, const RenderText&, const RenderStyle&, const PaintInfo&, bool& paintSelectedTextOnly, bool& paintSelectedTextSeparately, const ShadowData*& selectionShadow);