- Revision
- 167810
- Author
- [email protected]
- Date
- 2014-04-25 10:58:19 -0700 (Fri, 25 Apr 2014)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (167809 => 167810)
--- trunk/Source/WebCore/ChangeLog 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/ChangeLog 2014-04-25 17:58:19 UTC (rev 167810)
@@ -1,3 +1,33 @@
+2014-04-25 Radu Stavila <[email protected]>
+
+ [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 <[email protected]>
iOS build fix after http://trac.webkit.org/changeset/167803
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (167809 => 167810)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-04-25 17:58:19 UTC (rev 167810)
@@ -1792,7 +1792,7 @@
PaintPhase phase = paintInfo.phase;
// 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;
// Check if we need to do anything at all.
@@ -2415,7 +2415,7 @@
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;
}
@@ -2958,7 +2958,7 @@
if (locationInContainer.region()) {
RenderFlowThread* flowThread = flowThreadContainingBlock();
ASSERT(flowThread);
- if (!flowThread->objectShouldPaintInFlowRegion(this, locationInContainer.region()))
+ if (!flowThread->objectShouldFragmentInFlowRegion(this, locationInContainer.region()))
return false;
}
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (167809 => 167810)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-04-25 17:58:19 UTC (rev 167810)
@@ -4159,7 +4159,7 @@
if (isRenderFlowThread()) {
ASSERT(region);
- if (!toRenderFlowThread(this)->objectShouldPaintInFlowRegion(renderObject, region))
+ if (!toRenderFlowThread(this)->objectShouldFragmentInFlowRegion(renderObject, region))
continue;
}
Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (167809 => 167810)
--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-25 17:58:19 UTC (rev 167810)
@@ -804,7 +804,7 @@
return false;
}
-bool RenderFlowThread::objectShouldPaintInFlowRegion(const RenderObject* object, const RenderRegion* region) const
+bool RenderFlowThread::objectShouldFragmentInFlowRegion(const RenderObject* object, const RenderRegion* region) const
{
ASSERT(object);
ASSERT(region);
Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (167809 => 167810)
--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-04-25 17:58:19 UTC (rev 167810)
@@ -141,7 +141,7 @@
bool objectInFlowRegion(const RenderObject*, const RenderRegion*) const;
// 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();
void markRegionsForOverflowLayoutIfNeeded();
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (167809 => 167810)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-04-25 17:58:19 UTC (rev 167810)
@@ -3746,7 +3746,7 @@
info.renderNamedFlowFragment = nullptr;
else {
ASSERT(namedFlowFragment->isValid());
- if (!namedFlowFragment->flowThread()->objectShouldPaintInFlowRegion(&renderer(), namedFlowFragment))
+ if (!namedFlowFragment->flowThread()->objectShouldFragmentInFlowRegion(&renderer(), namedFlowFragment))
return;
}
}
@@ -4907,7 +4907,7 @@
if (hitTestLocation.region()) {
ASSERT(hitTestLocation.region()->isValid());
RenderFlowThread* flowThread = hitTestLocation.region()->flowThread();
- if (!flowThread->objectShouldPaintInFlowRegion(&renderer(), hitTestLocation.region()))
+ if (!flowThread->objectShouldFragmentInFlowRegion(&renderer(), hitTestLocation.region()))
return 0;
}
Modified: trunk/Source/WebCore/rendering/RenderRegion.cpp (167809 => 167810)
--- trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-04-25 17:58:19 UTC (rev 167810)
@@ -444,7 +444,7 @@
LayoutRect borderBox = box->borderBoxRectInRegion(this);
LayoutRect clientBox;
- ASSERT(m_flowThread->objectShouldPaintInFlowRegion(box, this));
+ ASSERT(m_flowThread->objectShouldFragmentInFlowRegion(box, this));
if (!borderBox.isEmpty()) {
borderBox = rectFlowPortionForBox(box, borderBox);
Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (167809 => 167810)
--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2014-04-25 17:53:32 UTC (rev 167809)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2014-04-25 17:58:19 UTC (rev 167810)
@@ -207,7 +207,7 @@
return false;
// 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;
LayoutPoint adjustedPaintOffset = paintOffset + location();
