Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)

This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.

1 files changed, 1 insertions, 10 deletions

diff --git a/Source/WebKit/chromium/tests/CCLayerTestCommon.cpp b/Source/WebKit/chromium/tests/CCLayerTestCommon.cpp
index 9fe377766..423c668d9 100644
--- a/Source/WebKit/chromium/tests/CCLayerTestCommon.cpp
+++ b/Source/WebKit/chromium/tests/CCLayerTestCommon.cpp
@@ -36,15 +36,6 @@ namespace CCLayerTestCommon {
 // Align with expected and actual output
 const char* quadString = "    Quad: ";
 
-bool completelyContains(const Region& container, const IntRect& rect)
-{
-    Region tester(rect);
-    Vector<IntRect> rects = container.rects();
-    for (size_t i = 0; i < rects.size(); ++i)
-        tester.subtract(rects[i]);
-    return tester.isEmpty();
-}
-
 void verifyQuadsExactlyCoverRect(const CCQuadList& quads, const IntRect& rect)
 {
     Region remaining(rect);
@@ -53,7 +44,7 @@ void verifyQuadsExactlyCoverRect(const CCQuadList& quads, const IntRect& rect)
         CCDrawQuad* quad = quads[i].get();
 
         EXPECT_TRUE(rect.contains(quad->quadRect())) << quadString << i;
-        EXPECT_TRUE(completelyContains(remaining, quad->quadRect())) << quadString << i;
+        EXPECT_TRUE(remaining.contains(quad->quadRect())) << quadString << i;
         remaining.subtract(Region(quad->quadRect()));
     }