Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.

1 files changed, 7 insertions, 7 deletions

diff --git a/Source/WebKit/chromium/tests/OpaqueRectTrackingContentLayerDelegateTest.cpp b/Source/WebKit/chromium/tests/OpaqueRectTrackingContentLayerDelegateTest.cpp
index 0cf82494b..39e36a9fb 100644
--- a/Source/WebKit/chromium/tests/OpaqueRectTrackingContentLayerDelegateTest.cpp
+++ b/Source/WebKit/chromium/tests/OpaqueRectTrackingContentLayerDelegateTest.cpp
@@ -145,7 +145,7 @@ TEST_F(OpaqueRectTrackingContentLayerDelegateTest, testOpaqueRectPresentAfterOpa
     OpaqueRectTrackingContentLayerDelegate delegate(&painter);
 
     WebFloatRect opaqueRect;
-    delegate.paintContents(skCanvas(), canvasRect(), opaqueRect);
+    delegate.paintContents(skCanvas(), canvasRect(), false, opaqueRect);
     EXPECT_EQ_RECT(WebFloatRect(0, 0, 400, 400), opaqueRect);
 }
 
@@ -156,7 +156,7 @@ TEST_F(OpaqueRectTrackingContentLayerDelegateTest, testOpaqueRectNotPresentAfter
     OpaqueRectTrackingContentLayerDelegate delegate(&painter);
 
     WebFloatRect opaqueRect;
-    delegate.paintContents(skCanvas(), canvasRect(), opaqueRect);
+    delegate.paintContents(skCanvas(), canvasRect(), false, opaqueRect);
     EXPECT_EQ_RECT(WebFloatRect(0, 0, 0, 0), opaqueRect);
 }
 
@@ -169,7 +169,7 @@ TEST_F(OpaqueRectTrackingContentLayerDelegateTest, testOpaqueRectNotPresentForOp
     delegate.setOpaque(true);
 
     WebFloatRect opaqueRect;
-    delegate.paintContents(skCanvas(), canvasRect(), opaqueRect);
+    delegate.paintContents(skCanvas(), canvasRect(), false, opaqueRect);
     EXPECT_EQ_RECT(WebFloatRect(0, 0, 0, 0), opaqueRect);
 }
 
@@ -182,7 +182,7 @@ TEST_F(OpaqueRectTrackingContentLayerDelegateTest, testOpaqueRectNotPresentForOp
     delegate.setOpaque(true);
 
     WebFloatRect opaqueRect;
-    delegate.paintContents(skCanvas(), canvasRect(), opaqueRect);
+    delegate.paintContents(skCanvas(), canvasRect(), false, opaqueRect);
     EXPECT_EQ_RECT(WebFloatRect(0, 0, 0, 0), opaqueRect);
 }
 
@@ -194,7 +194,7 @@ TEST_F(OpaqueRectTrackingContentLayerDelegateTest, testPartialOpaqueRectNoTransf
     OpaqueRectTrackingContentLayerDelegate delegate(&painter);
 
     WebFloatRect opaqueRect;
-    delegate.paintContents(skCanvas(), canvasRect(), opaqueRect);
+    delegate.paintContents(skCanvas(), canvasRect(), false, opaqueRect);
     EXPECT_EQ_RECT(WebFloatRect(partialRect.x(), partialRect.y(), partialRect.width(), partialRect.height()), opaqueRect);
 }
 
@@ -207,7 +207,7 @@ TEST_F(OpaqueRectTrackingContentLayerDelegateTest, testPartialOpaqueRectTranslat
 
     WebFloatRect opaqueRect;
     WebRect contentRect(11, 12, 389, 388);
-    delegate.paintContents(skCanvas(), contentRect, opaqueRect);
+    delegate.paintContents(skCanvas(), contentRect, false, opaqueRect);
     EXPECT_EQ_RECT(WebFloatRect(partialRect.x(), partialRect.y(), partialRect.width(), partialRect.height()), opaqueRect);
 }
 
@@ -225,7 +225,7 @@ TEST_F(OpaqueRectTrackingContentLayerDelegateTest, testHintingScaleFactorSet)
 
     IntRect rectA;
     WebFloatRect rectB;
-    delegate.paintContents(&canvas, rectA, rectB);
+    delegate.paintContents(&canvas, rectA, false, rectB);
     EXPECT_EQ(callback.hintingScale, hintingScale);
 }
 #endif