Title: [134626] trunk/Source/WebKit/chromium
- Revision
- 134626
- Author
- r...@google.com
- Date
- 2012-11-14 10:43:21 -0800 (Wed, 14 Nov 2012)
Log Message
Dynamically create canvas in Setup() to avoid calling DEPRECATED function setDevice().
https://bugs.webkit.org/show_bug.cgi?id=102242
Reviewed by Stephen White.
This change should not change any test results, it is an equivalent implementation that avoids
using a (now) DEPRECATED function.
* tests/DeferredImageDecoderTest.cpp:
(WebCore::createRasterCanvas):
(WebCore):
(WebCore::DeferredImageDecoderTest::SetUp):
(DeferredImageDecoderTest):
(WebCore::TEST_F):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (134625 => 134626)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-14 18:39:37 UTC (rev 134625)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-14 18:43:21 UTC (rev 134626)
@@ -1,3 +1,20 @@
+2012-11-14 Mike Reed <r...@google.com>
+
+ Dynamically create canvas in Setup() to avoid calling DEPRECATED function setDevice().
+ https://bugs.webkit.org/show_bug.cgi?id=102242
+
+ Reviewed by Stephen White.
+
+ This change should not change any test results, it is an equivalent implementation that avoids
+ using a (now) DEPRECATED function.
+
+ * tests/DeferredImageDecoderTest.cpp:
+ (WebCore::createRasterCanvas):
+ (WebCore):
+ (WebCore::DeferredImageDecoderTest::SetUp):
+ (DeferredImageDecoderTest):
+ (WebCore::TEST_F):
+
2012-11-14 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r134523.
Modified: trunk/Source/WebKit/chromium/tests/DeferredImageDecoderTest.cpp (134625 => 134626)
--- trunk/Source/WebKit/chromium/tests/DeferredImageDecoderTest.cpp 2012-11-14 18:39:37 UTC (rev 134625)
+++ trunk/Source/WebKit/chromium/tests/DeferredImageDecoderTest.cpp 2012-11-14 18:43:21 UTC (rev 134626)
@@ -39,6 +39,12 @@
namespace {
+static SkCanvas* createRasterCanvas(int width, int height)
+{
+ SkAutoTUnref<SkDevice> device(new SkDevice(SkBitmap::kARGB_8888_Config, width, height));
+ return new SkCanvas(device);
+}
+
class DeferredImageDecoderTest : public ::testing::Test {
public:
virtual void SetUp()
@@ -47,7 +53,7 @@
m_actualDecoder = new MockImageDecoder();
m_actualDecoder->setSize(600, 613);
m_lazyDecoder = DeferredImageDecoder::createForTesting(adoptPtr(m_actualDecoder));
- m_canvas.setDevice(new SkDevice(SkBitmap::kARGB_8888_Config, 100, 100))->unref();
+ m_canvas.reset(createRasterCanvas(100, 100));
}
virtual void TearDown()
@@ -60,7 +66,7 @@
MockImageDecoder* m_actualDecoder;
OwnPtr<DeferredImageDecoder> m_lazyDecoder;
SkPicture m_picture;
- SkCanvas m_canvas;
+ SkAutoTUnref<SkCanvas> m_canvas;
};
TEST_F(DeferredImageDecoderTest, drawIntoSkPicture)
@@ -76,7 +82,7 @@
m_picture.endRecording();
EXPECT_EQ(0, m_actualDecoder->frameBufferRequestCount());
- m_canvas.drawPicture(m_picture);
+ m_canvas->drawPicture(m_picture);
EXPECT_EQ(1, m_actualDecoder->frameBufferRequestCount());
}
@@ -95,7 +101,7 @@
m_picture.endRecording();
EXPECT_EQ(0, m_actualDecoder->frameBufferRequestCount());
- m_canvas.drawPicture(m_picture);
+ m_canvas->drawPicture(m_picture);
EXPECT_EQ(1, m_actualDecoder->frameBufferRequestCount());
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
