Title: [105723] trunk/Source/WebKit2
- Revision
- 105723
- Author
- [email protected]
- Date
- 2012-01-24 03:49:47 -0800 (Tue, 24 Jan 2012)
Log Message
[GTK] Fix /webkit2/WebKitWebView/reload after r105688
https://bugs.webkit.org/show_bug.cgi?id=76898
Reviewed by Alejandro G. Castro.
* UIProcess/API/gtk/tests/LoadTrackingTest.cpp:
(LoadTrackingTest::reload): Add reload method that clears events
and initializes progress.
* UIProcess/API/gtk/tests/LoadTrackingTest.h:
* UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp:
(testWebViewReload): Use LoadTrackingTest::reload() instead of
webkit_web_view_reload().
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (105722 => 105723)
--- trunk/Source/WebKit2/ChangeLog 2012-01-24 11:47:51 UTC (rev 105722)
+++ trunk/Source/WebKit2/ChangeLog 2012-01-24 11:49:47 UTC (rev 105723)
@@ -1,3 +1,18 @@
+2012-01-24 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Fix /webkit2/WebKitWebView/reload after r105688
+ https://bugs.webkit.org/show_bug.cgi?id=76898
+
+ Reviewed by Alejandro G. Castro.
+
+ * UIProcess/API/gtk/tests/LoadTrackingTest.cpp:
+ (LoadTrackingTest::reload): Add reload method that clears events
+ and initializes progress.
+ * UIProcess/API/gtk/tests/LoadTrackingTest.h:
+ * UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp:
+ (testWebViewReload): Use LoadTrackingTest::reload() instead of
+ webkit_web_view_reload().
+
2012-01-24 Simon Hausmann <[email protected]>
Some qmake build files must include Qt5's "quick" module.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp (105722 => 105723)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp 2012-01-24 11:47:51 UTC (rev 105722)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp 2012-01-24 11:49:47 UTC (rev 105723)
@@ -165,3 +165,10 @@
m_estimatedProgress = 0;
WebViewTest::loadRequest(request);
}
+
+void LoadTrackingTest::reload()
+{
+ m_loadEvents.clear();
+ m_estimatedProgress = 0;
+ webkit_web_view_reload(m_webView);
+}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.h (105722 => 105723)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.h 2012-01-24 11:47:51 UTC (rev 105722)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.h 2012-01-24 11:49:47 UTC (rev 105723)
@@ -43,6 +43,7 @@
void loadHtml(const char* html, const char* baseURI);
void loadPlainText(const char* plainText);
void loadRequest(WebKitURIRequest*);
+ void reload();
void setRedirectURI(const char* uri) { m_redirectURI = uri; }
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp (105722 => 105723)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp 2012-01-24 11:47:51 UTC (rev 105722)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebLoaderClient.cpp 2012-01-24 11:49:47 UTC (rev 105723)
@@ -125,14 +125,14 @@
static void testWebViewReload(LoadTrackingTest* test, gconstpointer)
{
// Check that nothing happens when there's nothing to reload.
- webkit_web_view_reload(test->m_webView);
+ test->reload();
test->wait(0.25); // Wait for a quarter of a second.
test->loadURI(kServer->getURIForPath("/normal").data());
test->waitUntilLoadFinished();
assertNormalLoadHappened(test->m_loadEvents);
- webkit_web_view_reload(test->m_webView);
+ test->reload();
test->waitUntilLoadFinished();
assertNormalLoadHappened(test->m_loadEvents);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
