Title: [116836] trunk/Source/WebKit/chromium
- Revision
- 116836
- Author
- t...@chromium.org
- Date
- 2012-05-11 20:04:41 -0700 (Fri, 11 May 2012)
Log Message
[chromium] Port gtest WebViewTest.ActiveState from test_shell_tests to webkit_unit_tests
https://bugs.webkit.org/show_bug.cgi?id=86271
Reviewed by James Robinson.
The original test is in src/webkit/glue/webview_unittest.cc.
* tests/WebViewTest.cpp:
(WebKit::TEST_F):
(WebKit):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (116835 => 116836)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-12 02:20:50 UTC (rev 116835)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-12 03:04:41 UTC (rev 116836)
@@ -1,3 +1,16 @@
+2012-05-11 Tony Chang <t...@chromium.org>
+
+ [chromium] Port gtest WebViewTest.ActiveState from test_shell_tests to webkit_unit_tests
+ https://bugs.webkit.org/show_bug.cgi?id=86271
+
+ Reviewed by James Robinson.
+
+ The original test is in src/webkit/glue/webview_unittest.cc.
+
+ * tests/WebViewTest.cpp:
+ (WebKit::TEST_F):
+ (WebKit):
+
2012-05-11 Shawn Singh <shawnsi...@chromium.org>
[chromium] Plumb --show-paint-rects to accelerated compositor
Modified: trunk/Source/WebKit/chromium/tests/WebViewTest.cpp (116835 => 116836)
--- trunk/Source/WebKit/chromium/tests/WebViewTest.cpp 2012-05-12 02:20:50 UTC (rev 116835)
+++ trunk/Source/WebKit/chromium/tests/WebViewTest.cpp 2012-05-12 03:04:41 UTC (rev 116836)
@@ -143,6 +143,25 @@
webView->close();
}
+TEST_F(WebViewTest, ActiveState)
+{
+ FrameTestHelpers::registerMockedURLLoad(m_baseURL, "visible_iframe.html");
+ WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "visible_iframe.html");
+
+ ASSERT_TRUE(webView);
+
+ webView->setIsActive(true);
+ EXPECT_TRUE(webView->isActive());
+
+ webView->setIsActive(false);
+ EXPECT_FALSE(webView->isActive());
+
+ webView->setIsActive(true);
+ EXPECT_TRUE(webView->isActive());
+
+ webView->close();
+}
+
void WebViewTest::testAutoResize(const WebSize& minAutoResize, const WebSize& maxAutoResize,
const std::string& pageWidth, const std::string& pageHeight,
int expectedWidth, int expectedHeight,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
