Title: [159646] trunk/Source/WebKit2
- Revision
- 159646
- Author
- [email protected]
- Date
- 2013-11-21 14:28:34 -0800 (Thu, 21 Nov 2013)
Log Message
[EFL][GTK][WK2] Build fix after r159641
https://bugs.webkit.org/show_bug.cgi?id=124742
Patch by Sergio Correia <[email protected]> on 2013-11-21
Reviewed by Csaba Osztrogonác.
Should fetch activeURL from page load state.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewUpdateURI):
* UIProcess/InspectorServer/efl/WebInspectorServerEfl.cpp:
(WebKit::WebInspectorServer::buildPageList):
* UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp:
(WebKit::WebInspectorServer::buildPageList):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159645 => 159646)
--- trunk/Source/WebKit2/ChangeLog 2013-11-21 21:57:53 UTC (rev 159645)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-21 22:28:34 UTC (rev 159646)
@@ -1,3 +1,19 @@
+2013-11-21 Sergio Correia <[email protected]>
+
+ [EFL][GTK][WK2] Build fix after r159641
+ https://bugs.webkit.org/show_bug.cgi?id=124742
+
+ Reviewed by Csaba Osztrogonác.
+
+ Should fetch activeURL from page load state.
+
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkitWebViewUpdateURI):
+ * UIProcess/InspectorServer/efl/WebInspectorServerEfl.cpp:
+ (WebKit::WebInspectorServer::buildPageList):
+ * UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp:
+ (WebKit::WebInspectorServer::buildPageList):
+
2013-11-21 Anders Carlsson <[email protected]>
Fetch all page loading related URLs from the page load state
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (159645 => 159646)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2013-11-21 21:57:53 UTC (rev 159645)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2013-11-21 22:28:34 UTC (rev 159646)
@@ -1584,7 +1584,7 @@
void webkitWebViewUpdateURI(WebKitWebView* webView)
{
- CString activeURI = getPage(webView)->activeURL().utf8();
+ CString activeURI = getPage(webView)->pageLoadState().activeURL().utf8();
if (webView->priv->activeURI == activeURI)
return;
Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/efl/WebInspectorServerEfl.cpp (159645 => 159646)
--- trunk/Source/WebKit2/UIProcess/InspectorServer/efl/WebInspectorServerEfl.cpp 2013-11-21 21:57:53 UTC (rev 159645)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/efl/WebInspectorServerEfl.cpp 2013-11-21 22:28:34 UTC (rev 159646)
@@ -92,7 +92,7 @@
builder.appendLiteral(", \"title\": \"");
builder.append(webPage->pageTitle());
builder.appendLiteral("\", \"url\": \"");
- builder.append(webPage->activeURL());
+ builder.append(webPage->pageLoadState().activeURL());
builder.appendLiteral("\", \"inspectorUrl\": \"");
builder.appendLiteral("/Main.html?page=");
builder.appendNumber(it->key);
Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp (159645 => 159646)
--- trunk/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp 2013-11-21 21:57:53 UTC (rev 159645)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp 2013-11-21 22:28:34 UTC (rev 159646)
@@ -104,7 +104,7 @@
builder.appendLiteral(", \"title\": \"");
builder.append(webPage->pageTitle());
builder.appendLiteral("\", \"url\": \"");
- builder.append(webPage->activeURL());
+ builder.append(webPage->pageLoadState().activeURL());
builder.appendLiteral("\", \"inspectorUrl\": \"");
builder.appendLiteral("/Main.html?page=");
builder.appendNumber(it->key);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
