Title: [141454] trunk/Source/WebKit/chromium
- Revision
- 141454
- Author
- commit-qu...@webkit.org
- Date
- 2013-01-31 11:40:14 -0800 (Thu, 31 Jan 2013)
Log Message
WebFrameTest.DisambiguationPopup is failing
https://bugs.webkit.org/show_bug.cgi?id=108160
Patch by Dan Alcantara <dfalcant...@chromium.org> on 2013-01-31
Reviewed by Adam Barth.
Fix the unit test so that it is using the right HTML file.
* tests/WebFrameTest.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (141453 => 141454)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-31 19:37:53 UTC (rev 141453)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-31 19:40:14 UTC (rev 141454)
@@ -1,3 +1,14 @@
+2013-01-31 Dan Alcantara <dfalcant...@chromium.org>
+
+ WebFrameTest.DisambiguationPopup is failing
+ https://bugs.webkit.org/show_bug.cgi?id=108160
+
+ Reviewed by Adam Barth.
+
+ Fix the unit test so that it is using the right HTML file.
+
+ * tests/WebFrameTest.cpp:
+
2013-01-31 Tony Chang <t...@chromium.org>
[Chromium] webkit_unit_tests should depend on base/allocator for ASAN
Modified: trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp (141453 => 141454)
--- trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-31 19:37:53 UTC (rev 141453)
+++ trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-31 19:40:14 UTC (rev 141454)
@@ -1799,15 +1799,16 @@
return event;
}
-TEST_F(WebFrameTest, DISABLED_DisambiguationPopup)
+TEST_F(WebFrameTest, DisambiguationPopup)
{
- registerMockedHttpURLLoad("disambiguation_popup.html");
+ const std::string htmlFile = "disambiguation_popup.html";
+ registerMockedHttpURLLoad(htmlFile);
DisambiguationPopupTestWebViewClient client;
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
- WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "disambiguation_popup.html", true, 0, &client));
+ WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client));
webViewImpl->resize(WebSize(1000, 1000));
webViewImpl->layout();
@@ -1860,15 +1861,16 @@
EXPECT_FALSE(client.triggered());
}
-TEST_F(WebFrameTest, DISABLED_DisambiguationPopupMobileSite)
+TEST_F(WebFrameTest, DisambiguationPopupMobileSite)
{
- registerMockedHttpURLLoad("disambiguation_popup_mobile_site.html");
+ const std::string htmlFile = "disambiguation_popup_mobile_site.html";
+ registerMockedHttpURLLoad(htmlFile);
DisambiguationPopupTestWebViewClient client;
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
- WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "disambiguation_popup.html", true, 0, &client));
+ WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client));
webViewImpl->resize(WebSize(1000, 1000));
webViewImpl->layout();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
