From 84a80652752976c9abe42d28e467c362baff3e39 Mon Sep 17 00:00:00 2001 From: msarett Date: Tue, 10 Nov 2015 15:49:46 -0800 Subject: [PATCH] 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 | 2 +- dm/DM.cpp | 2 +- dm/DMSrcSink.cpp | 2 +- gyp/bench.gypi | 1 - gyp/dm.gypi | 1 - gyp/tools.gyp | 8 ++++---- tools/{ => android}/SkBitmapRegionCanvas.cpp | 2 +- tools/{ => android}/SkBitmapRegionCanvas.h | 0 tools/{ => android}/SkBitmapRegionCodec.cpp | 4 ++-- tools/{ => android}/SkBitmapRegionCodec.h | 0 tools/{ => android}/SkBitmapRegionDecoder.cpp | 0 tools/{ => android}/SkBitmapRegionDecoder.h | 0 tools/{SkCodecTools.h => android/SkBitmapRegionDecoderPriv.h} | 6 +++--- 13 files changed, 13 insertions(+), 15 deletions(-) rename tools/{ => android}/SkBitmapRegionCanvas.cpp (99%) rename tools/{ => android}/SkBitmapRegionCanvas.h (100%) rename tools/{ => android}/SkBitmapRegionCodec.cpp (99%) rename tools/{ => android}/SkBitmapRegionCodec.h (100%) rename tools/{ => android}/SkBitmapRegionDecoder.cpp (100%) rename tools/{ => android}/SkBitmapRegionDecoder.h (100%) rename tools/{SkCodecTools.h => android/SkBitmapRegionDecoderPriv.h} (94%) diff --git a/bench/BitmapRegionDecoderBench.cpp b/bench/BitmapRegionDecoderBench.cpp index 4d9dec0..a98dbb0 100644 --- 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 --- 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 --- 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 --- a/gyp/bench.gypi +++ b/gyp/bench.gypi @@ -11,7 +11,6 @@ '../src/effects', '../src/gpu', '../src/utils', - '../tools', ], 'sources': [ '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 --- 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 --- 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 -- 2.7.4