Title: [236149] trunk/Source/WebCore
- Revision
- 236149
- Author
- [email protected]
- Date
- 2018-09-18 11:34:15 -0700 (Tue, 18 Sep 2018)
Log Message
Remove the unused RenderLayerCompositor::enclosingCompositorFlushingLayers()
https://bugs.webkit.org/show_bug.cgi?id=189689
Reviewed by Alex Christensen.
enclosingCompositorFlushingLayers() was added in r76196 but never used. Also use
a SetForScope<>.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::flushPendingLayerChanges):
(WebCore::RenderLayerCompositor::enclosingCompositorFlushingLayers const): Deleted.
* rendering/RenderLayerCompositor.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (236148 => 236149)
--- trunk/Source/WebCore/ChangeLog 2018-09-18 18:30:02 UTC (rev 236148)
+++ trunk/Source/WebCore/ChangeLog 2018-09-18 18:34:15 UTC (rev 236149)
@@ -1,3 +1,18 @@
+2018-09-18 Simon Fraser <[email protected]>
+
+ Remove the unused RenderLayerCompositor::enclosingCompositorFlushingLayers()
+ https://bugs.webkit.org/show_bug.cgi?id=189689
+
+ Reviewed by Alex Christensen.
+
+ enclosingCompositorFlushingLayers() was added in r76196 but never used. Also use
+ a SetForScope<>.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
+ (WebCore::RenderLayerCompositor::enclosingCompositorFlushingLayers const): Deleted.
+ * rendering/RenderLayerCompositor.h:
+
2018-09-18 Joseph Pecoraro <[email protected]>
[macOS] Frequent leaks seen under WebCore::gpuIDForDisplayMask
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (236148 => 236149)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2018-09-18 18:30:02 UTC (rev 236148)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2018-09-18 18:34:15 UTC (rev 236149)
@@ -482,16 +482,17 @@
AnimationUpdateBlock animationUpdateBlock(&frameView.frame().animation());
ASSERT(!m_flushingLayers);
- m_flushingLayers = true;
+ {
+ SetForScope<bool> flushingLayersScope(m_flushingLayers, true);
- if (auto* rootLayer = rootGraphicsLayer()) {
- FloatRect visibleRect = visibleRectForLayerFlushing();
- LOG_WITH_STREAM(Compositing, stream << "\nRenderLayerCompositor " << this << " flushPendingLayerChanges (is root " << isFlushRoot << ") visible rect " << visibleRect);
- rootLayer->flushCompositingState(visibleRect);
+ if (auto* rootLayer = rootGraphicsLayer()) {
+ FloatRect visibleRect = visibleRectForLayerFlushing();
+ LOG_WITH_STREAM(Compositing, stream << "\nRenderLayerCompositor " << this << " flushPendingLayerChanges (is root " << isFlushRoot << ") visible rect " << visibleRect);
+ rootLayer->flushCompositingState(visibleRect);
+ }
+
+ ASSERT(m_flushingLayers);
}
-
- ASSERT(m_flushingLayers);
- m_flushingLayers = false;
updateScrollCoordinatedLayersAfterFlushIncludingSubframes();
@@ -628,17 +629,6 @@
}
}
-RenderLayerCompositor* RenderLayerCompositor::enclosingCompositorFlushingLayers() const
-{
- for (auto* frame = &m_renderView.frameView().frame(); frame; frame = frame->tree().parent()) {
- auto* compositor = frame->contentRenderer() ? &frame->contentRenderer()->compositor() : nullptr;
- if (compositor->isFlushingLayers())
- return compositor;
- }
-
- return nullptr;
-}
-
void RenderLayerCompositor::scheduleCompositingLayerUpdate()
{
if (!m_updateCompositingLayersTimer.isActive())
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (236148 => 236149)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2018-09-18 18:30:02 UTC (rev 236148)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2018-09-18 18:34:15 UTC (rev 236149)
@@ -125,10 +125,6 @@
void scheduleLayerFlush(bool canThrottle);
void flushPendingLayerChanges(bool isFlushRoot = true);
- // flushPendingLayerChanges() flushes the entire GraphicsLayer tree, which can cross frame boundaries.
- // This call returns the rootmost compositor that is being flushed (including self).
- RenderLayerCompositor* enclosingCompositorFlushingLayers() const;
-
// Called when the GraphicsLayer for the given RenderLayer has flushed changes inside of flushPendingLayerChanges().
void didFlushChangesForLayer(RenderLayer&, const GraphicsLayer*);
@@ -407,7 +403,6 @@
void notifyIFramesOfCompositingChange();
- bool isFlushingLayers() const { return m_flushingLayers; }
void updateScrollCoordinatedLayersAfterFlushIncludingSubframes();
void updateScrollCoordinatedLayersAfterFlush();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
