Changeset 151555 in webkit

Timestamp:

Jun 13, 2013 9:50:40 AM (11 years ago)

Author:

mvujovic@adobe.com

Message:

[CSS Regions] -webkit-background-clip: text; does not clip the background in regions
​https://bugs.webkit.org/show_bug.cgi?id=117566

Reviewed by Alexandru Chiculita.

Source/WebCore:

This patch enables -webkit-background-clip: text; on regions.

Test: fast/regions/webkit-background-clip-text.html

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::paintFlowThreadPortionInRegion):

Force black text if we're in the text clip paint phase. This makes sure the text's alpha
channel does not affect the final opacity of the background clipping result. Rather,
the text's alpha channel affects the amount of blending between the text color
and the background.

• rendering/RenderRegion.cpp:

(WebCore::shouldPaintRegionContentsInPhase):

Factor out a function to check if we should paint the region contents in a particular
phase. Add "PaintPhaseTextClip" so that we draw the contents in the text clipping phase.

(WebCore::RenderRegion::paintObject):

Call shouldPaintRegionContentsInPhase instead of doing the phase checks directly in this
function. Move, update, and clarify the surrounding comments.

LayoutTests:

• fast/regions/webkit-background-clip-text-expected.html: Added.
• fast/regions/webkit-background-clip-text.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/webkit-background-clip-text-expected.html (added)
• LayoutTests/fast/regions/webkit-background-clip-text.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderRegion.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-06-13  Max Vujovic  <mvujovic@adobe.com>
+
+        [CSS Regions] -webkit-background-clip: text; does not clip the background in regions
+        https://bugs.webkit.org/show_bug.cgi?id=117566
+
+        Reviewed by Alexandru Chiculita.
+
+        * fast/regions/webkit-background-clip-text-expected.html: Added.
+        * fast/regions/webkit-background-clip-text.html: Added.
+
 2013-06-13  Yuki Sekiguchi  <yuki.sekiguchi@access-company.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-13  Max Vujovic  <mvujovic@adobe.com>
+
+        [CSS Regions] -webkit-background-clip: text; does not clip the background in regions
+        https://bugs.webkit.org/show_bug.cgi?id=117566
+
+        Reviewed by Alexandru Chiculita.
+
+        This patch enables -webkit-background-clip: text; on regions.
+
+        Test: fast/regions/webkit-background-clip-text.html
+
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::paintFlowThreadPortionInRegion):
+            Force black text if we're in the text clip paint phase. This makes sure the text's alpha
+            channel does not affect the final opacity of the background clipping result. Rather,
+            the text's alpha channel affects the amount of blending between the text color
+            and the background.
+        * rendering/RenderRegion.cpp:
+        (WebCore::shouldPaintRegionContentsInPhase):
+            Factor out a function to check if we should paint the region contents in a particular
+            phase. Add "PaintPhaseTextClip" so that we draw the contents in the text clipping phase.
+        (WebCore::RenderRegion::paintObject):
+            Call shouldPaintRegionContentsInPhase instead of doing the phase checks directly in this
+            function. Move, update, and clarify the surrounding comments.
+
 2013-06-13  Anton Obzhirov  <a.obzhirov@samsung.com>
 

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -304 +304 @@
         info.rect.moveBy(-adjustedPaintOffset);
         
-        layer()->paint(context, info.rect, 0, 0, region, RenderLayer::PaintLayerTemporaryClipRects);
+        PaintBehavior paintBehavior = 0;
+        if (info.phase == PaintPhaseTextClip)
+            paintBehavior |= PaintBehaviorForceBlackText;
+
+        layer()->paint(context, info.rect, paintBehavior, 0, region, RenderLayer::PaintLayerTemporaryClipRects);
 
         context->restore();

trunk/Source/WebCore/rendering/RenderRegion.cpp

@@ -152 +152 @@
 }
 
+static bool shouldPaintRegionContentsInPhase(PaintPhase phase)
+{
+    return phase == PaintPhaseBlockBackground
+        || phase == PaintPhaseChildBlockBackground
+        || phase == PaintPhaseSelection
+        || phase == PaintPhaseTextClip;
+}
+
 void RenderRegion::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
@@ -162 +170 @@
         return;
 
-    // Delegate painting of content in region to RenderFlowThread.
-    // RenderFlowThread is a self painting layer (being a positioned object) who is painting its children, the collected objects.
-    // Since we do not want to paint the flow thread content multiple times (for each painting phase of the region object),
-    // we allow the flow thread painting only for the selection and the background phase.
-    if (paintInfo.phase != PaintPhaseBlockBackground && paintInfo.phase != PaintPhaseChildBlockBackground && paintInfo.phase != PaintPhaseSelection)
-        return;
-
+    // We do not want to paint a region's contents multiple times (for each paint phase of the region object).
+    // Thus, we only paint the region's contents in certain phases.
+    if (!shouldPaintRegionContentsInPhase(paintInfo.phase))
+        return;
+
+    // Delegate the painting of a region's contents to RenderFlowThread.
+    // RenderFlowThread is a self painting layer because it's a positioned object.
+    // RenderFlowThread paints its children, the collected objects.
     setRegionObjectsRegionStyle();
     m_flowThread->paintFlowThreadPortionInRegion(paintInfo, this, flowThreadPortionRect(), flowThreadPortionOverflowRect(), LayoutPoint(paintOffset.x() + borderLeft() + paddingLeft(), paintOffset.y() + borderTop() + paddingTop()));