commit 869fe56c309aae82b87da8f9fa4fdb8119686cae
author Robert Phillips <robertphillips@google.com> Mon Sep 17 14:55:49 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 18 17:08:58 2018 +0000
tree f0540a9db5b5662baa785bd286347f8c5e8e7852
parent 0191ed8e87dca709c1248a685248e0a694bce80a

Revert "Suppress addition of changeListeners during DDL recording"

This should no longer be required with the addition of https://skia-review.googlesource.com/c/skia/+/154861/ (Make atomic lists list for bitmaps and paths)

Bug: skia:8324
Change-Id: I2177fe16ea8b049f36c5d3d5a17ea2c69ce42eca
Reviewed-on: https://skia-review.googlesource.com/154980
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrBitmapTextureMaker.cpp

diff --git a/src/gpu/GrBitmapTextureMaker.cpp b/src/gpu/GrBitmapTextureMaker.cpp
index 9de4d2c..19ba702 100644
--- a/src/gpu/GrBitmapTextureMaker.cpp
+++ b/src/gpu/GrBitmapTextureMaker.cpp
@@ -60,9 +60,7 @@
             }
             if (!willBeMipped || GrMipMapped::kYes == proxy->mipMapped()) {
                 SkASSERT(proxy->origin() == kTopLeft_GrSurfaceOrigin);
-                if (fOriginalKey.isValid() && !proxyProvider->recordingDDL()) {
-                    // If we're recording a DDL we cannot add genID change listeners because
-                    // that process isn't thread safe
+                if (fOriginalKey.isValid()) {
                     GrInstallBitmapUniqueKeyInvalidator(
                             fOriginalKey, proxyProvider->contextUniqueID(), fBitmap.pixelRef());
                 }
@@ -88,14 +86,8 @@
                 // time it too will be deleted or recycled.
                 proxyProvider->removeUniqueKeyFromProxy(fOriginalKey, proxy.get());
                 proxyProvider->assignUniqueKeyToProxy(fOriginalKey, mippedProxy.get());
-
-                if (!proxyProvider->recordingDDL()) {
-                    // If we're recording a DDL we cannot add genID change listeners because
-                    // that process isn't thread safe
-                    GrInstallBitmapUniqueKeyInvalidator(fOriginalKey,
-                                                        proxyProvider->contextUniqueID(),
-                                                        fBitmap.pixelRef());
-                }
+                GrInstallBitmapUniqueKeyInvalidator(fOriginalKey, proxyProvider->contextUniqueID(),
+                                                    fBitmap.pixelRef());
             }
             return mippedProxy;
         }

src/gpu/GrSoftwarePathRenderer.cpp

diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index 42a1c6a..05b2795 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -370,13 +370,8 @@
         if (useCache) {
             SkASSERT(proxy->origin() == kTopLeft_GrSurfaceOrigin);
             fProxyProvider->assignUniqueKeyToProxy(maskKey, proxy.get());
-
-            if (!fProxyProvider->recordingDDL()) {
-                // If we're recording a DDL we cannot add genID change listeners because
-                // that process isn't thread safe
-                args.fShape->addGenIDChangeListener(
-                        sk_make_sp<PathInvalidator>(maskKey, args.fContext->uniqueID()));
-            }
+            args.fShape->addGenIDChangeListener(
+                    sk_make_sp<PathInvalidator>(maskKey, args.fContext->uniqueID()));
         }
     }
     if (inverseFilled) {

src/gpu/GrTextureAdjuster.cpp

diff --git a/src/gpu/GrTextureAdjuster.cpp b/src/gpu/GrTextureAdjuster.cpp
index c682e0b..aa478aa 100644
--- a/src/gpu/GrTextureAdjuster.cpp
+++ b/src/gpu/GrTextureAdjuster.cpp
@@ -65,11 +65,7 @@
                 proxyProvider->removeUniqueKeyFromProxy(key, cachedCopy.get());
             }
             proxyProvider->assignUniqueKeyToProxy(key, copy.get());
-            if (!proxyProvider->recordingDDL()) {
-                // If we're recording a DDL we cannot add genID change listeners because
-                // that process isn't thread safe
-                this->didCacheCopy(key, proxyProvider->contextUniqueID());
-            }
+            this->didCacheCopy(key, proxyProvider->contextUniqueID());
         }
     }
     return copy;