Title: [141476] branches/chromium/1364/Source/WebKit/chromium
- Revision
- 141476
- Author
- [email protected]
- Date
- 2013-01-31 13:25:49 -0800 (Thu, 31 Jan 2013)
Log Message
Merge 141454
> WebFrameTest.DisambiguationPopup is failing
> https://bugs.webkit.org/show_bug.cgi?id=108160
>
> Patch by Dan Alcantara <[email protected]> on 2013-01-31
> Reviewed by Adam Barth.
>
> Fix the unit test so that it is using the right HTML file.
>
> * tests/WebFrameTest.cpp:
[email protected]
Review URL: https://codereview.chromium.org/12087118
Modified Paths
Diff
Modified: branches/chromium/1364/Source/WebKit/chromium/ChangeLog (141475 => 141476)
--- branches/chromium/1364/Source/WebKit/chromium/ChangeLog 2013-01-31 21:24:57 UTC (rev 141475)
+++ branches/chromium/1364/Source/WebKit/chromium/ChangeLog 2013-01-31 21:25:49 UTC (rev 141476)
@@ -1,5 +1,16 @@
-2013-01-28 Dan Alcantara <[email protected]>
+2013-01-31 Dan Alcantara <[email protected]>
+ 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 <[email protected]>
+
[Chromium, Mobile] Do not show disambiguation pop up in mobile sites
https://bugs.webkit.org/show_bug.cgi?id=107607
Modified: branches/chromium/1364/Source/WebKit/chromium/tests/WebFrameTest.cpp (141475 => 141476)
--- branches/chromium/1364/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-31 21:24:57 UTC (rev 141475)
+++ branches/chromium/1364/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-31 21:25:49 UTC (rev 141476)
@@ -1638,13 +1638,14 @@
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();
@@ -1699,13 +1700,14 @@
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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
