Enable Skia discardable memory path on Android

Source/platform/graphics/DeferredImageDecoder.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 18 matching lines @@
 #include "platform/graphics/DecodingImageGenerator.h"
 #include "platform/graphics/ImageDecodingStore.h"
 #include "platform/graphics/LazyDecodingPixelRef.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace WebCore {
 
 namespace {
 
-// URI label for a lazily decoded SkPixelRef.
-const char labelLazyDecoded[] = "lazy";
-
 // URI label for SkDiscardablePixelRef.
 const char labelDiscardable[] = "discardable";
 
 } // namespace
 
 bool DeferredImageDecoder::s_enabled = false;
-bool DeferredImageDecoder::s_skiaDiscardableMemoryEnabled = false;
 
 DeferredImageDecoder::DeferredImageDecoder(PassOwnPtr<ImageDecoder> actualDecoder)
     : m_allDataReceived(false)
     , m_lastDataSize(0)
     , m_dataChanged(false)
     , m_actualDecoder(actualDecoder)
     , m_orientation(DefaultImageOrientation)
     , m_repetitionCount(cAnimationNone)
     , m_hasColorProfile(false)
 {
@@ skipping 11 matching lines @@
 
 PassOwnPtr<DeferredImageDecoder> DeferredImageDecoder::createForTesting(PassOwnPtr<ImageDecoder> decoder)
 {
     return adoptPtr(new DeferredImageDecoder(decoder));
 }
 
 bool DeferredImageDecoder::isLazyDecoded(const SkBitmap& bitmap)
 {
     return bitmap.pixelRef()
         && bitmap.pixelRef()->getURI()
-        && (!memcmp(bitmap.pixelRef()->getURI(), labelLazyDecoded, sizeof(labelLazyDecoded))
-            || !memcmp(bitmap.pixelRef()->getURI(), labelDiscardable, sizeof(labelDiscardable)));
+        && !memcmp(bitmap.pixelRef()->getURI(), labelDiscardable, sizeof(labelDiscardable));
 }
 
 void DeferredImageDecoder::setEnabled(bool enabled)
 {
     s_enabled = enabled;
-#if !OS(ANDROID)
-    // FIXME: This code is temporary to enable discardable memory for
-    // non-Android platforms. In the future all platforms will be
-    // the same and we can remove this code.
-    s_skiaDiscardableMemoryEnabled = enabled;
     if (enabled)
         ImageDecodingStore::setImageCachingEnabled(false);
-#endif
 }
 
 bool DeferredImageDecoder::enabled()
 {
     return s_enabled;
 }
 
 String DeferredImageDecoder::filenameExtension() const
 {
     return m_actualDecoder ? m_actualDecoder->filenameExtension() : m_filenameExtension;
@@ skipping 161 matching lines @@
         }
     }
 
     if (m_allDataReceived) {
         m_repetitionCount = m_actualDecoder->repetitionCount();
         m_actualDecoder.clear();
         m_data = nullptr;
     }
 }
 
-// Creates either a SkBitmap backed by SkDiscardablePixelRef or a SkBitmap using the
-// legacy LazyDecodingPixelRef.

[Stephen White, 2014/05/29 20:07:44]

Out of curiosity, does this mean we can also remove LazyDecodingPixelRef?

+// Creates a SkBitmap that is backed by SkDiscardablePixelRef.
 SkBitmap DeferredImageDecoder::createBitmap(size_t index)
 {
-    // This code is temporary until the transition to SkDiscardablePixelRef is complete.
-    if (s_skiaDiscardableMemoryEnabled)
-        return createSkiaDiscardableBitmap(index);
-    return createLazyDecodingBitmap(index);
-}
-
-// Creates a SkBitmap that is backed by SkDiscardablePixelRef.
-SkBitmap DeferredImageDecoder::createSkiaDiscardableBitmap(size_t index)
-{
     IntSize decodedSize = m_actualDecoder->decodedSize();
     ASSERT(decodedSize.width() > 0);
     ASSERT(decodedSize.height() > 0);
 
     SkImageInfo info;
     info.fWidth = decodedSize.width();
     info.fHeight = decodedSize.height();
+#if SK_B32_SHIFT // Little-endian RGBA pixels. (Android)

[reveman, 2014/05/29 03:30:55]

I assume this is the reason my previous patch failed, correct?

+    info.fColorType = kRGBA_8888_SkColorType;
+#else
     info.fColorType = kBGRA_8888_SkColorType;
+#endif
     info.fAlphaType = kPremul_SkAlphaType;
 
     SkBitmap bitmap;
     DecodingImageGenerator* generator = new DecodingImageGenerator(m_frameGenerator, info, index);
     bool installed = SkInstallDiscardablePixelRef(generator, &bitmap);
     ASSERT_UNUSED(installed, installed);
     bitmap.pixelRef()->setURI(labelDiscardable);
     generator->setGenerationId(bitmap.getGenerationID());
     return bitmap;
 }
 
-SkBitmap DeferredImageDecoder::createLazyDecodingBitmap(size_t index)
-{
-    IntSize decodedSize = m_actualDecoder->decodedSize();
-    ASSERT(decodedSize.width() > 0);
-    ASSERT(decodedSize.height() > 0);
-
-    SkImageInfo info;
-    info.fWidth = decodedSize.width();
-    info.fHeight = decodedSize.height();
-    info.fColorType = kPMColor_SkColorType;
-    info.fAlphaType = kPremul_SkAlphaType;
-
-    // Creates a lazily decoded SkPixelRef that references the entire image without scaling.
-    SkBitmap bitmap;
-    bitmap.setConfig(info);
-    bitmap.setPixelRef(new LazyDecodingPixelRef(info, m_frameGenerator, index))->unref();
-
-    // Use the URI to identify this as a lazily decoded SkPixelRef of type LazyDecodingPixelRef.
-    // FIXME: It would be more useful to give the actual image URI.
-    bitmap.pixelRef()->setURI(labelLazyDecoded);
-
-    // Inform the bitmap that we will never change the pixels. This is a performance hint
-    // subsystems that may try to cache this bitmap (e.g. pictures, pipes, gpu, pdf, etc.)
-    bitmap.setImmutable();
-
-    return bitmap;
-}
-
 bool DeferredImageDecoder::hotSpot(IntPoint& hotSpot) const
 {
     // TODO: Implement.
     return m_actualDecoder ? m_actualDecoder->hotSpot(hotSpot) : false;
 }
 
 } // namespace WebCore