Title: [179244] trunk/Source/WebCore
- Revision
- 179244
- Author
- [email protected]
- Date
- 2015-01-28 00:09:25 -0800 (Wed, 28 Jan 2015)
Log Message
Rename descendentxxx to descendantxxxx in RenderLayerBacking
https://bugs.webkit.org/show_bug.cgi?id=140979
Patch by Jeongmin Kim <[email protected]> on 2015-01-28
Reviewed by Martin Robinson.
Rename descendentxxx to descendantxxxx in RenderLayerBacking
for matching other variables and function names.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateConfiguration):
(WebCore::RenderLayerBacking::updateAfterDescendants):
(WebCore::RenderLayerBacking::updateChildClippingStrategy):
(WebCore::RenderLayerBacking::paintsChildren):
(WebCore::descendantLayerPaintsIntoAncestor):
(WebCore::RenderLayerBacking::isPaintDestinationForDescendantLayers):
(WebCore::descendentLayerPaintsIntoAncestor): Deleted.
(WebCore::RenderLayerBacking::isPaintDestinationForDescendentLayers): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (179243 => 179244)
--- trunk/Source/WebCore/ChangeLog 2015-01-28 07:41:46 UTC (rev 179243)
+++ trunk/Source/WebCore/ChangeLog 2015-01-28 08:09:25 UTC (rev 179244)
@@ -1,3 +1,23 @@
+2015-01-28 Jeongmin Kim <[email protected]>
+
+ Rename descendentxxx to descendantxxxx in RenderLayerBacking
+ https://bugs.webkit.org/show_bug.cgi?id=140979
+
+ Reviewed by Martin Robinson.
+
+ Rename descendentxxx to descendantxxxx in RenderLayerBacking
+ for matching other variables and function names.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateConfiguration):
+ (WebCore::RenderLayerBacking::updateAfterDescendants):
+ (WebCore::RenderLayerBacking::updateChildClippingStrategy):
+ (WebCore::RenderLayerBacking::paintsChildren):
+ (WebCore::descendantLayerPaintsIntoAncestor):
+ (WebCore::RenderLayerBacking::isPaintDestinationForDescendantLayers):
+ (WebCore::descendentLayerPaintsIntoAncestor): Deleted.
+ (WebCore::RenderLayerBacking::isPaintDestinationForDescendentLayers): Deleted.
+
2015-01-27 Chris Dumez <[email protected]>
Use a Ref<CachedResourceLoader> in Document instead of a RefPtr
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (179243 => 179244)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-01-28 07:41:46 UTC (rev 179243)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-01-28 08:09:25 UTC (rev 179244)
@@ -550,7 +550,7 @@
if (updateForegroundLayer(compositor().needsContentsCompositingLayer(m_owningLayer)))
layerConfigChanged = true;
- bool needsDescendentsClippingLayer = compositor().clipsCompositingDescendants(m_owningLayer);
+ bool needsDescendantsClippingLayer = compositor().clipsCompositingDescendants(m_owningLayer);
if (!renderer().view().needsLayout()) {
bool usesCompositedScrolling;
@@ -561,12 +561,12 @@
#endif
// Our scrolling layer will clip.
if (usesCompositedScrolling)
- needsDescendentsClippingLayer = false;
+ needsDescendantsClippingLayer = false;
if (updateScrollingLayers(usesCompositedScrolling))
layerConfigChanged = true;
- if (updateDescendantClippingLayer(needsDescendentsClippingLayer))
+ if (updateDescendantClippingLayer(needsDescendantsClippingLayer))
layerConfigChanged = true;
}
@@ -586,7 +586,7 @@
updateMaskLayer(renderer().hasMask());
- updateChildClippingStrategy(needsDescendentsClippingLayer);
+ updateChildClippingStrategy(needsDescendantsClippingLayer);
if (m_owningLayer.hasReflection()) {
if (m_owningLayer.reflectionLayer()->backing()) {
@@ -1016,7 +1016,7 @@
updateDrawsContent(isSimpleContainer);
- m_graphicsLayer->setContentsVisible(m_owningLayer.hasVisibleContent() || isPaintDestinationForDescendentLayers());
+ m_graphicsLayer->setContentsVisible(m_owningLayer.hasVisibleContent() || isPaintDestinationForDescendantLayers());
}
void RenderLayerBacking::adjustAncestorCompositingBoundsForFlowThread(LayoutRect& ancestorCompositingBounds, const RenderLayer* compositingAncestor) const
@@ -1445,9 +1445,9 @@
m_graphicsLayer->setPaintingPhase(paintingPhaseForPrimaryLayer());
}
-void RenderLayerBacking::updateChildClippingStrategy(bool needsDescendentsClippingLayer)
+void RenderLayerBacking::updateChildClippingStrategy(bool needsDescendantsClippingLayer)
{
- if (hasClippingLayer() && needsDescendentsClippingLayer) {
+ if (hasClippingLayer() && needsDescendantsClippingLayer) {
if (is<RenderBox>(renderer()) && (renderer().style().clipPath() || renderer().style().hasBorderRadius())) {
LayoutRect boxRect(LayoutPoint(), downcast<RenderBox>(renderer()).size());
FloatRoundedRect contentsClippingRect = renderer().style().getRoundedInnerBorderFor(boxRect).pixelSnappedRoundedRectForPainting(deviceScaleFactor());
@@ -1748,7 +1748,7 @@
if (m_owningLayer.hasVisibleContent() && m_owningLayer.hasNonEmptyChildRenderers())
return true;
- if (isPaintDestinationForDescendentLayers())
+ if (isPaintDestinationForDescendantLayers())
return true;
return false;
@@ -1819,7 +1819,7 @@
return layer->isComposited() && !layer->backing()->paintsIntoCompositedAncestor();
}
-static bool descendentLayerPaintsIntoAncestor(RenderLayer& parent)
+static bool descendantLayerPaintsIntoAncestor(RenderLayer& parent)
{
// FIXME: We shouldn't be called with a stale z-order lists. See bug 85512.
parent.updateLayerListsIfNeeded();
@@ -1833,7 +1833,7 @@
for (size_t i = 0; i < listSize; ++i) {
RenderLayer* curLayer = normalFlowList->at(i);
if (!compositedWithOwnBackingStore(curLayer)
- && (curLayer->isVisuallyNonEmpty() || descendentLayerPaintsIntoAncestor(*curLayer)))
+ && (curLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*curLayer)))
return true;
}
}
@@ -1848,7 +1848,7 @@
for (size_t i = 0; i < listSize; ++i) {
RenderLayer* curLayer = negZOrderList->at(i);
if (!compositedWithOwnBackingStore(curLayer)
- && (curLayer->isVisuallyNonEmpty() || descendentLayerPaintsIntoAncestor(*curLayer)))
+ && (curLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*curLayer)))
return true;
}
}
@@ -1858,7 +1858,7 @@
for (size_t i = 0; i < listSize; ++i) {
RenderLayer* curLayer = posZOrderList->at(i);
if (!compositedWithOwnBackingStore(curLayer)
- && (curLayer->isVisuallyNonEmpty() || descendentLayerPaintsIntoAncestor(*curLayer)))
+ && (curLayer->isVisuallyNonEmpty() || descendantLayerPaintsIntoAncestor(*curLayer)))
return true;
}
}
@@ -1868,9 +1868,9 @@
}
// Conservative test for having no rendered children.
-bool RenderLayerBacking::isPaintDestinationForDescendentLayers() const
+bool RenderLayerBacking::isPaintDestinationForDescendantLayers() const
{
- return descendentLayerPaintsIntoAncestor(m_owningLayer);
+ return descendantLayerPaintsIntoAncestor(m_owningLayer);
}
bool RenderLayerBacking::containsPaintedContent(bool isSimpleContainer) const
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (179243 => 179244)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2015-01-28 07:41:46 UTC (rev 179243)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2015-01-28 08:09:25 UTC (rev 179244)
@@ -273,7 +273,7 @@
bool requiresScrollCornerLayer() const;
bool updateScrollingLayers(bool scrollingLayers);
void updateDrawsContent(bool isSimpleContainer);
- void updateChildClippingStrategy(bool needsDescendentsClippingLayer);
+ void updateChildClippingStrategy(bool needsDescendantsClippingLayer);
void updateRootLayerConfiguration();
@@ -317,7 +317,7 @@
void resetContentsRect();
- bool isPaintDestinationForDescendentLayers() const;
+ bool isPaintDestinationForDescendantLayers() const;
bool shouldClipCompositedBounds() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
