Changeset 127678 in webkit

Timestamp:

Sep 5, 2012 7:07:41 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Test WebSolidColorLayer in WebLayerTest.Client unit test
​https://bugs.webkit.org/show_bug.cgi?id=95819

Patch by James Robinson <​jamesr@chromium.org> on 2012-09-05
Reviewed by Adam Barth.

This unit test doesn't do all that much, but it does verify that WebSolidColorLayer doesn't completely explode
upon use and also makes sure that the WebSolidColorLayer::create() symbol is referenced and not dropped from
webkit.dll in the component build.

• tests/WebLayerTest.cpp:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• tests/WebLayerTest.cpp (modified) (3 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-09-05  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Test WebSolidColorLayer in WebLayerTest.Client unit test
+        https://bugs.webkit.org/show_bug.cgi?id=95819
+
+        Reviewed by Adam Barth.
+
+        This unit test doesn't do all that much, but it does verify that WebSolidColorLayer doesn't completely explode
+        upon use and also makes sure that the WebSolidColorLayer::create() symbol is referenced and not dropped from
+        webkit.dll in the component build.
+
+        * tests/WebLayerTest.cpp:
+
 2012-09-05  Victoria Kirst  <vrk@chromium.org>
 

trunk/Source/WebKit/chromium/tests/WebLayerTest.cpp

@@ -40 +40 @@
 #include <public/WebRect.h>
 #include <public/WebSize.h>
+#include <public/WebSolidColorLayer.h>
 
 #include <gmock/gmock.h>
@@ -141 +142 @@
 
     // Texture layer.
-    EXPECT_CALL(m_client, scheduleComposite()).Times(AnyNumber());
+    EXPECT_CALL(m_client, scheduleComposite()).Times(AtLeast(1));
     OwnPtr<WebExternalTextureLayer> textureLayer = adoptPtr(WebExternalTextureLayer::create());
     m_rootLayer->addChild(textureLayer->layer());
@@ -172 +173 @@
     Mock::VerifyAndClearExpectations(&m_client);
     EXPECT_FALSE(contentLayer->layer()->drawsContent());
+
+    // Solid color layer.
+    EXPECT_CALL(m_client, scheduleComposite()).Times(AtLeast(1));
+    OwnPtr<WebSolidColorLayer> solidColorLayer = adoptPtr(WebSolidColorLayer::create());
+    m_rootLayer->addChild(solidColorLayer->layer());
+    Mock::VerifyAndClearExpectations(&m_client);
+
 }