diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit/chromium/tests/WebLayerTest.cpp | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit/chromium/tests/WebLayerTest.cpp')
| -rw-r--r-- | Source/WebKit/chromium/tests/WebLayerTest.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/WebKit/chromium/tests/WebLayerTest.cpp b/Source/WebKit/chromium/tests/WebLayerTest.cpp index 1eed81aea..7c0831f90 100644 --- a/Source/WebKit/chromium/tests/WebLayerTest.cpp +++ b/Source/WebKit/chromium/tests/WebLayerTest.cpp @@ -136,7 +136,7 @@ TEST_F(WebLayerTest, Client) EXPECT_EQ(otherLayer, layer.maskLayer()); EXPECT_CALL(m_client, scheduleComposite()).Times(AtLeast(1)); - float opacity = 0.123; + float opacity = 0.123f; layer.setOpacity(opacity); Mock::VerifyAndClearExpectations(&m_client); EXPECT_EQ(opacity, layer.opacity()); @@ -160,18 +160,15 @@ TEST_F(WebLayerTest, Client) EXPECT_CALL(m_client, scheduleComposite()).Times(AtLeast(1)); textureLayer.setTextureId(3); Mock::VerifyAndClearExpectations(&m_client); - EXPECT_EQ(3u, textureLayer.textureId()); EXPECT_CALL(m_client, scheduleComposite()).Times(AtLeast(1)); textureLayer.setFlipped(true); Mock::VerifyAndClearExpectations(&m_client); - EXPECT_TRUE(textureLayer.flipped()); EXPECT_CALL(m_client, scheduleComposite()).Times(AtLeast(1)); - WebFloatRect uvRect(0.1, 0.1, 0.9, 0.9); + WebFloatRect uvRect(0.1f, 0.1f, 0.9f, 0.9f); textureLayer.setUVRect(uvRect); Mock::VerifyAndClearExpectations(&m_client); - EXPECT_TRUE(textureLayer.flipped()); // Content layer. |