From 2a51d7c74cec217195f861677de8998b382b39e4 Mon Sep 17 00:00:00 2001 From: halcanary Date: Mon, 18 Aug 2014 13:04:59 -0700 Subject: [PATCH] Move SkReadBuffer.h and SkReader32.h out of include. R=mtklein@google.com, reed@google.com Author: halcanary@google.com Review URL: https://codereview.chromium.org/481053002 --- experimental/webtry/templates/template.cpp | 1 - gyp/core.gypi | 3 ++- gyp/public_headers.gypi | 2 -- include/core/SkFlattenableBuffers.h | 10 ---------- {include => src}/core/SkReadBuffer.h | 0 {include => src}/core/SkReader32.h | 0 tests/ImageFilterTest.cpp | 2 +- 7 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 include/core/SkFlattenableBuffers.h rename {include => src}/core/SkReadBuffer.h (100%) rename {include => src}/core/SkReader32.h (100%) diff --git a/experimental/webtry/templates/template.cpp b/experimental/webtry/templates/template.cpp index 6748854..be43706 100644 --- a/experimental/webtry/templates/template.cpp +++ b/experimental/webtry/templates/template.cpp @@ -55,7 +55,6 @@ #include "SkError.h" #include "SkFixed.h" #include "SkFlate.h" -#include "SkFlattenableBuffers.h" #include "SkFlattenable.h" #include "SkFlattenableSerialization.h" #include "SkFloatBits.h" diff --git a/gyp/core.gypi b/gyp/core.gypi index b6b0ef1..3546638 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -155,7 +155,9 @@ '<(skia_src_path)/core/SkQuadTree.h', '<(skia_src_path)/core/SkRasterClip.cpp', '<(skia_src_path)/core/SkRasterizer.cpp', + '<(skia_src_path)/core/SkReadBuffer.h', '<(skia_src_path)/core/SkReadBuffer.cpp', + '<(skia_src_path)/core/SkReader32.h', '<(skia_src_path)/core/SkRecordAnalysis.cpp', '<(skia_src_path)/core/SkRecordAnalysis.h', '<(skia_src_path)/core/SkRecordDraw.cpp', @@ -287,7 +289,6 @@ '<(skia_include_path)/core/SkPoint.h', '<(skia_include_path)/core/SkPreConfig.h', '<(skia_include_path)/core/SkRasterizer.h', - '<(skia_include_path)/core/SkReader32.h', '<(skia_include_path)/core/SkRect.h', '<(skia_include_path)/core/SkRefCnt.h', '<(skia_include_path)/core/SkRegion.h', diff --git a/gyp/public_headers.gypi b/gyp/public_headers.gypi index f7b859b..cd40197 100644 --- a/gyp/public_headers.gypi +++ b/gyp/public_headers.gypi @@ -39,7 +39,6 @@ 'core/SkFixed.h', 'core/SkFlate.h', 'core/SkFlattenable.h', - 'core/SkFlattenableBuffers.h', 'core/SkFlattenableSerialization.h', 'core/SkFloatBits.h', 'core/SkFloatingPoint.h', @@ -73,7 +72,6 @@ 'core/SkPreConfig.h', 'core/SkRRect.h', 'core/SkRasterizer.h', - 'core/SkReader32.h', 'core/SkRect.h', 'core/SkRefCnt.h', 'core/SkRegion.h', diff --git a/include/core/SkFlattenableBuffers.h b/include/core/SkFlattenableBuffers.h deleted file mode 100644 index 3e5d5b9..0000000 --- a/include/core/SkFlattenableBuffers.h +++ /dev/null @@ -1,10 +0,0 @@ -// Temporary shim to keep a couple dependencies working in Chromium. -#ifndef SkFlattenableBuffers_DEFINED -#define SkFlattenableBuffers_DEFINED - -#include "SkReadBuffer.h" -#include "SkWriteBuffer.h" - -typedef SkReadBuffer SkFlattenableReadBuffer; - -#endif//SkFlattenableBuffers_DEFINED diff --git a/include/core/SkReadBuffer.h b/src/core/SkReadBuffer.h similarity index 100% rename from include/core/SkReadBuffer.h rename to src/core/SkReadBuffer.h diff --git a/include/core/SkReader32.h b/src/core/SkReader32.h similarity index 100% rename from include/core/SkReader32.h rename to src/core/SkReader32.h diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index 4ee9f5d..ee3de50 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -15,7 +15,6 @@ #include "SkDeviceImageFilterProxy.h" #include "SkDisplacementMapEffect.h" #include "SkDropShadowImageFilter.h" -#include "SkFlattenableBuffers.h" #include "SkFlattenableSerialization.h" #include "SkGradientShader.h" #include "SkLightingImageFilter.h" @@ -27,6 +26,7 @@ #include "SkPicture.h" #include "SkPictureImageFilter.h" #include "SkPictureRecorder.h" +#include "SkReadBuffer.h" #include "SkRect.h" #include "SkTileImageFilter.h" #include "SkXfermodeImageFilter.h" -- 2.7.4