Changeset 136196 in webkit

Timestamp:

Nov 29, 2012, 6:28:37 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r136167.
​http://trac.webkit.org/changeset/136167
​https://bugs.webkit.org/show_bug.cgi?id=103701

Win debug build failure (Requested by zhenyao on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-11-29

• platform/graphics/chromium/LazyDecodingPixelRef.cpp:

(WebCore::LazyDecodingPixelRef::LazyDecodingPixelRef):

• 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  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r136167.
+        http://trac.webkit.org/changeset/136167
+        https://bugs.webkit.org/show_bug.cgi?id=103701
+
+        Win debug build failure (Requested by zhenyao on #webkit).
+
+        * platform/graphics/chromium/LazyDecodingPixelRef.cpp:
+        (WebCore::LazyDecodingPixelRef::LazyDecodingPixelRef):
+        * platform/graphics/chromium/LazyDecodingPixelRef.h:
+        (LazyDecodingPixelRef):
+
 2012-11-29  David Grogan  <dgrogan@chromium.org>
 

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

@@ -35 +35 @@
 
 LazyDecodingPixelRef::LazyDecodingPixelRef(PassRefPtr<ImageFrameGenerator> frameGenerator, const SkISize& scaledSize, const SkIRect& scaledSubset)
-    : m_frameGenerator(frameGenerator)
+    : SkPixelRef(0)
+    , m_frameGenerator(frameGenerator)
     , m_scaledSize(scaledSize)
     , m_scaledSubset(scaledSubset)
@@ -90 +91 @@
 }
 
-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 {
@@ -44 +41 @@
 class ScaledImageFragment;
 
-class LazyDecodingPixelRef : public LazyPixelRef {
+class LazyDecodingPixelRef : public SkPixelRef {
 public:
     LazyDecodingPixelRef(PassRefPtr<ImageFrameGenerator>, const SkISize& scaledSize, const SkIRect& scaledSubset);
@@ -54 +51 @@
     bool isScaled(const SkISize& fullSize) const;
     bool isClipped() const;
-
-    virtual bool PrepareToDecode(const LazyPixelRef::PrepareParams&);
-    virtual void Decode();
 
 protected: