Diff
Modified: trunk/Source/WebCore/ChangeLog (257464 => 257465)
--- trunk/Source/WebCore/ChangeLog 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/ChangeLog 2020-02-26 13:37:58 UTC (rev 257465)
@@ -1,3 +1,36 @@
+2020-02-26 Antti Koivisto <[email protected]>
+
+ Remove throttling code from RenderLayerCompositor
+ https://bugs.webkit.org/show_bug.cgi?id=208135
+ <rdar://problem/59765410>
+
+ Unreviewed partial revert.
+
+ Keep using the "flush" naming in GraphicsLayerClient.
+
+ * page/PageOverlayController.cpp:
+ (WebCore::PageOverlayController::notifyFlushRequired):
+ (WebCore::PageOverlayController::notifyRenderingUpdateRequired): Deleted.
+ * page/PageOverlayController.h:
+ * page/linux/ResourceUsageOverlayLinux.cpp:
+ * page/mac/ServicesOverlayController.h:
+ * page/mac/ServicesOverlayController.mm:
+ (WebCore::ServicesOverlayController::Highlight::notifyFlushRequired):
+ (WebCore::ServicesOverlayController::Highlight::notifyRenderingUpdateRequired): Deleted.
+ * platform/graphics/GraphicsLayerClient.h:
+ (WebCore::GraphicsLayerClient::notifyFlushRequired):
+ (WebCore::GraphicsLayerClient::notifyRenderingUpdateRequired): Deleted.
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+ (WebCore::CoordinatedGraphicsLayer::notifyFlushRequired):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::notifyFlushRequired):
+ (WebCore::RenderLayerBacking::notifyRenderingUpdateRequired): Deleted.
+ * rendering/RenderLayerBacking.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::notifyFlushRequired):
+ (WebCore::RenderLayerCompositor::notifyRenderingUpdateRequired): Deleted.
+ * rendering/RenderLayerCompositor.h:
+
2020-02-26 Víctor Manuel Jáquez Leal <[email protected]>
[GL][GStreamer] Instantiate GstGLContext when the shared GLContext is created
Modified: trunk/Source/WebCore/page/PageOverlayController.cpp (257464 => 257465)
--- trunk/Source/WebCore/page/PageOverlayController.cpp 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/page/PageOverlayController.cpp 2020-02-26 13:37:58 UTC (rev 257465)
@@ -410,7 +410,7 @@
return m_page.deviceScaleFactor();
}
-void PageOverlayController::notifyRenderingUpdateRequired(const GraphicsLayer*)
+void PageOverlayController::notifyFlushRequired(const GraphicsLayer*)
{
m_page.renderingUpdateScheduler().scheduleTimedRenderingUpdate();
}
Modified: trunk/Source/WebCore/page/PageOverlayController.h (257464 => 257465)
--- trunk/Source/WebCore/page/PageOverlayController.h 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/page/PageOverlayController.h 2020-02-26 13:37:58 UTC (rev 257465)
@@ -92,7 +92,7 @@
void updateForceSynchronousScrollLayerPositionUpdates();
// GraphicsLayerClient
- void notifyRenderingUpdateRequired(const GraphicsLayer*) override;
+ void notifyFlushRequired(const GraphicsLayer*) override;
void paintContents(const GraphicsLayer*, GraphicsContext&, const FloatRect& clipRect, GraphicsLayerPaintBehavior) override;
float deviceScaleFactor() const override;
bool shouldSkipLayerInDump(const GraphicsLayer*, LayerTreeAsTextBehavior) const override;
Modified: trunk/Source/WebCore/page/linux/ResourceUsageOverlayLinux.cpp (257464 => 257465)
--- trunk/Source/WebCore/page/linux/ResourceUsageOverlayLinux.cpp 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/page/linux/ResourceUsageOverlayLinux.cpp 2020-02-26 13:37:58 UTC (rev 257465)
@@ -122,7 +122,7 @@
position.move(0, gFontSize + 2);
}
- void notifyRenderingUpdateRequired(const GraphicsLayer*) override
+ void notifyFlushRequired(const GraphicsLayer*) override
{
m_overlay.overlay().page()->chrome().client().scheduleRenderingUpdate();
}
Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.h (257464 => 257465)
--- trunk/Source/WebCore/page/mac/ServicesOverlayController.h 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.h 2020-02-26 13:37:58 UTC (rev 257465)
@@ -81,7 +81,7 @@
Highlight(ServicesOverlayController&, Type, RetainPtr<DDHighlightRef>, Ref<Range>&&);
// GraphicsLayerClient
- void notifyRenderingUpdateRequired(const GraphicsLayer*) override;
+ void notifyFlushRequired(const GraphicsLayer*) override;
void paintContents(const GraphicsLayer*, GraphicsContext&, const FloatRect& inClip, GraphicsLayerPaintBehavior) override;
float deviceScaleFactor() const override;
Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.mm (257464 => 257465)
--- trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2020-02-26 13:37:58 UTC (rev 257465)
@@ -116,7 +116,7 @@
m_controller = nullptr;
}
-void ServicesOverlayController::Highlight::notifyRenderingUpdateRequired(const GraphicsLayer*)
+void ServicesOverlayController::Highlight::notifyFlushRequired(const GraphicsLayer*)
{
if (!m_controller)
return;
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h (257464 => 257465)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2020-02-26 13:37:58 UTC (rev 257465)
@@ -98,7 +98,7 @@
// Notification that a layer property changed that requires a subsequent call to flushCompositingState()
// to appear on the screen.
- virtual void notifyRenderingUpdateRequired(const GraphicsLayer*) { }
+ virtual void notifyFlushRequired(const GraphicsLayer*) { }
// Notification that this layer requires a flush before the next display refresh.
virtual void notifyFlushBeforeDisplayRefresh(const GraphicsLayer*) { }
Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (257464 => 257465)
--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2020-02-26 13:37:58 UTC (rev 257465)
@@ -4232,7 +4232,7 @@
if (scheduleFlush == ScheduleFlush) {
bool needsFlush = !hadUncommittedChanges;
if (needsFlush)
- client().notifyRenderingUpdateRequired(this);
+ client().notifyFlushRequired(this);
}
}
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (257464 => 257465)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2020-02-26 13:37:58 UTC (rev 257465)
@@ -53,7 +53,7 @@
m_changeMask |= changeMask;
if (flushRequired)
- client().notifyRenderingUpdateRequired(this);
+ client().notifyFlushRequired(this);
}
GraphicsLayerTextureMapper::~GraphicsLayerTextureMapper()
Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (257464 => 257465)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2020-02-26 13:37:58 UTC (rev 257465)
@@ -66,7 +66,7 @@
if (m_coordinator->isFlushingLayerChanges())
return;
- client().notifyRenderingUpdateRequired(this);
+ client().notifyFlushRequired(this);
}
void CoordinatedGraphicsLayer::didChangeAnimations()
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (257464 => 257465)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2020-02-26 13:37:58 UTC (rev 257465)
@@ -3401,7 +3401,7 @@
renderer().animation().notifyAnimationStarted(renderer(), time);
}
-void RenderLayerBacking::notifyRenderingUpdateRequired(const GraphicsLayer*)
+void RenderLayerBacking::notifyFlushRequired(const GraphicsLayer*)
{
if (renderer().renderTreeBeingDestroyed())
return;
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (257464 => 257465)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2020-02-26 13:37:58 UTC (rev 257465)
@@ -237,7 +237,7 @@
// GraphicsLayerClient interface
void tiledBackingUsageChanged(const GraphicsLayer*, bool /*usingTiledBacking*/) override;
void notifyAnimationStarted(const GraphicsLayer*, const String& animationKey, MonotonicTime startTime) override;
- void notifyRenderingUpdateRequired(const GraphicsLayer*) override;
+ void notifyFlushRequired(const GraphicsLayer*) override;
void notifyFlushBeforeDisplayRefresh(const GraphicsLayer*) override;
void paintContents(const GraphicsLayer*, GraphicsContext&, const FloatRect& clip, GraphicsLayerPaintBehavior) override;
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (257464 => 257465)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2020-02-26 13:37:58 UTC (rev 257465)
@@ -467,7 +467,7 @@
position = -scrollPosition;
}
-void RenderLayerCompositor::notifyRenderingUpdateRequired(const GraphicsLayer*)
+void RenderLayerCompositor::notifyFlushRequired(const GraphicsLayer*)
{
scheduleRenderingUpdate();
}
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (257464 => 257465)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2020-02-26 13:37:58 UTC (rev 257465)
@@ -393,7 +393,7 @@
bool updateCompositingPolicy();
// GraphicsLayerClient implementation
- void notifyRenderingUpdateRequired(const GraphicsLayer*) override;
+ void notifyFlushRequired(const GraphicsLayer*) override;
void paintContents(const GraphicsLayer*, GraphicsContext&, const FloatRect&, GraphicsLayerPaintBehavior) override;
void customPositionForVisibleRectComputation(const GraphicsLayer*, FloatPoint&) const override;
bool isTrackingRepaints() const override { return m_isTrackingRepaints; }
Modified: trunk/Source/WebKit/ChangeLog (257464 => 257465)
--- trunk/Source/WebKit/ChangeLog 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebKit/ChangeLog 2020-02-26 13:37:58 UTC (rev 257465)
@@ -1,3 +1,16 @@
+2020-02-26 Antti Koivisto <[email protected]>
+
+ Remove throttling code from RenderLayerCompositor
+ https://bugs.webkit.org/show_bug.cgi?id=208135
+ <rdar://problem/59765410>
+
+ Unreviewed partial revert.
+
+ * WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp:
+ (WebKit::CompositingCoordinator::notifyFlushRequired):
+ (WebKit::CompositingCoordinator::notifyRenderingUpdateRequired): Deleted.
+ * WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h:
+
2020-02-26 Youenn Fablet <[email protected]>
Call pending m_unregisterJobs completion handlers when WebSWServerConnection goes away
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp (257464 => 257465)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp 2020-02-26 13:37:58 UTC (rev 257465)
@@ -109,7 +109,7 @@
void CompositingCoordinator::sizeDidChange(const IntSize& newSize)
{
m_rootLayer->setSize(newSize);
- notifyRenderingUpdateRequired(m_rootLayer.get());
+ notifyFlushRequired(m_rootLayer.get());
}
bool CompositingCoordinator::flushPendingLayerChanges()
@@ -208,7 +208,7 @@
m_shouldSyncFrame = true;
}
-void CompositingCoordinator::notifyRenderingUpdateRequired(const GraphicsLayer*)
+void CompositingCoordinator::notifyFlushRequired(const GraphicsLayer*)
{
if (m_rootLayer && !isFlushingLayerChanges())
m_client.notifyFlushRequired();
@@ -270,7 +270,7 @@
compositionLayer->setSceneIntegration(nullptr);
}
m_registeredLayers.remove(layer->id());
- notifyRenderingUpdateRequired(layer);
+ notifyFlushRequired(layer);
}
void CompositingCoordinator::attachLayer(CoordinatedGraphicsLayer* layer)
@@ -283,7 +283,7 @@
}
m_registeredLayers.add(layer->id(), layer);
layer->setNeedsVisibleRectAdjustment();
- notifyRenderingUpdateRequired(layer);
+ notifyFlushRequired(layer);
}
void CompositingCoordinator::renderNextFrame()
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h (257464 => 257465)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h 2020-02-26 13:37:58 UTC (rev 257465)
@@ -90,7 +90,7 @@
private:
// GraphicsLayerClient
- void notifyRenderingUpdateRequired(const WebCore::GraphicsLayer*) override;
+ void notifyFlushRequired(const WebCore::GraphicsLayer*) override;
float deviceScaleFactor() const override;
float pageScaleFactor() const override;
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (257464 => 257465)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2020-02-26 13:37:58 UTC (rev 257465)
@@ -1,3 +1,16 @@
+2020-02-26 Antti Koivisto <[email protected]>
+
+ Remove throttling code from RenderLayerCompositor
+ https://bugs.webkit.org/show_bug.cgi?id=208135
+ <rdar://problem/59765410>
+
+ Unreviewed partial revert.
+
+ * WebView.cpp:
+ (WebView::notifyFlushRequired):
+ (WebView::notifyRenderingUpdateRequired): Deleted.
+ * WebView.h:
+
2020-02-13 Said Abou-Hallawa <[email protected]>
Unreviewed, rolling out r255158, 255405 and r255486
Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (257464 => 257465)
--- trunk/Source/WebKitLegacy/win/WebView.cpp 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp 2020-02-26 13:37:58 UTC (rev 257465)
@@ -7417,7 +7417,7 @@
ASSERT_NOT_REACHED();
}
-void WebView::notifyRenderingUpdateRequired(const GraphicsLayer*)
+void WebView::notifyFlushRequired(const GraphicsLayer*)
{
flushPendingGraphicsLayerChangesSoon();
}
Modified: trunk/Source/WebKitLegacy/win/WebView.h (257464 => 257465)
--- trunk/Source/WebKitLegacy/win/WebView.h 2020-02-26 13:12:09 UTC (rev 257464)
+++ trunk/Source/WebKitLegacy/win/WebView.h 2020-02-26 13:37:58 UTC (rev 257465)
@@ -565,7 +565,7 @@
// GraphicsLayerClient
void notifyAnimationStarted(const WebCore::GraphicsLayer*, const String&, MonotonicTime) override;
- void notifyRenderingUpdateRequired(const WebCore::GraphicsLayer*) override;
+ void notifyFlushRequired(const WebCore::GraphicsLayer*) override;
void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, const WebCore::FloatRect& inClip, WebCore::GraphicsLayerPaintBehavior) override;
#if USE(CA)
