diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-05-30 14:59:23 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-30 14:59:29 +0000 |
| commit | cf9086ce1ebd9efa27e96cfb09d9c72aac68aca1 (patch) | |
| tree | e6b776e608da1465230d88ab108ccd1a8c2e6f3f /include/private | |
| parent | 462505f3100f0abc52adfd4506b62719e7151e18 (diff) | |
Revert "Allow CCPR in DDL mode"
This reverts commit 93540dd15715057e00b4f136977f441720317b60.
Reason for revert: Chrome!
> Allow CCPR in DDL mode
>
> Bug: skia:7988
> Change-Id: If757f29e0156c0ef7045b437b04e17aebe4de851
> Reviewed-on: https://skia-review.googlesource.com/130509
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,robertphillips@google.com,csmartdalton@google.com
Change-Id: Ibb5017d1bf307545969069b94987e0a51a22e333
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7988
Reviewed-on: https://skia-review.googlesource.com/130880
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/SkDeferredDisplayList.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/private/SkDeferredDisplayList.h b/include/private/SkDeferredDisplayList.h index 69e9def519..4d379636a9 100644 --- a/include/private/SkDeferredDisplayList.h +++ b/include/private/SkDeferredDisplayList.h @@ -11,10 +11,7 @@ #include "SkSurfaceCharacterization.h" #if SK_SUPPORT_GPU -#include <map> #include "GrOpList.h" - -struct GrCCPerOpListPaths; #endif class SkSurface; @@ -25,7 +22,7 @@ class SkSurface; * * TODO: we probably need to expose this class so users can query it for memory usage. */ -class SK_API SkDeferredDisplayList { +class SkDeferredDisplayList { public: #if SK_SUPPORT_GPU @@ -45,7 +42,6 @@ public: SkDeferredDisplayList(const SkSurfaceCharacterization& characterization, sk_sp<LazyProxyData>); - ~SkDeferredDisplayList(); const SkSurfaceCharacterization& characterization() const { return fCharacterization; @@ -58,11 +54,7 @@ private: const SkSurfaceCharacterization fCharacterization; #if SK_SUPPORT_GPU - // This needs to match the same type in GrCoverageCountingPathRenderer.h - using PendingPathsMap = std::map<uint32_t, sk_sp<GrCCPerOpListPaths>>; - SkTArray<sk_sp<GrOpList>> fOpLists; - PendingPathsMap fPendingPaths; // This is the path data from CCPR. #endif sk_sp<LazyProxyData> fLazyProxyData; }; |