Changeset 159646 in webkit
- Timestamp:
- Nov 21, 2013 2:28:34 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r159641 r159646 1 2013-11-21 Sergio Correia <sergio.correia@openbossa.org> 2 3 [EFL][GTK][WK2] Build fix after r159641 4 https://bugs.webkit.org/show_bug.cgi?id=124742 5 6 Reviewed by Csaba Osztrogonác. 7 8 Should fetch activeURL from page load state. 9 10 * UIProcess/API/gtk/WebKitWebView.cpp: 11 (webkitWebViewUpdateURI): 12 * UIProcess/InspectorServer/efl/WebInspectorServerEfl.cpp: 13 (WebKit::WebInspectorServer::buildPageList): 14 * UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp: 15 (WebKit::WebInspectorServer::buildPageList): 16 1 17 2013-11-21 Anders Carlsson <andersca@apple.com> 2 18 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
r159247 r159646 1585 1585 void webkitWebViewUpdateURI(WebKitWebView* webView) 1586 1586 { 1587 CString activeURI = getPage(webView)-> activeURL().utf8();1587 CString activeURI = getPage(webView)->pageLoadState().activeURL().utf8(); 1588 1588 if (webView->priv->activeURI == activeURI) 1589 1589 return; -
trunk/Source/WebKit2/UIProcess/InspectorServer/efl/WebInspectorServerEfl.cpp
r157901 r159646 93 93 builder.append(webPage->pageTitle()); 94 94 builder.appendLiteral("\", \"url\": \""); 95 builder.append(webPage-> activeURL());95 builder.append(webPage->pageLoadState().activeURL()); 96 96 builder.appendLiteral("\", \"inspectorUrl\": \""); 97 97 builder.appendLiteral("/Main.html?page="); -
trunk/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp
r156555 r159646 105 105 builder.append(webPage->pageTitle()); 106 106 builder.appendLiteral("\", \"url\": \""); 107 builder.append(webPage-> activeURL());107 builder.append(webPage->pageLoadState().activeURL()); 108 108 builder.appendLiteral("\", \"inspectorUrl\": \""); 109 109 builder.appendLiteral("/Main.html?page=");
Note: See TracChangeset
for help on using the changeset viewer.