Changeset 236974 in webkit

Timestamp:

Oct 9, 2018, 12:23:21 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[CoordGraphics] Remove the 'previous backing store' logic
​https://bugs.webkit.org/show_bug.cgi?id=188838

Patch by Carlos Eduardo Ramalho <​cadubentzen@gmail.com> on 2018-10-09
Reviewed by Žan Doberšek.

Remove previousBackingStore from LayerState, since it's not needed anymore.
When there is scale adjustment, we now simply discard mainBackingStore and
recreate a new one.

No new tests required.

• platform/graphics/nicosia/texmap/NicosiaBackingStoreTextureMapperImpl.h:
• platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:

(WebCore::CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly):
(WebCore::CoordinatedGraphicsLayer::updateContentBuffers):
(WebCore::CoordinatedGraphicsLayer::purgeBackingStores):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/nicosia/texmap/NicosiaBackingStoreTextureMapperImpl.h (modified) (1 diff)
• platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-09  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
+
+        [CoordGraphics] Remove the 'previous backing store' logic
+        https://bugs.webkit.org/show_bug.cgi?id=188838
+
+        Reviewed by Žan Doberšek.
+
+        Remove previousBackingStore from LayerState, since it's not needed anymore.
+        When there is scale adjustment, we now simply discard mainBackingStore and
+        recreate a new one.
+
+        No new tests required.
+
+        * platform/graphics/nicosia/texmap/NicosiaBackingStoreTextureMapperImpl.h:
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+        (WebCore::CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly):
+        (WebCore::CoordinatedGraphicsLayer::updateContentBuffers):
+        (WebCore::CoordinatedGraphicsLayer::purgeBackingStores):
+
 2018-10-09  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaBackingStoreTextureMapperImpl.h

@@ -86 +86 @@
 
         std::unique_ptr<WebCore::TiledBackingStore> mainBackingStore;
-        std::unique_ptr<WebCore::TiledBackingStore> previousBackingStore;
 
         TileUpdate update;

trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp

@@ -648 +648 @@
         layerState.isPurging = true;
         layerState.mainBackingStore = nullptr;
-        layerState.previousBackingStore = nullptr;
 
         m_nicosia.backingStore = nullptr;
@@ -868 +867 @@
 
     // Address the content scale adjustment.
-    // FIXME: the previousBackingStore logic is likely possible to remove.
-    // https://bugs.webkit.org/show_bug.cgi?id=188693
     if (m_pendingContentsScaleAdjustment) {
         if (layerState.mainBackingStore && layerState.mainBackingStore->contentsScale() != effectiveContentsScale()) {
-            // Between creating the new backing store and painting the content, we do not
-            // want to drop the previous one as that might result in briefly seeing flickering
-            // as the old tiles may be dropped before something replaces them.
-            layerState.previousBackingStore = WTFMove(layerState.mainBackingStore);
-
-            // No reason to save the previous backing store for non-visible areas.
-            layerState.previousBackingStore->removeAllNonVisibleTiles(transformedVisibleRect(), IntRect(0, 0, size().width(), size().height()));
+            // Discard the TiledBackingStore object to reconstruct it with new content scale.
+            layerState.mainBackingStore = nullptr;
         }
         m_pendingContentsScaleAdjustment = false;
@@ -943 +935 @@
             didUpdateTileBuffers();
     }
-
-    // The previous backing store is kept around to avoid flickering between
-    // removing the existing tiles and painting the new ones. The first time
-    // the visibleRect is full painted we remove the previous backing store.
-    if (layerState.previousBackingStore && layerState.mainBackingStore->visibleAreaIsCovered())
-        layerState.previousBackingStore = nullptr;
 
     // Request a second update immediately if some tiles are still pending creation.
@@ -968 +954 @@
         layerState.isPurging = true;
         layerState.mainBackingStore = nullptr;
-        layerState.previousBackingStore = nullptr;
 
         m_nicosia.backingStore = nullptr;