- Revision
- 225175
- Author
- [email protected]
- Date
- 2017-11-27 09:06:23 -0800 (Mon, 27 Nov 2017)
Log Message
[CoordGraphics] CompositingCoordinator: clean up Client vtable, GraphicsLayerClient overrides
https://bugs.webkit.org/show_bug.cgi?id=180037
Reviewed by Carlos Garcia Campos.
Remove the CompositingCoordinator::Client::paintLayerContents() method since
the only implementation in CoordinatedLayerTreeHost was empty.
Subsequently, the CompositingCoordinator::paintContents() override of the
GraphicsLayerClient method can also be removed. The notifyAnimationStarted()
override is empty, just like the base method, so it's removed as well.
* WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp:
(WebKit::CompositingCoordinator::deviceScaleFactor const): Bring method up
to the notifyFlushRequired() code, since both are overrides of the
GraphicsLayerClient-inherited methods.
(WebKit::CompositingCoordinator::pageScaleFactor const): Ditto.
(WebKit::CompositingCoordinator::notifyAnimationStarted): Deleted.
(WebKit::CompositingCoordinator::paintContents): Deleted.
* WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h:
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::paintLayerContents): Deleted.
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (225174 => 225175)
--- trunk/Source/WebKit/ChangeLog 2017-11-27 17:05:47 UTC (rev 225174)
+++ trunk/Source/WebKit/ChangeLog 2017-11-27 17:06:23 UTC (rev 225175)
@@ -1,3 +1,29 @@
+2017-11-27 Zan Dobersek <[email protected]>
+
+ [CoordGraphics] CompositingCoordinator: clean up Client vtable, GraphicsLayerClient overrides
+ https://bugs.webkit.org/show_bug.cgi?id=180037
+
+ Reviewed by Carlos Garcia Campos.
+
+ Remove the CompositingCoordinator::Client::paintLayerContents() method since
+ the only implementation in CoordinatedLayerTreeHost was empty.
+
+ Subsequently, the CompositingCoordinator::paintContents() override of the
+ GraphicsLayerClient method can also be removed. The notifyAnimationStarted()
+ override is empty, just like the base method, so it's removed as well.
+
+ * WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp:
+ (WebKit::CompositingCoordinator::deviceScaleFactor const): Bring method up
+ to the notifyFlushRequired() code, since both are overrides of the
+ GraphicsLayerClient-inherited methods.
+ (WebKit::CompositingCoordinator::pageScaleFactor const): Ditto.
+ (WebKit::CompositingCoordinator::notifyAnimationStarted): Deleted.
+ (WebKit::CompositingCoordinator::paintContents): Deleted.
+ * WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h:
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+ (WebKit::CoordinatedLayerTreeHost::paintLayerContents): Deleted.
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
+
2017-11-27 Carlos Garcia Campos <[email protected]>
REGRESSION(r223073): disk cache directory is no longer copied in ProcessPoolConfiguration::copy()
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp (225174 => 225175)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp 2017-11-27 17:05:47 UTC (rev 225174)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp 2017-11-27 17:06:23 UTC (rev 225175)
@@ -257,10 +257,6 @@
imageBacking->update();
}
-void CompositingCoordinator::notifyAnimationStarted(const GraphicsLayer*, const String&, double /* time */)
-{
-}
-
void CompositingCoordinator::notifyFlushRequired(const GraphicsLayer*)
{
if (!m_isDestructing && !isFlushingLayerChanges())
@@ -267,11 +263,16 @@
m_client.notifyFlushRequired();
}
-void CompositingCoordinator::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const FloatRect& clipRect, GraphicsLayerPaintBehavior)
+float CompositingCoordinator::deviceScaleFactor() const
{
- m_client.paintLayerContents(graphicsLayer, graphicsContext, enclosingIntRect(clipRect));
+ return m_page->deviceScaleFactor();
}
+float CompositingCoordinator::pageScaleFactor() const
+{
+ return m_page->pageScaleFactor();
+}
+
std::unique_ptr<GraphicsLayer> CompositingCoordinator::createGraphicsLayer(GraphicsLayer::Type layerType, GraphicsLayerClient& client)
{
CoordinatedGraphicsLayer* layer = new CoordinatedGraphicsLayer(layerType, client);
@@ -283,16 +284,6 @@
return std::unique_ptr<GraphicsLayer>(layer);
}
-float CompositingCoordinator::deviceScaleFactor() const
-{
- return m_page->deviceScaleFactor();
-}
-
-float CompositingCoordinator::pageScaleFactor() const
-{
- return m_page->pageScaleFactor();
-}
-
void CompositingCoordinator::createUpdateAtlas(uint32_t atlasID, RefPtr<CoordinatedBuffer>&& buffer)
{
m_state.updateAtlasesToCreate.append(std::make_pair(atlasID, WTFMove(buffer)));
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h (225174 => 225175)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h 2017-11-27 17:05:47 UTC (rev 225174)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h 2017-11-27 17:06:23 UTC (rev 225175)
@@ -60,7 +60,6 @@
virtual void didFlushRootLayer(const WebCore::FloatRect& visibleContentRect) = 0;
virtual void notifyFlushRequired() = 0;
virtual void commitSceneState(const WebCore::CoordinatedGraphicsState&) = 0;
- virtual void paintLayerContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, const WebCore::IntRect& clipRect) = 0;
virtual void releaseUpdateAtlases(const Vector<uint32_t>&) = 0;
};
@@ -100,9 +99,7 @@
};
// GraphicsLayerClient
- void notifyAnimationStarted(const WebCore::GraphicsLayer*, const String&, double time) override;
void notifyFlushRequired(const WebCore::GraphicsLayer*) override;
- void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& clipRect, WebCore::GraphicsLayerPaintBehavior) override;
float deviceScaleFactor() const override;
float pageScaleFactor() const override;
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (225174 => 225175)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2017-11-27 17:05:47 UTC (rev 225174)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2017-11-27 17:06:23 UTC (rev 225175)
@@ -205,10 +205,6 @@
}
}
-void CoordinatedLayerTreeHost::paintLayerContents(const GraphicsLayer*, GraphicsContext&, const IntRect&)
-{
-}
-
void CoordinatedLayerTreeHost::commitSceneState(const CoordinatedGraphicsState& state)
{
m_isWaitingForRenderer = true;
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h (225174 => 225175)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2017-11-27 17:05:47 UTC (rev 225174)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2017-11-27 17:06:23 UTC (rev 225175)
@@ -73,7 +73,6 @@
void didFlushRootLayer(const WebCore::FloatRect& visibleContentRect) override;
void notifyFlushRequired() override { scheduleLayerFlush(); };
void commitSceneState(const WebCore::CoordinatedGraphicsState&) override;
- void paintLayerContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, const WebCore::IntRect& clipRect) override;
void releaseUpdateAtlases(const Vector<uint32_t>&) override { };
private:
