commit eb1d5a2e233ccfa7d0f6e0ac7355bf4a17aff2d0
author Mike Reed <reed@google.com> Tue Apr 14 09:16:40 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 14 13:43:34 2020 +0000
tree 80b2177eba2a746f75b529bcbbde44aef06e4be7
parent efb084025ec323daf5d53f19c2eaa5603eda2e2e

Move markerstack into its own object:

- owned by canvas
- pointed to by devices

Change-Id: Ia5abc60434cd34810ceea09ecab63c6b25eb972e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/283436
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index d905a68..15751ab 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -33,6 +33,7 @@
 #include "src/core/SkImageFilter_Base.h"
 #include "src/core/SkLatticeIter.h"
 #include "src/core/SkMSAN.h"
+#include "src/core/SkMarkerStack.h"
 #include "src/core/SkMatrixPriv.h"
 #include "src/core/SkMatrixUtils.h"
 #include "src/core/SkPaintPriv.h"
@@ -495,6 +496,8 @@
 }
 
 void SkCanvas::init(sk_sp<SkBaseDevice> device) {
+    fMarkerStack = sk_make_sp<SkMarkerStack>();
+
     fSaveCount = 1;
 
     fMCRec = (MCRec*)fMCStack.push_back();
@@ -517,6 +520,8 @@
         fDeviceClipBounds = qr_clip_bounds(device->getGlobalBounds());
 
         device->androidFramework_setDeviceClipRestriction(&fClipRestrictionRect);
+
+        device->setMarkerStack(fMarkerStack.get());
     }
 
     fScratchGlyphRunBuilder = std::make_unique<SkGlyphRunBuilder>();
@@ -1173,6 +1178,7 @@
         if (!newDevice) {
             return;
         }
+        newDevice->setMarkerStack(fMarkerStack.get());
     }
     DeviceCM* layer = new DeviceCM(newDevice, paint, stashedMatrix, rec.fClipMask, rec.fClipMatrix);
 
@@ -1262,9 +1268,7 @@
     // move this out before we do the actual restore
     auto backImage = std::move(fMCRec->fBackImage);
 
-    while (!fMarkerStack.empty() && fMarkerStack.back().fMCRec == fMCRec) {
-        fMarkerStack.pop_back();
-    }
+    fMarkerStack->restore(fMCRec);
 
     // now do the normal restore()
     fMCRec->~MCRec();       // balanced in save()
@@ -1547,35 +1551,11 @@
 
     this->onMarkCTM(id);
 
-    SkM44 mx = this->getLocalToDevice();
-
-    // Look if we've already seen id in this save-frame.
-    // If so, replace, else append
-    for (int i = fMarkerStack.size() - 1; i >= 0; --i) {
-        auto& m = fMarkerStack[i];
-        if (m.fMCRec != fMCRec) {   // we've gone past the current save-frame
-            break;                  // fall out so we append
-        }
-        if (m.fID == id) {    // in current frame, so replace
-            m.fMatrix = mx;
-            return;
-        }
-    }
-    // if we get here, we should append a new marker
-    fMarkerStack.push_back({fMCRec, mx, id});
+    fMarkerStack->setMarker(id, this->getLocalToDevice(), fMCRec);
 }
 
 bool SkCanvas::findMarkedCTM(MarkerID id, SkM44* mx) const {
-    // search from top to bottom, so we find the most recent id
-    for (int i = fMarkerStack.size() - 1; i >= 0; --i) {
-        if (fMarkerStack[i].fID == id) {
-            if (mx) {
-                *mx = fMarkerStack[i].fMatrix;
-            }
-            return true;
-        }
-    }
-    return false;
+    return fMarkerStack->findMarker(id, mx);
 }
 
 //////////////////////////////////////////////////////////////////////////////