From 4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 29 Nov 2012 12:18:48 +0100 Subject: Imported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e (http://svn.webkit.org/repository/webkit/trunk@136119) New snapshot that includes the fix for installing the QtWebProcess into libexec Change-Id: I01344e079cbdac5678c4cba6ffcc05f4597cf0d7 Reviewed-by: Simon Hausmann --- Source/WebKit/chromium/tests/DeferredImageDecoderTest.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'Source/WebKit/chromium/tests/DeferredImageDecoderTest.cpp') diff --git a/Source/WebKit/chromium/tests/DeferredImageDecoderTest.cpp b/Source/WebKit/chromium/tests/DeferredImageDecoderTest.cpp index 4bcc29882..7fd4017a6 100644 --- a/Source/WebKit/chromium/tests/DeferredImageDecoderTest.cpp +++ b/Source/WebKit/chromium/tests/DeferredImageDecoderTest.cpp @@ -73,7 +73,8 @@ class DeferredImageDecoderTest : public ::testing::Test, public MockImageDecoder public: virtual void SetUp() { - ImageDecodingStore::initializeOnMainThread(); + ImageDecodingStore::initializeOnce(); + DeferredImageDecoder::setEnabled(true); m_data = SharedBuffer::create(whitePNG, sizeof(whitePNG)); m_actualDecoder = new MockImageDecoder(this); m_actualDecoder->setSize(1, 1); @@ -90,10 +91,19 @@ public: virtual void decoderBeingDestroyed() { - m_frameBufferRequestCount = m_actualDecoder->frameBufferRequestCount(); m_actualDecoder = 0; } + virtual void frameBufferRequested() + { + ++m_frameBufferRequestCount; + } + + virtual ImageFrame::FrameStatus frameStatus() + { + return ImageFrame::FrameComplete; + } + protected: // Don't own this but saves the pointer to query states. MockImageDecoder* m_actualDecoder; -- cgit v1.2.1