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

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,

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"

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"

gyp/bench.gypi

@@ -11,7 +11,6 @@
     '../src/effects',
     '../src/gpu',
     '../src/utils',
-    '../tools',
   ],
   'sources': [ '<!@(python find.py ../bench "*.cpp")' ],
 

gyp/dm.gypi

@@ -16,7 +16,6 @@
     '../src/utils',
     '../src/utils/debugger',
     '../tests',
-    '../tools',
   ],
   'dependencies': [
     'etc1.gyp:libetc1',

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',
         ],
       },
     },

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())

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)

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