From 1314918f903f0a1b40c2695f2b27737e9a8b443a Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Wed, 17 May 2017 11:39:50 +0000 Subject: [PATCH] Revert "add guard for extra includes" This reverts commit 037d78f84134de6f24ad0df2faa4d6ff0e185790. Reason for revert: did not help, will fix caller Original change's description: > add guard for extra includes > > Bug: skia: > Change-Id: Id500cb6ac6c2f4a925135a8e83ed4f2a07b73661 > Reviewed-on: https://skia-review.googlesource.com/17162 > Reviewed-by: Mike Reed > Commit-Queue: Mike Reed > TBR=reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Bug: skia: Change-Id: I6d7dd1c51ca81a6c24604ff509b31c2171b26314 Reviewed-on: https://skia-review.googlesource.com/17163 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- include/core/SkPictureRecorder.h | 6 ------ public.bzl | 1 - 2 files changed, 7 deletions(-) diff --git a/include/core/SkPictureRecorder.h b/include/core/SkPictureRecorder.h index a6efd2b5c5..09839cba5e 100644 --- a/include/core/SkPictureRecorder.h +++ b/include/core/SkPictureRecorder.h @@ -12,12 +12,6 @@ #include "SkPicture.h" #include "SkRefCnt.h" -#ifdef SK_SUPPORT_PICTURERECORDER_INCLUDES -// these are not strictly necessary, but can't remove them until we update clients -#include "SkRSXform.h" -#include "SkImage.h" -#endif - #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK namespace android { class Picture; diff --git a/public.bzl b/public.bzl index 9dfd518445..1813af0cb7 100644 --- a/public.bzl +++ b/public.bzl @@ -661,7 +661,6 @@ DEFINES_ALL = [ # Staging flags for API changes # Temporarily Disable analytic AA for Google3 "SK_NO_ANALYTIC_AA", - "SK_SUPPORT_PICTURERECORDER_INCLUDES", ] ################################################################################ -- 2.34.1