Title: [139797] trunk/Source/WebCore
- Revision
- 139797
- Author
- [email protected]
- Date
- 2013-01-15 15:17:01 -0800 (Tue, 15 Jan 2013)
Log Message
Rename RenderLayerBacking's m_containmentLayer to m_childContainmentLayer to better describe its purpose
https://bugs.webkit.org/show_bug.cgi?id=106947
Reviewed by Dean Jackson.
Simple rename of m_containmentLayer to m_childContainmentLayer. I'll
be adding another "container" layer for background layers shortly,
and wanted to improve clarity.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
(WebCore::RenderLayerBacking::destroyGraphicsLayers):
(WebCore::RenderLayerBacking::updateInternalHierarchy):
(WebCore::RenderLayerBacking::updateClippingLayers):
(WebCore::RenderLayerBacking::parentForSublayers):
(WebCore::RenderLayerBacking::backingStoreMemoryEstimate):
(WebCore::RenderLayerBacking::reportMemoryUsage):
* rendering/RenderLayerBacking.h:
(WebCore::RenderLayerBacking::hasClippingLayer):
(WebCore::RenderLayerBacking::clippingLayer):
(WebCore::RenderLayerBacking::hasTileCacheFlatteningLayer):
(WebCore::RenderLayerBacking::tileCacheFlatteningLayer):
(RenderLayerBacking):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (139796 => 139797)
--- trunk/Source/WebCore/ChangeLog 2013-01-15 23:00:59 UTC (rev 139796)
+++ trunk/Source/WebCore/ChangeLog 2013-01-15 23:17:01 UTC (rev 139797)
@@ -1,3 +1,29 @@
+2013-01-15 Simon Fraser <[email protected]>
+
+ Rename RenderLayerBacking's m_containmentLayer to m_childContainmentLayer to better describe its purpose
+ https://bugs.webkit.org/show_bug.cgi?id=106947
+
+ Reviewed by Dean Jackson.
+
+ Simple rename of m_containmentLayer to m_childContainmentLayer. I'll
+ be adding another "container" layer for background layers shortly,
+ and wanted to improve clarity.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
+ (WebCore::RenderLayerBacking::destroyGraphicsLayers):
+ (WebCore::RenderLayerBacking::updateInternalHierarchy):
+ (WebCore::RenderLayerBacking::updateClippingLayers):
+ (WebCore::RenderLayerBacking::parentForSublayers):
+ (WebCore::RenderLayerBacking::backingStoreMemoryEstimate):
+ (WebCore::RenderLayerBacking::reportMemoryUsage):
+ * rendering/RenderLayerBacking.h:
+ (WebCore::RenderLayerBacking::hasClippingLayer):
+ (WebCore::RenderLayerBacking::clippingLayer):
+ (WebCore::RenderLayerBacking::hasTileCacheFlatteningLayer):
+ (WebCore::RenderLayerBacking::tileCacheFlatteningLayer):
+ (RenderLayerBacking):
+
2013-01-15 Enrica Casucci <[email protected]>
Add a new set of WebKit2 APIs for text search and
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (139796 => 139797)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2013-01-15 23:00:59 UTC (rev 139796)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2013-01-15 23:17:01 UTC (rev 139797)
@@ -264,7 +264,7 @@
m_creatingPrimaryGraphicsLayer = false;
if (m_usingTiledCacheLayer)
- m_containmentLayer = createGraphicsLayer("TileCache Flattening Layer");
+ m_childContainmentLayer = createGraphicsLayer("TileCache Flattening Layer");
if (m_isMainFrameRenderViewLayer) {
bool hasOpaqueBackground = false;
@@ -298,9 +298,10 @@
if (m_graphicsLayer)
m_graphicsLayer->removeFromParent();
+ m_ancestorClippingLayer = nullptr;
m_graphicsLayer = nullptr;
m_foregroundLayer = nullptr;
- m_containmentLayer = nullptr;
+ m_childContainmentLayer = nullptr;
m_maskLayer = nullptr;
m_scrollingLayer = nullptr;
@@ -781,13 +782,13 @@
m_ancestorClippingLayer->addChild(m_graphicsLayer.get());
}
- if (m_containmentLayer) {
- m_containmentLayer->removeFromParent();
- m_graphicsLayer->addChild(m_containmentLayer.get());
+ if (m_childContainmentLayer) {
+ m_childContainmentLayer->removeFromParent();
+ m_graphicsLayer->addChild(m_childContainmentLayer.get());
}
if (m_scrollingLayer) {
- GraphicsLayer* superlayer = m_containmentLayer ? m_containmentLayer.get() : m_graphicsLayer.get();
+ GraphicsLayer* superlayer = m_childContainmentLayer ? m_childContainmentLayer.get() : m_graphicsLayer.get();
m_scrollingLayer->removeFromParent();
superlayer->addChild(m_scrollingLayer.get());
}
@@ -866,14 +867,14 @@
}
if (needsDescendantClip) {
- if (!m_containmentLayer && !m_usingTiledCacheLayer) {
- m_containmentLayer = createGraphicsLayer("Child clipping Layer");
- m_containmentLayer->setMasksToBounds(true);
+ if (!m_childContainmentLayer && !m_usingTiledCacheLayer) {
+ m_childContainmentLayer = createGraphicsLayer("Child clipping Layer");
+ m_childContainmentLayer->setMasksToBounds(true);
layersChanged = true;
}
} else if (hasClippingLayer()) {
- m_containmentLayer->removeFromParent();
- m_containmentLayer = nullptr;
+ m_childContainmentLayer->removeFromParent();
+ m_childContainmentLayer = nullptr;
layersChanged = true;
}
@@ -1536,7 +1537,7 @@
if (m_scrollingContentsLayer)
return m_scrollingContentsLayer.get();
- return m_containmentLayer ? m_containmentLayer.get() : m_graphicsLayer.get();
+ return m_childContainmentLayer ? m_childContainmentLayer.get() : m_graphicsLayer.get();
}
bool RenderLayerBacking::paintsIntoWindow() const
@@ -2004,7 +2005,7 @@
{
double backingMemory;
- // m_ancestorClippingLayer and m_containmentLayer are just used for masking or containment, so have no backing.
+ // m_ancestorClippingLayer and m_childContainmentLayer are just used for masking or containment, so have no backing.
backingMemory = m_graphicsLayer->backingStoreMemoryEstimate();
if (m_foregroundLayer)
backingMemory += m_foregroundLayer->backingStoreMemoryEstimate();
@@ -2047,7 +2048,7 @@
info.addMember(m_ancestorClippingLayer);
info.addMember(m_graphicsLayer);
info.addMember(m_foregroundLayer);
- info.addMember(m_containmentLayer);
+ info.addMember(m_childContainmentLayer);
info.addMember(m_maskLayer);
info.addMember(m_layerForHorizontalScrollbar);
info.addMember(m_layerForVerticalScrollbar);
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (139796 => 139797)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2013-01-15 23:00:59 UTC (rev 139796)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2013-01-15 23:17:01 UTC (rev 139797)
@@ -80,8 +80,8 @@
GraphicsLayer* graphicsLayer() const { return m_graphicsLayer.get(); }
// Layer to clip children
- bool hasClippingLayer() const { return (m_containmentLayer && !m_usingTiledCacheLayer); }
- GraphicsLayer* clippingLayer() const { return !m_usingTiledCacheLayer ? m_containmentLayer.get() : 0; }
+ bool hasClippingLayer() const { return (m_childContainmentLayer && !m_usingTiledCacheLayer); }
+ GraphicsLayer* clippingLayer() const { return !m_usingTiledCacheLayer ? m_childContainmentLayer.get() : 0; }
// Layer to get clipped by ancestor
bool hasAncestorClippingLayer() const { return m_ancestorClippingLayer != 0; }
@@ -252,8 +252,8 @@
bool shouldClipCompositedBounds() const;
- bool hasTileCacheFlatteningLayer() const { return (m_containmentLayer && m_usingTiledCacheLayer); }
- GraphicsLayer* tileCacheFlatteningLayer() const { return m_usingTiledCacheLayer ? m_containmentLayer.get() : 0; }
+ bool hasTileCacheFlatteningLayer() const { return (m_childContainmentLayer && m_usingTiledCacheLayer); }
+ GraphicsLayer* tileCacheFlatteningLayer() const { return m_usingTiledCacheLayer ? m_childContainmentLayer.get() : 0; }
void paintIntoLayer(RenderLayer* rootLayer, GraphicsContext*, const IntRect& paintDirtyRect, PaintBehavior, GraphicsLayerPaintingPhase);
@@ -262,18 +262,18 @@
RenderLayer* m_owningLayer;
- OwnPtr<GraphicsLayer> m_ancestorClippingLayer; // only used if we are clipped by an ancestor which is not a stacking context
+ OwnPtr<GraphicsLayer> m_ancestorClippingLayer; // Only used if we are clipped by an ancestor which is not a stacking context.
OwnPtr<GraphicsLayer> m_graphicsLayer;
- OwnPtr<GraphicsLayer> m_foregroundLayer; // only used in cases where we need to draw the foreground separately
- OwnPtr<GraphicsLayer> m_containmentLayer; // Only used if we have clipping on a stacking context with compositing children, or if the layer has a tile cache.
- OwnPtr<GraphicsLayer> m_maskLayer; // only used if we have a mask
+ OwnPtr<GraphicsLayer> m_foregroundLayer; // Only used in cases where we need to draw the foreground separately.
+ OwnPtr<GraphicsLayer> m_childContainmentLayer; // Only used if we have clipping on a stacking context with compositing children, or if the layer has a tile cache.
+ OwnPtr<GraphicsLayer> m_maskLayer; // Only used if we have a mask.
OwnPtr<GraphicsLayer> m_layerForHorizontalScrollbar;
OwnPtr<GraphicsLayer> m_layerForVerticalScrollbar;
OwnPtr<GraphicsLayer> m_layerForScrollCorner;
- OwnPtr<GraphicsLayer> m_scrollingLayer; // only used if the layer is using composited scrolling.
- OwnPtr<GraphicsLayer> m_scrollingContentsLayer; // only used if the layer is using composited scrolling.
+ OwnPtr<GraphicsLayer> m_scrollingLayer; // Only used if the layer is using composited scrolling.
+ OwnPtr<GraphicsLayer> m_scrollingContentsLayer; // Only used if the layer is using composited scrolling.
uint64_t m_scrollLayerID;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
