diff options
| author |  robertphillips <robertphillips@google.com> | 2015-02-11 13:18:14 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-11 13:18:14 -0800 |
| commit | 2de59391157850b62ab5891aae349b64eb1d8a17 (patch) | |
| tree | a02b3ffaa6fd7553cde138509b726f7ee00d96fe | |
| parent | 25e929955f27370a6962a46d8baccf338d9a0bc6 (diff) | |
Revert of Fix Chromium build (patchset #2 id:20001 of https://codereview.chromium.org/916763003/)
Reason for revert:
Chrome
Original issue's description:
> Fix Chromium build
>
> TBR=jvanverth@google.com
>
> Committed: https://skia.googlesource.com/skia/+/f5e89c8f685ac8a5c4d117e087b4111d613106db
TBR=jvanverth@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/916963002
| -rw-r--r-- | debugger/QT/SkDebuggerGUI.cpp | 3 | ||||
| -rw-r--r-- | src/utils/debugger/SkDrawCommand.h | 2 | ||||
| -rw-r--r-- | tests/MatrixClipCollapseTest.cpp | 4 | ||||
| -rw-r--r-- | tools/filtermain.cpp | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp index b202e3dd03..01d8c665e3 100644 --- a/debugger/QT/SkDebuggerGUI.cpp +++ b/debugger/QT/SkDebuggerGUI.cpp @@ -7,6 +7,9 @@ #include "SkDebuggerGUI.h" #include "PictureRenderer.h" +#include "SkPictureData.h" +#include "SkPicturePlayback.h" +#include "SkPictureRecord.h" #include <QListWidgetItem> #include <QtGui> diff --git a/src/utils/debugger/SkDrawCommand.h b/src/utils/debugger/SkDrawCommand.h index 8fd545f990..746bf5979c 100644 --- a/src/utils/debugger/SkDrawCommand.h +++ b/src/utils/debugger/SkDrawCommand.h @@ -72,8 +72,6 @@ private: bool fVisible; }; -typedef SkDrawCommand::OpType DrawType; - class SkRestoreCommand : public SkDrawCommand { public: SkRestoreCommand(); diff --git a/tests/MatrixClipCollapseTest.cpp b/tests/MatrixClipCollapseTest.cpp index 36a3ea4c98..c9940272c0 100644 --- a/tests/MatrixClipCollapseTest.cpp +++ b/tests/MatrixClipCollapseTest.cpp @@ -6,9 +6,6 @@ */ #include "Test.h" - -#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE - #include "SkCanvas.h" #include "SkDebugCanvas.h" #include "SkPicture.h" @@ -55,6 +52,7 @@ // system is ready for prime time // bench the recording times with/without matrix/clip collapsing +#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE // Enable/disable debugging helper code //#define TEST_COLLAPSE_MATRIX_CLIP_STATE 1 diff --git a/tools/filtermain.cpp b/tools/filtermain.cpp index 9e15445c84..3b9d05682c 100644 --- a/tools/filtermain.cpp +++ b/tools/filtermain.cpp @@ -13,6 +13,7 @@ #include "SkImageEncoder.h" #include "SkOSFile.h" #include "SkPicture.h" +#include "SkPictureRecord.h" #include "SkPictureRecorder.h" #include "SkStream.h" #include "picture_utils.h" |