Changeset 167810 in webkit

Timestamp:

Apr 25, 2014 10:58:19 AM (10 years ago)

Author:

stavila@adobe.com

Message:

[CSS Regions] Rename objectShouldPaintInFlowRegion to something more clear
​https://bugs.webkit.org/show_bug.cgi?id=132050

Reviewed by Andreas Kling.

The objectShouldPaintInFlowRegion is no longer used only by the painting process
but also for hit-testing, so it was renamed to something more generic (objectShouldFragmentInFlowRegion).

No new tests required, it's just a method rename.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::paint):
(WebCore::RenderBlock::selectionGaps):
(WebCore::RenderBlock::nodeAtPoint):

• rendering/RenderBox.cpp:

(WebCore::RenderBox::positionForPoint):

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::objectShouldFragmentInFlowRegion):
(WebCore::RenderFlowThread::objectShouldPaintInFlowRegion): Deleted.

• rendering/RenderFlowThread.h:
• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::paintLayer):
(WebCore::RenderLayer::hitTestLayer):

• rendering/RenderRegion.cpp:

(WebCore::RenderRegion::ensureOverflowForBox):

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::shouldPaint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (3 diffs)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderFlowThread.cpp (modified) (1 diff)
• rendering/RenderFlowThread.h (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (2 diffs)
• rendering/RenderRegion.cpp (modified) (1 diff)
• rendering/RenderReplaced.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-25  Radu Stavila  <stavila@adobe.com>
+
+        [CSS Regions] Rename objectShouldPaintInFlowRegion to something more clear
+        https://bugs.webkit.org/show_bug.cgi?id=132050
+
+        Reviewed by Andreas Kling.
+
+        The objectShouldPaintInFlowRegion is no longer used only by the painting process
+        but also for hit-testing, so it was renamed to something more generic (objectShouldFragmentInFlowRegion).
+
+        No new tests required, it's just a method rename.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paint):
+        (WebCore::RenderBlock::selectionGaps):
+        (WebCore::RenderBlock::nodeAtPoint):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::positionForPoint):
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::objectShouldFragmentInFlowRegion):
+        (WebCore::RenderFlowThread::objectShouldPaintInFlowRegion): Deleted.
+        * rendering/RenderFlowThread.h:
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::paintLayer):
+        (WebCore::RenderLayer::hitTestLayer):
+        * rendering/RenderRegion.cpp:
+        (WebCore::RenderRegion::ensureOverflowForBox):
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::shouldPaint):
+
 2014-04-25  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1793 +1793 @@
 
     // Check our region range to make sure we need to be painting in this region.
-    if (paintInfo.renderNamedFlowFragment && !paintInfo.renderNamedFlowFragment->flowThread()->objectShouldPaintInFlowRegion(this, paintInfo.renderNamedFlowFragment))
+    if (paintInfo.renderNamedFlowFragment && !paintInfo.renderNamedFlowFragment->flowThread()->objectShouldFragmentInFlowRegion(this, paintInfo.renderNamedFlowFragment))
         return;
 
@@ -2416 +2416 @@
     if (paintInfo && paintInfo->renderNamedFlowFragment && paintInfo->paintContainer->isRenderFlowThread()) {
         // Make sure the current object is actually flowed into the region being painted.
-        if (!toRenderFlowThread(paintInfo->paintContainer)->objectShouldPaintInFlowRegion(this, paintInfo->renderNamedFlowFragment))
+        if (!toRenderFlowThread(paintInfo->paintContainer)->objectShouldFragmentInFlowRegion(this, paintInfo->renderNamedFlowFragment))
             return result;
     }
@@ -2959 +2959 @@
         RenderFlowThread* flowThread = flowThreadContainingBlock();
         ASSERT(flowThread);
-        if (!flowThread->objectShouldPaintInFlowRegion(this, locationInContainer.region()))
+        if (!flowThread->objectShouldFragmentInFlowRegion(this, locationInContainer.region()))
             return false;
     }

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -4160 +4160 @@
         if (isRenderFlowThread()) {
             ASSERT(region);
-            if (!toRenderFlowThread(this)->objectShouldPaintInFlowRegion(renderObject, region))
+            if (!toRenderFlowThread(this)->objectShouldFragmentInFlowRegion(renderObject, region))
                 continue;
         }

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -805 +805 @@
 }
 
-bool RenderFlowThread::objectShouldPaintInFlowRegion(const RenderObject* object, const RenderRegion* region) const
+bool RenderFlowThread::objectShouldFragmentInFlowRegion(const RenderObject* object, const RenderRegion* region) const
 {
     ASSERT(object);

trunk/Source/WebCore/rendering/RenderFlowThread.h

@@ -142 +142 @@
     
     // Check if the object should be painted in this region and if the region is part of this flow thread.
-    bool objectShouldPaintInFlowRegion(const RenderObject*, const RenderRegion*) const;
+    bool objectShouldFragmentInFlowRegion(const RenderObject*, const RenderRegion*) const;
 
     void markAutoLogicalHeightRegionsForLayout();

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3747 +3747 @@
         else {
             ASSERT(namedFlowFragment->isValid());
-            if (!namedFlowFragment->flowThread()->objectShouldPaintInFlowRegion(&renderer(), namedFlowFragment))
+            if (!namedFlowFragment->flowThread()->objectShouldFragmentInFlowRegion(&renderer(), namedFlowFragment))
                 return;
         }
@@ -4908 +4908 @@
         ASSERT(hitTestLocation.region()->isValid());
         RenderFlowThread* flowThread = hitTestLocation.region()->flowThread();
-        if (!flowThread->objectShouldPaintInFlowRegion(&renderer(), hitTestLocation.region()))
+        if (!flowThread->objectShouldFragmentInFlowRegion(&renderer(), hitTestLocation.region()))
             return 0;
     }

trunk/Source/WebCore/rendering/RenderRegion.cpp

@@ -445 +445 @@
     LayoutRect borderBox = box->borderBoxRectInRegion(this);
     LayoutRect clientBox;
-    ASSERT(m_flowThread->objectShouldPaintInFlowRegion(box, this));
+    ASSERT(m_flowThread->objectShouldFragmentInFlowRegion(box, this));
 
     if (!borderBox.isEmpty()) {

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -208 +208 @@
     
     // Check our region range to make sure we need to be painting in this region.
-    if (paintInfo.renderNamedFlowFragment && !paintInfo.renderNamedFlowFragment->flowThread()->objectShouldPaintInFlowRegion(this, paintInfo.renderNamedFlowFragment))
+    if (paintInfo.renderNamedFlowFragment && !paintInfo.renderNamedFlowFragment->flowThread()->objectShouldFragmentInFlowRegion(this, paintInfo.renderNamedFlowFragment))
         return false;