Revert "Move SkReadBuffer.h and SkReader32.h out of include."

This reverts commit 2a51d7c74cec217195f861677de8998b382b39e4.

Breaking Blink

NOTRY=true
R=bungeman@google.com
TBR=bungeman@google.com

Author: halcanary@google.com

Review URL: https://codereview.chromium.org/472303006

diff --git a/experimental/webtry/templates/template.cpp b/experimental/webtry/templates/template.cpp
index be43706..6748854 100644 (file)
--- a/experimental/webtry/templates/template.cpp
+++ b/experimental/webtry/templates/template.cpp
@@ -55,6 +55,7 @@
 #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 3546638..b6b0ef1 100644 (file)
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -155,9 +155,7 @@
         '<(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',
@@ -289,6 +287,7 @@
         '<(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 cd40197..f7b859b 100644 (file)
--- a/gyp/public_headers.gypi
+++ b/gyp/public_headers.gypi
@@ -39,6 +39,7 @@
       'core/SkFixed.h',
       'core/SkFlate.h',
       'core/SkFlattenable.h',
+      'core/SkFlattenableBuffers.h',
       'core/SkFlattenableSerialization.h',
       'core/SkFloatBits.h',
       'core/SkFloatingPoint.h',
@@ -72,6 +73,7 @@
       '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
new file mode 100644 (file)
index 0000000..3e5d5b9
--- /dev/null
+++ b/include/core/SkFlattenableBuffers.h
@@ -0,0 +1,10 @@
+// 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/src/core/SkReadBuffer.h b/include/core/SkReadBuffer.h
similarity index 100%
rename from src/core/SkReadBuffer.h
rename to include/core/SkReadBuffer.h

diff --git a/src/core/SkReader32.h b/include/core/SkReader32.h
similarity index 100%
rename from src/core/SkReader32.h
rename to include/core/SkReader32.h

diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index ee3de50..4ee9f5d 100644 (file)
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -15,6 +15,7 @@
 #include "SkDeviceImageFilterProxy.h"
 #include "SkDisplacementMapEffect.h"
 #include "SkDropShadowImageFilter.h"
+#include "SkFlattenableBuffers.h"
 #include "SkFlattenableSerialization.h"
 #include "SkGradientShader.h"
 #include "SkLightingImageFilter.h"
@@ -26,7 +27,6 @@
 #include "SkPicture.h"
 #include "SkPictureImageFilter.h"
 #include "SkPictureRecorder.h"
-#include "SkReadBuffer.h"
 #include "SkRect.h"
 #include "SkTileImageFilter.h"
 #include "SkXfermodeImageFilter.h"