diff options
| -rw-r--r-- | experimental/webtry/templates/template.cpp | 1 | ||||
| -rw-r--r-- | gyp/core.gypi | 3 | ||||
| -rw-r--r-- | gyp/public_headers.gypi | 1 | ||||
| -rw-r--r-- | include/core/SkFlattenableBuffers.h | 10 | ||||
| -rw-r--r-- | src/core/SkReadBuffer.h (renamed from include/core/SkReadBuffer.h) | 0 | ||||
| -rw-r--r-- | src/core/SkReader32.h (renamed from include/core/SkReader32.h) | 0 | ||||
| -rw-r--r-- | tests/ImageFilterTest.cpp | 2 |
7 files changed, 4 insertions, 13 deletions
diff --git a/experimental/webtry/templates/template.cpp b/experimental/webtry/templates/template.cpp index 6748854eba..be43706110 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 b6b0ef1ee0..3546638d48 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 f7b859bd5f..ef9a5f4109 100644 --- a/gyp/public_headers.gypi +++ b/gyp/public_headers.gypi @@ -73,7 +73,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 index 3e5d5b94ee..6c7c2ada0f 100644 --- a/include/core/SkFlattenableBuffers.h +++ b/include/core/SkFlattenableBuffers.h @@ -1,10 +1,2 @@ // 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 +// TODO(halcanary): delete this file. diff --git a/include/core/SkReadBuffer.h b/src/core/SkReadBuffer.h index cd3468670d..cd3468670d 100644 --- a/include/core/SkReadBuffer.h +++ b/src/core/SkReadBuffer.h diff --git a/include/core/SkReader32.h b/src/core/SkReader32.h index 3d874d170a..3d874d170a 100644 --- a/include/core/SkReader32.h +++ b/src/core/SkReader32.h diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index 4ee9f5dcb9..ee3de50c48 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" |