summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-06-25 13:35:59 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-06-25 13:35:59 +0200
commit79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4 (patch)
tree0287b1a69d84492c901e8bc820e635e7133809a0 /Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
parent682ab87480e7757346802ce7f54cfdbdfeb2339e (diff)
downloadqtwebkit-79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4.tar.gz
Imported WebKit commit c4b613825abd39ac739a47d7b4410468fcef66dc (http://svn.webkit.org/repository/webkit/trunk@121147)
New snapshot that includes Win32 debug build fix (use SVGAllInOne)
Diffstat (limited to 'Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp')
-rw-r--r--Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp b/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
index 4fdcf4f41..410c45d78 100644
--- a/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
+++ b/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
@@ -57,6 +57,7 @@ class MockGraphicsLayerClient : public GraphicsLayerClient {
virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip) OVERRIDE { }
virtual bool showDebugBorders(const GraphicsLayer*) const OVERRIDE { return false; }
virtual bool showRepaintCounter(const GraphicsLayer*) const OVERRIDE { return false; }
+ virtual float deviceScaleFactor() const OVERRIDE { return 2; }
};
class MockLayerTreeHostClient : public CCLayerTreeHostClient {
@@ -395,4 +396,9 @@ TEST_F(GraphicsLayerChromiumTest, createReversedAlternatingAnimation)
expectTranslateX(2, curve->getValue(duration));
}
+TEST_F(GraphicsLayerChromiumTest, shouldStartWithCorrectContentsScale)
+{
+ EXPECT_EQ(2, m_platformLayer->contentsScale());
+}
+
} // namespace