diff options
author | Florin Malita <fmalita@chromium.org> | 2017-05-03 19:16:58 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-03 19:17:11 +0000 |
commit | ab244f045a0740fa6106ed21a4e5824cd09f84f3 (patch) | |
tree | 77545cce4d67b088b7f91ceebf388b6b0ccf96c8 /tools | |
parent | ac6f8ef9e6065a97320e543b7c32248094ee56e4 (diff) |
Revert "Revert "Reland: Remove SkLights include from SkCanvas.h""
This reverts commit 9d5f66d9c21eda7d3e2ed47654180c0c4b6e38b1.
Reason for revert: Leon landed Android fixes.
Original change's description:
> Revert "Reland: Remove SkLights include from SkCanvas.h"
>
> This reverts commit fed00319c9bafa41c8df658708030c072b301a41.
>
> Reason for revert: breaking the Android roll.
>
> Original change's description:
> > Reland: Remove SkLights include from SkCanvas.h
> >
> > SkLights.h pulls in a bunch of other headers and is not needed (fwdecl
> > works fine).
> >
> > Change-Id: I3ed97cd7861e51dcb7cfa7950a97b420dbc6fbfb
> > TBR=reed@google.com
> > Reviewed-on: https://skia-review.googlesource.com/15143
> > Commit-Queue: Florin Malita <fmalita@chromium.org>
> > Reviewed-by: Florin Malita <fmalita@chromium.org>
> >
>
> TBR=fmalita@chromium.org,reed@google.com
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
>
> Change-Id: I3b0e69f1d04d160f16a5567b09982d35cc9ca84e
> Reviewed-on: https://skia-review.googlesource.com/15195
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Florin Malita <fmalita@chromium.org>
>
TBR=msarett@google.com,reviews@skia.org,fmalita@chromium.org,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I0a1c2f9df61f16987ab72dfb4f3a205fbcc37667
Reviewed-on: https://skia-review.googlesource.com/15229
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/debugger/SkDrawCommand.h | 1 | ||||
-rw-r--r-- | tools/dump_record.cpp | 1 | ||||
-rw-r--r-- | tools/ok.cpp | 1 | ||||
-rw-r--r-- | tools/ok_srcs.cpp | 1 | ||||
-rw-r--r-- | tools/ok_vias.cpp | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/tools/debugger/SkDrawCommand.h b/tools/debugger/SkDrawCommand.h index fc2f45adef..1b3d9abf32 100644 --- a/tools/debugger/SkDrawCommand.h +++ b/tools/debugger/SkDrawCommand.h @@ -8,6 +8,7 @@ #ifndef SKDRAWCOMMAND_H_ #define SKDRAWCOMMAND_H_ +#include "SkBitmap.h" #include "SkCanvas.h" #include "SkTLazy.h" #include "SkPath.h" diff --git a/tools/dump_record.cpp b/tools/dump_record.cpp index c1b87e7535..24017bd6c9 100644 --- a/tools/dump_record.cpp +++ b/tools/dump_record.cpp @@ -6,6 +6,7 @@ */ #include "DumpRecord.h" +#include "SkBitmap.h" #include "SkCommandLineFlags.h" #include "SkDeferredCanvas.h" #include "SkPicture.h" diff --git a/tools/ok.cpp b/tools/ok.cpp index 10f9afdbe0..edda9bede0 100644 --- a/tools/ok.cpp +++ b/tools/ok.cpp @@ -10,6 +10,7 @@ // * ok is entirely opt-in. No more maintaining huge --blacklists. #include "SkGraphics.h" +#include "SkImage.h" #include "ok.h" #include <chrono> #include <future> diff --git a/tools/ok_srcs.cpp b/tools/ok_srcs.cpp index fd5f201cac..5630a34595 100644 --- a/tools/ok_srcs.cpp +++ b/tools/ok_srcs.cpp @@ -7,6 +7,7 @@ #include "ok.h" #include "gm.h" +#include "SkData.h" #include "SkOSFile.h" #include "SkPicture.h" #include <vector> diff --git a/tools/ok_vias.cpp b/tools/ok_vias.cpp index 17e117a7f9..20779cfd78 100644 --- a/tools/ok_vias.cpp +++ b/tools/ok_vias.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ +#include "SkImage.h" #include "SkOSFile.h" #include "SkPictureRecorder.h" #include "ok.h" |