Changeset 136167 in webkit

Timestamp:

Nov 29, 2012, 2:34:18 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Make LazyDecodingPixelRef inherit from skia::LazyPixelRef so that cc thread can access it
​https://bugs.webkit.org/show_bug.cgi?id=103555

Patch by Min Qin <​qinmin@chromium.org> on 2012-11-29
Reviewed by Stephen White.

Expose LazyDecodingPixelRef to the cc thread by inheriting from skia::LazyPixelRef.
No test added for now as impl side paiting is still WIP.

• platform/graphics/chromium/LazyDecodingPixelRef.cpp:

(WebCore::LazyDecodingPixelRef::LazyDecodingPixelRef):
(WebCore::LazyDecodingPixelRef::PrepareToDecode):
(WebCore):
(WebCore::LazyDecodingPixelRef::Decode):

• platform/graphics/chromium/LazyDecodingPixelRef.h:

(LazyDecodingPixelRef):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/LazyDecodingPixelRef.cpp (modified) (2 diffs)
• platform/graphics/chromium/LazyDecodingPixelRef.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-29  Min Qin  <qinmin@chromium.org>
+
+        Make LazyDecodingPixelRef inherit from skia::LazyPixelRef so that cc thread can access it
+        https://bugs.webkit.org/show_bug.cgi?id=103555
+
+        Reviewed by Stephen White.
+
+        Expose LazyDecodingPixelRef to the cc thread by inheriting from skia::LazyPixelRef.
+        No test added for now as impl side paiting is still WIP.
+
+        * platform/graphics/chromium/LazyDecodingPixelRef.cpp:
+        (WebCore::LazyDecodingPixelRef::LazyDecodingPixelRef):
+        (WebCore::LazyDecodingPixelRef::PrepareToDecode):
+        (WebCore):
+        (WebCore::LazyDecodingPixelRef::Decode):
+        * platform/graphics/chromium/LazyDecodingPixelRef.h:
+        (LazyDecodingPixelRef):
+
 2012-11-29  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/platform/graphics/chromium/LazyDecodingPixelRef.cpp

@@ -35 +35 @@
 
 LazyDecodingPixelRef::LazyDecodingPixelRef(PassRefPtr<ImageFrameGenerator> frameGenerator, const SkISize& scaledSize, const SkIRect& scaledSubset)
-    : SkPixelRef(0)
-    , m_frameGenerator(frameGenerator)
+    : m_frameGenerator(frameGenerator)
     , m_scaledSize(scaledSize)
     , m_scaledSubset(scaledSubset)
@@ -91 +90 @@
 }
 
+bool LazyDecodingPixelRef::PrepareToDecode(const LazyPixelRef::PrepareParams& params)
+{
+    MutexLocker lock(m_mutex);
+    // TODO: check if only a particular rect is available in image cache.
+    UNUSED_PARAM(params);
+    return ImageDecodingStore::instance()->lockCompleteCache(m_frameGenerator.get(), m_scaledSize);
+}
+
+void LazyDecodingPixelRef::Decode()
+{
+    lockPixels();
+    unlockPixels();
+}
+
+
 } // namespace WebKit

trunk/Source/WebCore/platform/graphics/chromium/LazyDecodingPixelRef.h

@@ -27 +27 @@
 #define LazyDecodingPixelRef_h
 
-#include "SkTypes.h"
 #include "SkFlattenableBuffers.h"
 #include "SkPixelRef.h"
 #include "SkRect.h"
 #include "SkSize.h"
+#include "SkTypes.h"
+#include "skia/ext/lazy_pixel_ref.h"
 
 #include <wtf/RefPtr.h>
 #include <wtf/ThreadingPrimitives.h>
+
+using skia::LazyPixelRef;
 
 namespace WebCore {
@@ -41 +44 @@
 class ScaledImageFragment;
 
-class LazyDecodingPixelRef : public SkPixelRef {
+class LazyDecodingPixelRef : public LazyPixelRef {
 public:
     LazyDecodingPixelRef(PassRefPtr<ImageFrameGenerator>, const SkISize& scaledSize, const SkIRect& scaledSubset);
@@ -51 +54 @@
     bool isScaled(const SkISize& fullSize) const;
     bool isClipped() const;
+
+    virtual bool PrepareToDecode(const LazyPixelRef::PrepareParams&);
+    virtual void Decode();
 
 protected: