Attachment 347905 Details for Bug 188849 – Patch for landing

[patch] Patch for landing

bug-188849-20180823082609.patch (text/plain), 8.63 KB, created by Zan Dobersek on 2018-08-22 23:26:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Zan Dobersek

Created: 2018-08-22 23:26:10 PDT

Size: 8.63 KB

patch

obsolete

>Subversion Revision: 235217
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d8b1bf86dd520822fce9833315dcd6ccfe57bb7b..a62aabc412f3601fc38721b615b5a8252ba5066d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,30 @@
>+2018-08-22  Zan Dobersek  <zdobersek@igalia.com>
>+
>+        [CoordGraphics] Remove TiledBackingStoreClient inheritance from CoordinatedGraphicsLayer
>+        https://bugs.webkit.org/show_bug.cgi?id=188849
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        Remove the TiledBackingStoreClient inheritance from the
>+        CoordinatedGraphicsLayer class since it's not used anymore after changes
>+        made in r235165.
>+
>+        Related TiledBackingStore objects on this class, along with tile state
>+        tracking member variables on the CoordinatedGraphicsLayerState class,
>+        are also removed.
>+
>+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
>+        (WebCore::CoordinatedGraphicsLayer::~CoordinatedGraphicsLayer):
>+        (WebCore::CoordinatedGraphicsLayer::resetLayerState):
>+        (WebCore::CoordinatedGraphicsLayer::purgeBackingStores):
>+        (WebCore::CoordinatedGraphicsLayer::tiledBackingStoreHasPendingTileCreation): Deleted.
>+        (WebCore::CoordinatedGraphicsLayer::createTile): Deleted.
>+        (WebCore::CoordinatedGraphicsLayer::updateTile): Deleted.
>+        (WebCore::CoordinatedGraphicsLayer::removeTile): Deleted.
>+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
>+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:
>+        (WebCore::CoordinatedGraphicsLayerState::hasPendingChanges const):
>+
> 2018-08-22  Zan Dobersek  <zdobersek@igalia.com>
> 
>         [CoordGraphics] Remove CoordinatedImageBacking and related functionality
>diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
>index 7c6164294e0535239ec9d57f49a8660320c605f0..876aec9479f4c546c2e0e50492d87b05b70479bf 100644
>--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
>+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
>@@ -38,6 +38,7 @@
> #include "NicosiaPaintingEngine.h"
> #include "ScrollableArea.h"
> #include "TextureMapperPlatformLayerProxyProvider.h"
>+#include "TiledBackingStore.h"
> #ifndef NDEBUG
> #include <wtf/SetForScope.h>
> #endif
>@@ -155,7 +156,6 @@ CoordinatedGraphicsLayer::~CoordinatedGraphicsLayer()
>         purgeBackingStores();
>         m_coordinator->detachLayer(this);
>     }
>-    ASSERT(!m_mainBackingStore);
>     ASSERT(!m_nicosia.imageBacking);
>     ASSERT(!m_nicosia.backingStore);
>     willBeDestroyed();
>@@ -950,9 +950,6 @@ void CoordinatedGraphicsLayer::syncPendingStateChangesIncludingSubLayers()
> void CoordinatedGraphicsLayer::resetLayerState()
> {
>     m_layerState.changeMask = 0;
>-    m_layerState.tilesToCreate.clear();
>-    m_layerState.tilesToRemove.clear();
>-    m_layerState.tilesToUpdate.clear();
> }
> 
> void CoordinatedGraphicsLayer::deviceOrPageScaleFactorChanged()
>@@ -966,12 +963,6 @@ float CoordinatedGraphicsLayer::effectiveContentsScale()
>     return selfOrAncestorHaveNonAffineTransforms() ? 1 : deviceScaleFactor() * pageScaleFactor();
> }
> 
>-void CoordinatedGraphicsLayer::tiledBackingStoreHasPendingTileCreation()
>-{
>-    setNeedsVisibleRectAdjustment();
>-    notifyFlushRequired();
>-}
>-
> static void clampToContentsRectIfRectIsInfinite(FloatRect& rect, const FloatSize& contentsSize)
> {
>     if (rect.width() >= LayoutUnit::nearlyMax() || rect.width() <= LayoutUnit::nearlyMin()) {
>@@ -1000,36 +991,6 @@ IntRect CoordinatedGraphicsLayer::transformedVisibleRect()
>     return enclosingIntRect(rect);
> }
> 
>-void CoordinatedGraphicsLayer::createTile(uint32_t tileID, float scaleFactor)
>-{
>-    ASSERT(m_coordinator);
>-    ASSERT(m_coordinator->isFlushingLayerChanges());
>-
>-    TileCreationInfo creationInfo;
>-    creationInfo.tileID = tileID;
>-    creationInfo.scale = scaleFactor;
>-    m_layerState.tilesToCreate.append(creationInfo);
>-}
>-
>-void CoordinatedGraphicsLayer::updateTile(uint32_t tileID, const SurfaceUpdateInfo& updateInfo, const IntRect& tileRect)
>-{
>-    ASSERT(m_coordinator);
>-    ASSERT(m_coordinator->isFlushingLayerChanges());
>-
>-    TileUpdateInfo tileUpdateInfo;
>-    tileUpdateInfo.tileID = tileID;
>-    tileUpdateInfo.tileRect = tileRect;
>-    tileUpdateInfo.updateInfo = updateInfo;
>-    m_layerState.tilesToUpdate.append(tileUpdateInfo);
>-}
>-
>-void CoordinatedGraphicsLayer::removeTile(uint32_t tileID)
>-{
>-    ASSERT(m_coordinator);
>-    ASSERT(m_coordinator->isFlushingLayerChanges() || m_isPurging);
>-    m_layerState.tilesToRemove.append(tileID);
>-}
>-
> void CoordinatedGraphicsLayer::updateContentBuffersIncludingSubLayers()
> {
>     if (CoordinatedGraphicsLayer* mask = downcast<CoordinatedGraphicsLayer>(maskLayer()))
>@@ -1161,8 +1122,6 @@ void CoordinatedGraphicsLayer::purgeBackingStores()
> #ifndef NDEBUG
>     SetForScope<bool> updateModeProtector(m_isPurging, true);
> #endif
>-    m_mainBackingStore = nullptr;
>-    m_previousBackingStore = nullptr;
>     if (m_nicosia.backingStore) {
>         auto& layerState = downcast<Nicosia::BackingStoreTextureMapperImpl>(m_nicosia.backingStore->impl()).layerState();
>         layerState.isPurging = true;
>diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h
>index b4cbef4a70be7b4dd35cc8c5a6afd50cad115c63..10a2d59ba26477c94d0b06de8be7e8ef28216a91 100644
>--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h
>+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h
>@@ -32,8 +32,6 @@
> #include "NicosiaBuffer.h"
> #include "NicosiaPlatformLayer.h"
> #include "TextureMapperAnimation.h"
>-#include "TiledBackingStore.h"
>-#include "TiledBackingStoreClient.h"
> #include "TransformationMatrix.h"
> #include <wtf/text/StringHash.h>
> 
>@@ -56,8 +54,7 @@ public:
>     virtual void syncLayerState(CoordinatedLayerID, CoordinatedGraphicsLayerState&) = 0;
> };
> 
>-class WEBCORE_EXPORT CoordinatedGraphicsLayer : public GraphicsLayer
>-    , public TiledBackingStoreClient {
>+class WEBCORE_EXPORT CoordinatedGraphicsLayer : public GraphicsLayer {
> public:
>     explicit CoordinatedGraphicsLayer(Type, GraphicsLayerClient&);
>     virtual ~CoordinatedGraphicsLayer();
>@@ -119,12 +116,6 @@ public:
> 
>     IntRect transformedVisibleRect();
> 
>-    // TiledBackingStoreClient
>-    void tiledBackingStoreHasPendingTileCreation() override;
>-    void createTile(uint32_t tileID, float) override;
>-    void updateTile(uint32_t tileID, const SurfaceUpdateInfo&, const IntRect&) override;
>-    void removeTile(uint32_t tileID) override;
>-
>     void setCoordinator(CoordinatedGraphicsLayerClient*);
>     void setCoordinatorIncludingSubLayersIfNeeded(CoordinatedGraphicsLayerClient*);
> 
>@@ -199,8 +190,6 @@ private:
> #endif
> 
>     CoordinatedGraphicsLayerClient* m_coordinator;
>-    std::unique_ptr<TiledBackingStore> m_mainBackingStore;
>-    std::unique_ptr<TiledBackingStore> m_previousBackingStore;
> 
>     struct {
>         bool completeLayer { false };
>diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h
>index ffcf284b9e93639f453b0e3a641569a5813dcd1f..9c2364a15dc98c6af72b25fde5a22b5b5564d3c6 100644
>--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h
>+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h
>@@ -52,17 +52,6 @@ namespace WebCore {
> typedef uint32_t CoordinatedLayerID;
> enum { InvalidCoordinatedLayerID = 0 };
> 
>-struct TileUpdateInfo {
>-    uint32_t tileID;
>-    IntRect tileRect;
>-    WebCore::SurfaceUpdateInfo updateInfo;
>-};
>-
>-struct TileCreationInfo {
>-    uint32_t tileID;
>-    float scale;
>-};
>-
> struct DebugVisuals {
>     Color debugBorderColor;
>     float debugBorderWidth { 0 };
>@@ -145,22 +134,18 @@ struct CoordinatedGraphicsLayerState {
>     FilterOperations filters;
>     TextureMapperAnimations animations;
>     Vector<uint32_t> children;
>-    Vector<TileCreationInfo> tilesToCreate;
>-    Vector<uint32_t> tilesToRemove;
>     CoordinatedLayerID replica;
>     CoordinatedLayerID mask;
>     DebugVisuals debugVisuals;
>     RepaintCount repaintCount;
> 
>-    Vector<TileUpdateInfo> tilesToUpdate;
>-
> #if USE(COORDINATED_GRAPHICS_THREADED)
>     RefPtr<TextureMapperPlatformLayerProxy> platformLayerProxy;
> #endif
> 
>     bool hasPendingChanges() const
>     {
>-        return changeMask || tilesToUpdate.size() || tilesToRemove.size() || tilesToCreate.size();
>+        return changeMask;
>     }
> };
>

Actions: View | Formatted Diff | Diff

Attachments on bug 188849: 347799 | 347905