Title: [136728] trunk/Source/WebCore
- Revision
- 136728
- Author
- senorbla...@chromium.org
- Date
- 2012-12-05 12:14:46 -0800 (Wed, 05 Dec 2012)
Log Message
Unreviewed, rolling out r136630.
http://trac.webkit.org/changeset/136630
https://bugs.webkit.org/show_bug.cgi?id=103555
It's breaking Chrome/Win Debug builds.
* platform/graphics/chromium/LazyDecodingPixelRef.cpp:
(WebCore::LazyDecodingPixelRef::LazyDecodingPixelRef):
* platform/graphics/chromium/LazyDecodingPixelRef.h:
(LazyDecodingPixelRef):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (136727 => 136728)
--- trunk/Source/WebCore/ChangeLog 2012-12-05 20:05:25 UTC (rev 136727)
+++ trunk/Source/WebCore/ChangeLog 2012-12-05 20:14:46 UTC (rev 136728)
@@ -1,3 +1,16 @@
+2012-12-05 Stephen White <senorbla...@chromium.org>
+
+ Unreviewed, rolling out r136630.
+ http://trac.webkit.org/changeset/136630
+ https://bugs.webkit.org/show_bug.cgi?id=103555
+
+ It's breaking Chrome/Win Debug builds.
+
+ * platform/graphics/chromium/LazyDecodingPixelRef.cpp:
+ (WebCore::LazyDecodingPixelRef::LazyDecodingPixelRef):
+ * platform/graphics/chromium/LazyDecodingPixelRef.h:
+ (LazyDecodingPixelRef):
+
2012-12-05 Andreas Kling <akl...@apple.com>
REGRESSION(r136615): Incorrect style sharing in view-source documents.
Modified: trunk/Source/WebCore/platform/graphics/chromium/LazyDecodingPixelRef.cpp (136727 => 136728)
--- trunk/Source/WebCore/platform/graphics/chromium/LazyDecodingPixelRef.cpp 2012-12-05 20:05:25 UTC (rev 136727)
+++ trunk/Source/WebCore/platform/graphics/chromium/LazyDecodingPixelRef.cpp 2012-12-05 20:14:46 UTC (rev 136728)
@@ -34,7 +34,8 @@
namespace WebCore {
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)
, m_lockedCachedImage(0)
@@ -89,19 +90,4 @@
return false;
}
-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
Modified: trunk/Source/WebCore/platform/graphics/chromium/LazyDecodingPixelRef.h (136727 => 136728)
--- trunk/Source/WebCore/platform/graphics/chromium/LazyDecodingPixelRef.h 2012-12-05 20:05:25 UTC (rev 136727)
+++ trunk/Source/WebCore/platform/graphics/chromium/LazyDecodingPixelRef.h 2012-12-05 20:14:46 UTC (rev 136728)
@@ -26,24 +26,21 @@
#ifndef LazyDecodingPixelRef_h
#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 {
class ImageFrameGenerator;
class ScaledImageFragment;
-class LazyDecodingPixelRef : public LazyPixelRef {
+class LazyDecodingPixelRef : public SkPixelRef {
public:
LazyDecodingPixelRef(PassRefPtr<ImageFrameGenerator>, const SkISize& scaledSize, const SkIRect& scaledSubset);
virtual ~LazyDecodingPixelRef();
@@ -54,9 +51,6 @@
bool isScaled(const SkISize& fullSize) const;
bool isClipped() const;
- virtual bool PrepareToDecode(const LazyPixelRef::PrepareParams&);
- virtual void Decode();
-
protected:
// SkPixelRef implementation.
virtual void* onLockPixels(SkColorTable**);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
