Reorganize BRD code in new tools directory

Rename SkCodecTools.h to SkBitmapRegionDecoderPriv.h

Move BRD code to its own directory in tools.  This
allows us to not need to expose the entire tools
directory in Android.

BUG=skia:

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

diff --git a/bench/BitmapRegionDecoderBench.cpp b/bench/BitmapRegionDecoderBench.cpp
index 4d9dec0..a98dbb0 100644 (file)
--- a/bench/BitmapRegionDecoderBench.cpp
+++ b/bench/BitmapRegionDecoderBench.cpp
@@ -8,7 +8,7 @@
 #include "BitmapRegionDecoderBench.h"
 #include "CodecBenchPriv.h"
 #include "SkBitmap.h"
-#include "SkCodecTools.h"
+#include "SkBitmapRegionDecoderPriv.h"
 #include "SkOSFile.h"
 
 BitmapRegionDecoderBench::BitmapRegionDecoderBench(const char* baseName, SkData* encoded,

diff --git a/dm/DM.cpp b/dm/DM.cpp
index 9bedd4f..2587b0d 100644 (file)
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -12,9 +12,9 @@
 #include "OverwriteLine.h"
 #include "ProcStats.h"
 #include "SkBBHFactory.h"
+#include "SkBitmapRegionDecoderPriv.h"
 #include "SkChecksum.h"
 #include "SkCodec.h"
-#include "SkCodecTools.h"
 #include "SkCommonFlags.h"
 #include "SkFontMgr.h"
 #include "SkForceLinking.h"

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index fb546dc..3581247 100644 (file)
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -8,8 +8,8 @@
 #include "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkAndroidCodec.h"
+#include "SkBitmapRegionDecoderPriv.h"
 #include "SkCodec.h"
-#include "SkCodecTools.h"
 #include "SkCommonFlags.h"
 #include "SkData.h"
 #include "SkDocument.h"

diff --git a/gyp/bench.gypi b/gyp/bench.gypi
index 95073b0..075fae8 100644 (file)
--- a/gyp/bench.gypi
+++ b/gyp/bench.gypi
@@ -11,7 +11,6 @@
     '../src/effects',
     '../src/gpu',
     '../src/utils',
-    '../tools',
   ],
   'sources': [ '<!@(python find.py ../bench "*.cpp")' ],
 

diff --git a/gyp/dm.gypi b/gyp/dm.gypi
index 8896673..933fa9a 100644 (file)
--- a/gyp/dm.gypi
+++ b/gyp/dm.gypi
@@ -16,7 +16,6 @@
     '../src/utils',
     '../src/utils/debugger',
     '../tests',
-    '../tools',
   ],
   'dependencies': [
     'etc1.gyp:libetc1',

diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 31672be..59b19dc 100644 (file)
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -51,9 +51,9 @@
       'target_name': 'bitmap_region_decoder',
       'type': 'static_library',
       'sources': [
-        '../tools/SkBitmapRegionCanvas.cpp',
-        '../tools/SkBitmapRegionCodec.cpp',
-        '../tools/SkBitmapRegionDecoder.cpp',
+        '../tools/android/SkBitmapRegionCanvas.cpp',
+        '../tools/android/SkBitmapRegionCodec.cpp',
+        '../tools/android/SkBitmapRegionDecoder.cpp',
       ],
       'include_dirs': [
         '../include/private',
@@ -64,7 +64,7 @@
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../tools',
+          '../tools/android',
         ],
       },
     },

diff --git a/tools/SkBitmapRegionCanvas.cpp b/tools/android/SkBitmapRegionCanvas.cpp
similarity index 99%
rename from tools/SkBitmapRegionCanvas.cpp
rename to tools/android/SkBitmapRegionCanvas.cpp
index 9129245..ffcab95 100644 (file)
--- a/tools/SkBitmapRegionCanvas.cpp
+++ b/tools/android/SkBitmapRegionCanvas.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "SkBitmapRegionCanvas.h"
+#include "SkBitmapRegionDecoderPriv.h"
 #include "SkCanvas.h"
 #include "SkCodecPriv.h"
-#include "SkCodecTools.h"
 
 SkBitmapRegionCanvas::SkBitmapRegionCanvas(SkCodec* decoder)
     : INHERITED(decoder->getInfo().width(), decoder->getInfo().height())

diff --git a/tools/SkBitmapRegionCanvas.h b/tools/android/SkBitmapRegionCanvas.h
similarity index 100%
rename from tools/SkBitmapRegionCanvas.h
rename to tools/android/SkBitmapRegionCanvas.h

diff --git a/tools/SkBitmapRegionCodec.cpp b/tools/android/SkBitmapRegionCodec.cpp
similarity index 99%
rename from tools/SkBitmapRegionCodec.cpp
rename to tools/android/SkBitmapRegionCodec.cpp
index 0af7b62..93ece4a 100644 (file)
--- a/tools/SkBitmapRegionCodec.cpp
+++ b/tools/android/SkBitmapRegionCodec.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "SkBitmapRegionCodec.h"
 #include "SkAndroidCodec.h"
+#include "SkBitmapRegionCodec.h"
+#include "SkBitmapRegionDecoderPriv.h"
 #include "SkCodecPriv.h"
-#include "SkCodecTools.h"
 #include "SkPixelRef.h"
 
 SkBitmapRegionCodec::SkBitmapRegionCodec(SkAndroidCodec* codec)

diff --git a/tools/SkBitmapRegionCodec.h b/tools/android/SkBitmapRegionCodec.h
similarity index 100%
rename from tools/SkBitmapRegionCodec.h
rename to tools/android/SkBitmapRegionCodec.h

diff --git a/tools/SkBitmapRegionDecoder.cpp b/tools/android/SkBitmapRegionDecoder.cpp
similarity index 100%
rename from tools/SkBitmapRegionDecoder.cpp
rename to tools/android/SkBitmapRegionDecoder.cpp

diff --git a/tools/SkBitmapRegionDecoder.h b/tools/android/SkBitmapRegionDecoder.h
similarity index 100%
rename from tools/SkBitmapRegionDecoder.h
rename to tools/android/SkBitmapRegionDecoder.h

diff --git a/tools/SkCodecTools.h b/tools/android/SkBitmapRegionDecoderPriv.h
similarity index 94%
rename from tools/SkCodecTools.h
rename to tools/android/SkBitmapRegionDecoderPriv.h
index 285d3a2..d7423b0 100644 (file)
--- a/tools/SkCodecTools.h
+++ b/tools/android/SkBitmapRegionDecoderPriv.h
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef SkCodecTools_DEFINED
-#define SkCodecTools_DEFINED
+#ifndef SkBitmapRegionDecoderPriv_DEFINED
+#define SkBitmapRegionDecoderPriv_DEFINED
 
 inline float get_scale_from_sample_size(uint32_t sampleSize) {
     return 1.0f / (float) sampleSize;
@@ -60,4 +60,4 @@ inline SubsetType adjust_subset_rect(const SkISize& imageDims, SkIRect* subset,
     return SubsetType::kFullyInside_SubsetType;
 }
 
-#endif // SkCodecTools_DEFINED
+#endif // SkBitmapRegionDecoderPriv_DEFINED