Diff
Modified: trunk/Source/WebCore/ChangeLog (169044 => 169045)
--- trunk/Source/WebCore/ChangeLog 2014-05-19 15:18:38 UTC (rev 169044)
+++ trunk/Source/WebCore/ChangeLog 2014-05-19 15:53:32 UTC (rev 169045)
@@ -1,3 +1,36 @@
+2014-05-17 Simon Fraser <[email protected]>
+
+ Rename some RenderLayerBacking member functions
+ https://bugs.webkit.org/show_bug.cgi?id=133030
+
+ Reviewed by Sam Weinig.
+
+ Remove "GraphicsLayer" from some member function names on RenderLayerBacking.
+
+ No behavior change.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::AVFWrapper::createAVCFVideoLayer):
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::MediaPlayerPrivateQTKit::createQTMovieLayer):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateAfterLayout):
+ (WebCore::RenderLayerBacking::updateConfiguration):
+ (WebCore::RenderLayerBacking::updateGeometry):
+ (WebCore::RenderLayerBacking::contentChanged):
+ (WebCore::RenderLayerBacking::setContentsNeedDisplayInRect):
+ (WebCore::RenderLayerBacking::updateGraphicsLayerConfiguration): Deleted.
+ (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry): Deleted.
+ * rendering/RenderLayerBacking.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::updateLayerCompositingState):
+ (WebCore::RenderLayerCompositor::rebuildCompositingLayerTree):
+ (WebCore::RenderLayerCompositor::updateLayerTreeGeometry):
+ (WebCore::RenderLayerCompositor::updateCompositingDescendantGeometry):
+ (WebCore::RenderLayerCompositor::attachRootLayer):
+
2014-05-19 Antti Koivisto <[email protected]>
Fix assertion failure with simple line layout debug borders enabled.
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (169044 => 169045)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-05-19 15:18:38 UTC (rev 169044)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-05-19 15:53:32 UTC (rev 169045)
@@ -1690,7 +1690,7 @@
if (!avPlayer() || m_avCFVideoLayer)
return;
- // The layer will get hooked up via RenderLayerBacking::updateGraphicsLayerConfiguration().
+ // The layer will get hooked up via RenderLayerBacking::updateConfiguration().
m_avCFVideoLayer = adoptCF(AVCFPlayerLayerCreateWithAVCFPlayer(kCFAllocatorDefault, avPlayer(), m_notificationQueue));
LOG(Media, "AVFWrapper::createAVCFVideoLayer(%p) - returning %p", this, videoLayer());
}
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (169044 => 169045)
--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-05-19 15:18:38 UTC (rev 169044)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-05-19 15:53:32 UTC (rev 169045)
@@ -517,7 +517,7 @@
#ifndef NDEBUG
[(CALayer *)m_qtVideoLayer.get() setName:@"Video layer"];
#endif
- // The layer will get hooked up via RenderLayerBacking::updateGraphicsLayerConfiguration().
+ // The layer will get hooked up via RenderLayerBacking::updateConfiguration().
}
}
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (169044 => 169045)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-05-19 15:18:38 UTC (rev 169044)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-05-19 15:53:32 UTC (rev 169045)
@@ -6455,7 +6455,7 @@
|| needsCompositingLayersRebuiltForOverflow(oldStyle, &newStyle))
compositor().setCompositingLayersNeedRebuild();
else if (isComposited())
- backing()->updateGraphicsLayerGeometry();
+ backing()->updateGeometry();
if (oldStyle) {
// Compositing layers keep track of whether they are clipped by any of the ancestors.
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (169044 => 169045)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-05-19 15:18:38 UTC (rev 169044)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-05-19 15:53:32 UTC (rev 169045)
@@ -495,7 +495,7 @@
void RenderLayerBacking::updateAfterLayout(UpdateAfterLayoutFlags flags)
{
if (!compositor().compositingLayersNeedRebuild()) {
- // Calling updateGraphicsLayerGeometry() here gives incorrect results, because the
+ // Calling updateGeometry() here gives incorrect results, because the
// position of this layer's GraphicsLayer depends on the position of our compositing
// ancestor's GraphicsLayer. That cannot be determined until all the descendant
// RenderLayers of that ancestor have been processed via updateLayerPositions().
@@ -506,7 +506,7 @@
compositor().updateCompositingDescendantGeometry(m_owningLayer, m_owningLayer, flags & CompositingChildrenOnly);
if (flags & IsUpdateRoot) {
- updateGraphicsLayerGeometry();
+ updateGeometry();
compositor().updateRootLayerPosition();
RenderLayer* stackingContainer = m_owningLayer.enclosingStackingContainer();
if (!compositor().compositingLayersNeedRebuild() && stackingContainer && (stackingContainer != &m_owningLayer))
@@ -518,7 +518,7 @@
setContentsNeedDisplay();
}
-bool RenderLayerBacking::updateGraphicsLayerConfiguration()
+bool RenderLayerBacking::updateConfiguration()
{
m_owningLayer.updateDescendantDependentFlags();
m_owningLayer.updateZOrderLists();
@@ -647,7 +647,7 @@
devicePixelOffsetFromRenderer = rendererOffsetFromGraphicsLayer - devicePixelFractionFromRenderer;
}
-void RenderLayerBacking::updateGraphicsLayerGeometry()
+void RenderLayerBacking::updateGeometry()
{
// If we haven't built z-order lists yet, wait until later.
if (m_owningLayer.isStackingContainer() && m_owningLayer.m_zOrderListsDirty)
@@ -898,7 +898,7 @@
if (m_owningLayer.reflectionLayer() && m_owningLayer.reflectionLayer()->isComposited()) {
RenderLayerBacking* reflectionBacking = m_owningLayer.reflectionLayer()->backing();
- reflectionBacking->updateGraphicsLayerGeometry();
+ reflectionBacking->updateGeometry();
// The reflection layer has the bounds of m_owningLayer.reflectionLayer(),
// but the reflected layer is the bounds of this layer, so we need to position it appropriately.
@@ -1861,7 +1861,7 @@
}
if ((changeType == BackgroundImageChanged) && canCreateTiledImage(&renderer().style()))
- updateGraphicsLayerGeometry();
+ updateGeometry();
if ((changeType == MaskImageChanged) && m_maskLayer) {
// The composited layer bounds relies on box->maskClipRect(), which changes
@@ -2106,7 +2106,7 @@
FloatRect layerDirtyRect = pixelSnappedRectForPainting;
layerDirtyRect.move(-m_scrollingContentsLayer->offsetFromRenderer() + m_devicePixelFractionFromRenderer);
#if PLATFORM(IOS)
- // Account for the fact that RenderLayerBacking::updateGraphicsLayerGeometry() bakes scrollOffset into offsetFromRenderer on iOS.
+ // Account for the fact that RenderLayerBacking::updateGeometry() bakes scrollOffset into offsetFromRenderer on iOS.
layerDirtyRect.move(-m_owningLayer.scrollOffset() + m_devicePixelFractionFromRenderer);
#endif
m_scrollingContentsLayer->setNeedsDisplayInRect(layerDirtyRect, shouldClip);
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (169044 => 169045)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-05-19 15:18:38 UTC (rev 169044)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-05-19 15:53:32 UTC (rev 169045)
@@ -74,9 +74,9 @@
void updateAfterLayout(UpdateAfterLayoutFlags);
// Returns true if layer configuration changed.
- bool updateGraphicsLayerConfiguration();
+ bool updateConfiguration();
// Update graphics layer position and bounds.
- void updateGraphicsLayerGeometry(); // make private
+ void updateGeometry(); // make private
// Update contents and clipping structure.
void updateDrawsContent();
@@ -291,7 +291,7 @@
void paintIntoLayer(const GraphicsLayer*, GraphicsContext*, const IntRect& paintDirtyRect, PaintBehavior, GraphicsLayerPaintingPhase);
- // Helper function for updateGraphicsLayerGeometry.
+ // Helper function for updateGeometry.
void adjustAncestorCompositingBoundsForFlowThread(LayoutRect& ancestorCompositingBounds, const RenderLayer* compositingAncestor) const;
static CSSPropertyID graphicsLayerToCSSProperty(AnimatedPropertyID);
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (169044 => 169045)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-05-19 15:18:38 UTC (rev 169044)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-05-19 15:53:32 UTC (rev 169045)
@@ -920,7 +920,7 @@
// See if we need content or clipping layers. Methods called here should assume
// that the compositing state of descendant layers has not been updated yet.
- if (layer.backing() && layer.backing()->updateGraphicsLayerConfiguration())
+ if (layer.backing() && layer.backing()->updateConfiguration())
layerChanged = true;
return layerChanged;
@@ -1433,10 +1433,10 @@
reflection->backing()->updateCompositedBounds();
}
- if (layerBacking->updateGraphicsLayerConfiguration())
+ if (layerBacking->updateConfiguration())
layerBacking->updateDebugIndicators(m_showDebugBorders, m_showRepaintCounter);
- layerBacking->updateGraphicsLayerGeometry();
+ layerBacking->updateGeometry();
if (!layer.parent())
updateRootLayerPosition();
@@ -1716,8 +1716,8 @@
reflection->backing()->updateCompositedBounds();
}
- layerBacking->updateGraphicsLayerConfiguration();
- layerBacking->updateGraphicsLayerGeometry();
+ layerBacking->updateConfiguration();
+ layerBacking->updateGeometry();
if (!layer.parent())
updateRootLayerPosition();
@@ -1765,7 +1765,7 @@
reflection->backing()->updateCompositedBounds();
}
- layerBacking->updateGraphicsLayerGeometry();
+ layerBacking->updateGeometry();
if (compositedChildrenOnly)
return;
}
@@ -3335,7 +3335,7 @@
break;
}
case RootLayerAttachedViaEnclosingFrame: {
- // The layer will get hooked up via RenderLayerBacking::updateGraphicsLayerConfiguration()
+ // The layer will get hooked up via RenderLayerBacking::updateConfiguration()
// for the frame's renderer in the parent document.
m_renderView.document().ownerElement()->scheduleSetNeedsStyleRecalc(SyntheticStyleChange);
break;
