Changeset 159646 in webkit


Ignore:
Timestamp:
Nov 21, 2013 2:28:34 PM (10 years ago)
Author:
Csaba Osztrogonác
Message:

[EFL][GTK][WK2] Build fix after r159641
https://bugs.webkit.org/show_bug.cgi?id=124742

Patch by Sergio Correia <Sergio Correia> 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):

Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r159641 r159646  
     12013-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
    1172013-11-21  Anders Carlsson  <andersca@apple.com>
    218
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

    r159247 r159646  
    15851585void webkitWebViewUpdateURI(WebKitWebView* webView)
    15861586{
    1587     CString activeURI = getPage(webView)->activeURL().utf8();
     1587    CString activeURI = getPage(webView)->pageLoadState().activeURL().utf8();
    15881588    if (webView->priv->activeURI == activeURI)
    15891589        return;
  • trunk/Source/WebKit2/UIProcess/InspectorServer/efl/WebInspectorServerEfl.cpp

    r157901 r159646  
    9393        builder.append(webPage->pageTitle());
    9494        builder.appendLiteral("\", \"url\": \"");
    95         builder.append(webPage->activeURL());
     95        builder.append(webPage->pageLoadState().activeURL());
    9696        builder.appendLiteral("\", \"inspectorUrl\": \"");
    9797        builder.appendLiteral("/Main.html?page=");
  • trunk/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp

    r156555 r159646  
    105105        builder.append(webPage->pageTitle());
    106106        builder.appendLiteral("\", \"url\": \"");
    107         builder.append(webPage->activeURL());
     107        builder.append(webPage->pageLoadState().activeURL());
    108108        builder.appendLiteral("\", \"inspectorUrl\": \"");
    109109        builder.appendLiteral("/Main.html?page=");
Note: See TracChangeset for help on using the changeset viewer.