Revert "Flatten resources directory"

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14679 2bbb7eff-a529-9590-31e7-b0007b416f81

9 files changed, 7 insertions, 12 deletions

diff --git a/resources/randPixels.bmp b/resources/encoding/randPixels.bmp
index 1e4ab3b652..1e4ab3b652 100644
--- a/resources/randPixels.bmp
+++ b/resources/encoding/randPixels.bmp
diff --git a/resources/randPixels.gif b/resources/encoding/randPixels.gif
index 04c8bb9c3a..04c8bb9c3a 100644
--- a/resources/randPixels.gif
+++ b/resources/encoding/randPixels.gif
diff --git a/resources/encoding/randPixels.jpg b/resources/encoding/randPixels.jpg
new file mode 100644
index 0000000000..ca57fbddf3
--- /dev/null
+++ b/resources/encoding/randPixels.jpg
diff --git a/resources/encoding/randPixels.png b/resources/encoding/randPixels.png
new file mode 100644
index 0000000000..49ef84603f
--- /dev/null
+++ b/resources/encoding/randPixels.png
diff --git a/resources/encoding/randPixels.webp b/resources/encoding/randPixels.webp
new file mode 100644
index 0000000000..135441e541
--- /dev/null
+++ b/resources/encoding/randPixels.webp
diff --git a/resources/randPixels.jpg b/resources/randPixels.jpg
deleted file mode 100644
index 8f26ea0277..0000000000
--- a/resources/randPixels.jpg
+++ /dev/null
diff --git a/resources/randPixels.png b/resources/randPixels.png
deleted file mode 100644
index 8cd8e65c60..0000000000
--- a/resources/randPixels.png
+++ /dev/null
diff --git a/resources/randPixels.webp b/resources/randPixels.webp
deleted file mode 100644
index 9c4aceadab..0000000000
--- a/resources/randPixels.webp
+++ /dev/null
diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
index 86b96ae0f9..e9348fed99 100644
--- a/tests/ImageDecodingTest.cpp
+++ b/tests/ImageDecodingTest.cpp
@@ -512,8 +512,8 @@ static SkPixelRef* install_pixel_ref(SkBitmap* bitmap,
  */
 DEF_TEST(ImprovedBitmapFactory, reporter) {
     SkString resourcePath = skiatest::Test::GetResourcePath();
-    SkString path = SkOSPath::SkPathJoin(
-            resourcePath.c_str(), "randPixels.png");
+    SkString directory = SkOSPath::SkPathJoin(resourcePath.c_str(), "encoding");
+    SkString path = SkOSPath::SkPathJoin(directory.c_str(), "randPixels.png");
     SkAutoTUnref<SkStreamRewindable> stream(
         SkStream::NewFromFile(path.c_str()));
     if (sk_exists(path.c_str())) {
@@ -531,10 +531,9 @@ DEF_TEST(ImprovedBitmapFactory, reporter) {
 
 #if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
 static inline bool check_rounding(int value, int dividend, int divisor) {
-    // returns true if the value is greater than floor(dividend/divisor)
-    // and less than SkNextPow2(ceil(dividend - divisor))
+    // returns true if (dividend/divisor) rounds up OR down to value
     return (((divisor * value) > (dividend - divisor))
-            && value <= SkNextPow2(((dividend - 1) / divisor) + 1));
+            && ((divisor * value) < (dividend + divisor)));
 }
 #endif  // SK_BUILD_FOR_ANDROID || SK_BUILD_FOR_UNIX
 
@@ -622,11 +621,6 @@ static void test_options(skiatest::Reporter* reporter,
                                              opts.fSampleSize));
     REPORTER_ASSERT(reporter, check_rounding(bm.width(), kExpectedWidth,
                                              opts.fSampleSize));
-    // The ImageDecoder API doesn't guarantee that SampleSize does
-    // anything at all, but the decoders that this test excercises all
-    // produce an output size in the following range:
-    //    (((sample_size * out_size) > (in_size - sample_size))
-    //     && out_size <= SkNextPow2(((in_size - 1) / sample_size) + 1));
     #endif  // SK_BUILD_FOR_ANDROID || SK_BUILD_FOR_UNIX
     SkAutoLockPixels alp(bm);
     if (bm.getPixels() == NULL) {
@@ -688,7 +682,8 @@ DEF_TEST(ImageDecoderOptions, reporter) {
     };
 
     SkString resourceDir = skiatest::Test::GetResourcePath();
-    if (!sk_exists(resourceDir.c_str())) {
+    SkString directory = SkOSPath::SkPathJoin(resourceDir.c_str(), "encoding");
+    if (!sk_exists(directory.c_str())) {
         return;
     }
 
@@ -705,7 +700,7 @@ DEF_TEST(ImageDecoderOptions, reporter) {
     const bool useDataList[] = {true, false};
 
     for (size_t fidx = 0; fidx < SK_ARRAY_COUNT(files); ++fidx) {
-        SkString path = SkOSPath::SkPathJoin(resourceDir.c_str(), files[fidx]);
+        SkString path = SkOSPath::SkPathJoin(directory.c_str(), files[fidx]);
         if (!sk_exists(path.c_str())) {
             continue;
         }