Changeset 76872 in webkit


Ignore:
Timestamp:
Jan 27, 2011 5:22:16 PM (13 years ago)
Author:
Nate Chapin
Message:

2011-01-27 Nate Chapin <Nate Chapin>

Reviewed by Adam Barth.

Remove FrameLoader::url() and update callers to use
Document::url().
​https://bugs.webkit.org/show_bug.cgi?id=41165

Refactor, no new tests.

  • WebCore.exp.in:
  • dom/Document.cpp: (WebCore::Document::processHttpEquiv): (WebCore::Document::removePendingSheet):
  • history/CachedFrame.cpp: (WebCore::CachedFrameBase::CachedFrameBase):
  • history/PageCache.cpp: (WebCore::logCanCacheFrameDecision): (WebCore::PageCache::canCachePageContainingThisFrame):
  • html/HTMLFrameElementBase.cpp: (WebCore::HTMLFrameElementBase::isURLAllowed):
  • html/HTMLPlugInImageElement.cpp: (WebCore::HTMLPlugInImageElement::allowedToLoadFrameURL):
  • inspector/InspectorAgent.cpp: (WebCore::InspectorAgent::inspectedURL):
  • inspector/InspectorResourceAgent.cpp: (WebCore::buildObjectForFrame):
  • loader/DocumentWriter.cpp: (WebCore::DocumentWriter::replaceDocument): (WebCore::DocumentWriter::deprecatedFrameEncoding):
  • loader/FrameLoader.cpp:
  • loader/FrameLoader.h:
  • loader/HistoryController.cpp: (WebCore::HistoryController::updateForStandardLoad): (WebCore::HistoryController::updateForRedirectWithLockedBackForwardList): (WebCore::HistoryController::updateForSameDocumentNavigation):
  • loader/NavigationScheduler.cpp: (WebCore::ScheduledHistoryNavigation::fire): (WebCore::NavigationScheduler::scheduleLocationChange): (WebCore::NavigationScheduler::scheduleRefresh):
  • page/FrameView.cpp: (WebCore::FrameView::updateControlTints):
  • page/Location.cpp: (WebCore::Location::url): (WebCore::Location::setProtocol): (WebCore::Location::setHost): (WebCore::Location::setHostname): (WebCore::Location::setPort): (WebCore::Location::setPathname): (WebCore::Location::setSearch): (WebCore::Location::setHash): (WebCore::Location::reload):
  • page/Page.cpp: (WebCore::Page::goToItem):

2011-01-27 Nate Chapin <Nate Chapin>

Reviewed by Adam Barth.

Use Document::url() instead of FrameLoader::url().
​https://bugs.webkit.org/show_bug.cgi?id=41165

  • ewk/ewk_frame.cpp: (ewk_frame_uri_changed):

2011-01-27 Nate Chapin <Nate Chapin>

Reviewed by Adam Barth.

Use Document::url() instead of FrameLoader::url().
​https://bugs.webkit.org/show_bug.cgi?id=41165

  • webkit/webkitwebview.cpp: (webkit_web_view_get_icon_uri):

2011-01-27 Nate Chapin <Nate Chapin>

Reviewed by Adam Barth.

Use Document::url() instead of FrameLoader::url().
​https://bugs.webkit.org/show_bug.cgi?id=41165

  • WebCoreSupport/FrameLoaderClientHaiku.cpp: (WebCore::FrameLoaderClientHaiku::dispatchDidFinishDocumentLoad):

2011-01-27 Nate Chapin <Nate Chapin>

Reviewed by Adam Barth.

Use Document::url() instead of FrameLoader::url().
​https://bugs.webkit.org/show_bug.cgi?id=41165

  • WebView/WebView.mm: (-[WebView _dispatchDidReceiveIconFromWebFrame:]):

2011-01-27 Nate Chapin <Nate Chapin>

Reviewed by Adam Barth.

Use Document::url() instead of FrameLoader::url().
​https://bugs.webkit.org/show_bug.cgi?id=41165

  • Api/qwebframe.cpp: (QWebFrame::url):

2011-01-27 Nate Chapin <Nate Chapin>

Reviewed by Adam Barth.

Use Document::url() instead of FrameLoader::url().
​https://bugs.webkit.org/show_bug.cgi?id=41165

  • WebFrame.cpp: (WebFrame::url):

2011-01-27 Nate Chapin <Nate Chapin>

Reviewed by Adam Barth.

Use Document::url() instead of FrameLoader::url().
​https://bugs.webkit.org/show_bug.cgi?id=41165

  • WebKitSupport/FrameLoaderClientWx.cpp: (WebCore::FrameLoaderClientWx::dispatchDidFinishDocumentLoad):

2011-01-27 Nate Chapin <Nate Chapin>

Reviewed by Adam Barth.

Use Document::url() instead of FrameLoader::url().
​https://bugs.webkit.org/show_bug.cgi?id=41165

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::dispatchDidChangeLocationWithinPage): (WebKit::WebFrameLoaderClient::dispatchDidPushStateWithinPage): (WebKit::WebFrameLoaderClient::dispatchDidReplaceStateWithinPage): (WebKit::WebFrameLoaderClient::dispatchDidPopStateWithinPage):
  • WebProcess/WebPage/WebFrame.cpp: (WebKit::WebFrame::url):
Location:
trunk/Source
Files:
35 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r76866 r76872  
     12011-01-27  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Remove FrameLoader::url() and update callers to use
     6        Document::url().
     7        https://bugs.webkit.org/show_bug.cgi?id=41165
     8
     9        Refactor, no new tests.
     10
     11        * WebCore.exp.in:
     12        * dom/Document.cpp:
     13        (WebCore::Document::processHttpEquiv):
     14        (WebCore::Document::removePendingSheet):
     15        * history/CachedFrame.cpp:
     16        (WebCore::CachedFrameBase::CachedFrameBase):
     17        * history/PageCache.cpp:
     18        (WebCore::logCanCacheFrameDecision):
     19        (WebCore::PageCache::canCachePageContainingThisFrame):
     20        * html/HTMLFrameElementBase.cpp:
     21        (WebCore::HTMLFrameElementBase::isURLAllowed):
     22        * html/HTMLPlugInImageElement.cpp:
     23        (WebCore::HTMLPlugInImageElement::allowedToLoadFrameURL):
     24        * inspector/InspectorAgent.cpp:
     25        (WebCore::InspectorAgent::inspectedURL):
     26        * inspector/InspectorResourceAgent.cpp:
     27        (WebCore::buildObjectForFrame):
     28        * loader/DocumentWriter.cpp:
     29        (WebCore::DocumentWriter::replaceDocument):
     30        (WebCore::DocumentWriter::deprecatedFrameEncoding):
     31        * loader/FrameLoader.cpp:
     32        * loader/FrameLoader.h:
     33        * loader/HistoryController.cpp:
     34        (WebCore::HistoryController::updateForStandardLoad):
     35        (WebCore::HistoryController::updateForRedirectWithLockedBackForwardList):
     36        (WebCore::HistoryController::updateForSameDocumentNavigation):
     37        * loader/NavigationScheduler.cpp:
     38        (WebCore::ScheduledHistoryNavigation::fire):
     39        (WebCore::NavigationScheduler::scheduleLocationChange):
     40        (WebCore::NavigationScheduler::scheduleRefresh):
     41        * page/FrameView.cpp:
     42        (WebCore::FrameView::updateControlTints):
     43        * page/Location.cpp:
     44        (WebCore::Location::url):
     45        (WebCore::Location::setProtocol):
     46        (WebCore::Location::setHost):
     47        (WebCore::Location::setHostname):
     48        (WebCore::Location::setPort):
     49        (WebCore::Location::setPathname):
     50        (WebCore::Location::setSearch):
     51        (WebCore::Location::setHash):
     52        (WebCore::Location::reload):
     53        * page/Page.cpp:
     54        (WebCore::Page::goToItem):
     55
    1562011-01-27  Stephen White  <senorblanco@chromium.org>
    257

  • trunk/Source/WebCore/WebCore.exp.in

    r76821 r76872  
    972972__ZNK7WebCore11FrameLoader20activeDocumentLoaderEv
    973973__ZNK7WebCore11FrameLoader27numPendingOrLoadingRequestsEb
    974 __ZNK7WebCore11FrameLoader3urlEv
    975974__ZNK7WebCore11FrameLoader8loadTypeEv
    976975__ZNK7WebCore11HistoryItem10visitCountEv

  • trunk/Source/WebCore/dom/Document.cpp

    r76702 r76872  
    26472647        if (frame && parseHTTPRefresh(content, true, delay, url)) {
    26482648            if (url.isEmpty())
    2649                 url = frame->loader()->url().string();
     2649                url = m_url.string();
    26502650            else
    26512651                url = completeURL(url).string();
    … …  
    29282928
    29292929    if (m_gotoAnchorNeededAfterStylesheetsLoad && view())
    2930         view()->scrollToFragment(m_frame->loader()->url());
     2930        view()->scrollToFragment(m_url);
    29312931}
    29322932

  • trunk/Source/WebCore/history/CachedFrame.cpp

    r75994 r76872  
    6666    , m_view(frame->view())
    6767    , m_mousePressNode(frame->eventHandler()->mousePressNode())
    68     , m_url(frame->loader()->url())
     68    , m_url(frame->document()->url())
    6969    , m_isMainFrame(!frame->tree()->parent())
    7070{

  • trunk/Source/WebCore/history/PageCache.cpp

    r75966 r76872  
    112112            cannotCache = true;
    113113        }
    114         if (frame->loader()->url().protocolIs("https")) {
     114        if (frame->document()->url().protocolIs("https")) {
    115115            PCLOG("   -Frame is HTTPS");
    116116            cannotCache = true;
    … …  
    261261        // the right NPObjects. See <rdar://problem/5197041> for more information.
    262262        && !frame->loader()->subframeLoader()->containsPlugins()
    263         && !frame->loader()->url().protocolIs("https")
     263        && !frame->document()->url().protocolIs("https")
    264264        && (!frame->domWindow() || !frame->domWindow()->hasEventListeners(eventNames().unloadEvent))
    265265#if ENABLE(DATABASE)

  • trunk/Source/WebCore/html/HTMLFrameElementBase.cpp

    r71962 r76872  
    8181    bool foundSelfReference = false;
    8282    for (Frame* frame = document()->frame(); frame; frame = frame->tree()->parent()) {
    83         if (equalIgnoringFragmentIdentifier(frame->loader()->url(), completeURL)) {
     83        if (equalIgnoringFragmentIdentifier(frame->document()->url(), completeURL)) {
    8484            if (foundSelfReference)
    8585                return false;

  • trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

    r66711 r76872  
    7979    bool foundSelfReference = false;
    8080    for (Frame* frame = document()->frame(); frame; frame = frame->tree()->parent()) {
    81         if (equalIgnoringFragmentIdentifier(frame->loader()->url(), completeURL)) {
     81        if (equalIgnoringFragmentIdentifier(frame->document()->url(), completeURL)) {
    8282            if (foundSelfReference)
    8383                return false;

  • trunk/Source/WebCore/inspector/InspectorAgent.cpp

    r76792 r76872  
    13481348KURL InspectorAgent::inspectedURL() const
    13491349{
    1350     return m_inspectedPage->mainFrame()->loader()->url();
     1350    return m_inspectedPage->mainFrame()->document()->url();
    13511351}
    13521352

  • trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

    r76690 r76872  
    379379        frameObject->setString("name", name);
    380380    }
    381     frameObject->setString("url", frame->loader()->url().string());
     381    frameObject->setString("url", frame->document()->url().string());
    382382    return frameObject;
    383383}

  • trunk/Source/WebCore/loader/DocumentWriter.cpp

    r76702 r76872  
    6868{
    6969    m_frame->loader()->stopAllLoaders();
    70     begin(m_frame->loader()->url(), true, m_frame->document()->securityOrigin());
     70    begin(m_frame->document()->url(), true, m_frame->document()->securityOrigin());
    7171
    7272    if (!source.isNull()) {
    … …  
    246246String DocumentWriter::deprecatedFrameEncoding() const
    247247{
    248     return m_frame->loader()->url().isEmpty() ? m_encoding : encoding();
     248    return m_frame->document()->url().isEmpty() ? m_encoding : encoding();
    249249}
    250250

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r76702 r76872  
    636636}
    637637
    638 const KURL& FrameLoader::url() const
    639 {
    640     ASSERT(m_frame->document());
    641     return m_frame->document()->url();
    642 }
    643 
    644638void FrameLoader::setOutgoingReferrer(const KURL& url)
    645639{

  • trunk/Source/WebCore/loader/FrameLoader.h

    r76702 r76872  
    268268    void frameDetached();
    269269
    270     const KURL& url() const;
    271270    void setOutgoingReferrer(const KURL&);
    272271

  • trunk/Source/WebCore/loader/HistoryController.cpp

    r76406 r76872  
    324324            addVisitedLink(page, historyURL);
    325325
    326         if (!frameLoader->documentLoader()->didCreateGlobalHistoryEntry() && frameLoader->documentLoader()->unreachableURL().isEmpty() && !frameLoader->url().isEmpty())
     326        if (!frameLoader->documentLoader()->didCreateGlobalHistoryEntry() && frameLoader->documentLoader()->unreachableURL().isEmpty() && !m_frame->document()->url().isEmpty())
    327327            frameLoader->client()->updateGlobalHistoryRedirectLinks();
    328328    }
    … …  
    366366            addVisitedLink(page, historyURL);
    367367
    368         if (!m_frame->loader()->documentLoader()->didCreateGlobalHistoryEntry() && m_frame->loader()->documentLoader()->unreachableURL().isEmpty() && !m_frame->loader()->url().isEmpty())
     368        if (!m_frame->loader()->documentLoader()->didCreateGlobalHistoryEntry() && m_frame->loader()->documentLoader()->unreachableURL().isEmpty() && !m_frame->document()->url().isEmpty())
    369369            m_frame->loader()->client()->updateGlobalHistoryRedirectLinks();
    370370    }
    … …  
    460460void HistoryController::updateForSameDocumentNavigation()
    461461{
    462     if (m_frame->loader()->url().isEmpty())
     462    if (m_frame->document()->url().isEmpty())
    463463        return;
    464464
    … …  
    471471        return;
    472472
    473     addVisitedLink(page, m_frame->loader()->url());
     473    addVisitedLink(page, m_frame->document()->url());
    474474}
    475475

  • trunk/Source/WebCore/loader/NavigationScheduler.cpp

    r76248 r76872  
    179179        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
    180180
    181         FrameLoader* loader = frame->loader();
    182181        if (!m_historySteps) {
    183182            // Special case for go(0) from a frame -> reload only the frame
    184183            // To follow Firefox and IE's behavior, history reload can only navigate the self frame.
    185             loader->urlSelected(loader->url(), "_self", 0, lockHistory(), lockBackForwardList(), SendReferrer);
     184            frame->loader()->urlSelected(frame->document()->url(), "_self", 0, lockHistory(), lockBackForwardList(), SendReferrer);
    186185            return;
    187186        }
    … …  
    323322    // fragment part, we don't need to schedule the location change.
    324323    KURL parsedURL(ParsedURLString, url);
    325     if (parsedURL.hasFragmentIdentifier() && equalIgnoringFragmentIdentifier(loader->url(), parsedURL)) {
     324    if (parsedURL.hasFragmentIdentifier() && equalIgnoringFragmentIdentifier(m_frame->document()->url(), parsedURL)) {
    326325        loader->changeLocation(securityOrigin, loader->completeURL(url), referrer, lockHistory, lockBackForwardList);
    327326        return;
    … …  
    360359    if (!shouldScheduleNavigation())
    361360        return;
    362     const KURL& url = m_frame->loader()->url();
     361    const KURL& url = m_frame->document()->url();
    363362    if (url.isEmpty())
    364363        return;

  • trunk/Source/WebCore/page/FrameView.cpp

    r76677 r76872  
    20942094   
    20952095    // Optimize the common case where we bring a window to the front while it's still empty.
    2096     if (!m_frame || m_frame->loader()->url().isEmpty())
     2096    if (!m_frame || m_frame->document()->url().isEmpty())
    20972097        return;
    20982098

  • trunk/Source/WebCore/page/Location.cpp

    r74843 r76872  
    5252    ASSERT(m_frame);
    5353
    54     const KURL& url = m_frame->loader()->url();
     54    const KURL& url = m_frame->document()->url();
    5555    if (!url.isValid())
    5656        return blankURL(); // Use "about:blank" while the page is still loading (before we have a frame).
    … …  
    168168    if (!m_frame)
    169169        return;
    170     KURL url = m_frame->loader()->url();
     170    KURL url = m_frame->document()->url();
    171171    if (!url.setProtocol(protocol)) {
    172172        ec = SYNTAX_ERR;
    … …  
    180180    if (!m_frame)
    181181        return;
    182     KURL url = m_frame->loader()->url();
     182    KURL url = m_frame->document()->url();
    183183    url.setHostAndPort(host);
    184184    m_frame->domWindow()->setLocation(url.string(), activeWindow, firstWindow);
    … …  
    189189    if (!m_frame)
    190190        return;
    191     KURL url = m_frame->loader()->url();
     191    KURL url = m_frame->document()->url();
    192192    url.setHost(hostname);
    193193    m_frame->domWindow()->setLocation(url.string(), activeWindow, firstWindow);
    … …  
    198198    if (!m_frame)
    199199        return;
    200     KURL url = m_frame->loader()->url();
     200    KURL url = m_frame->document()->url();
    201201    int port = portString.toInt();
    202202    if (port < 0 || port > 0xFFFF)
    … …  
    211211    if (!m_frame)
    212212        return;
    213     KURL url = m_frame->loader()->url();
     213    KURL url = m_frame->document()->url();
    214214    url.setPath(pathname);
    215215    m_frame->domWindow()->setLocation(url.string(), activeWindow, firstWindow);
    … …  
    220220    if (!m_frame)
    221221        return;
    222     KURL url = m_frame->loader()->url();
     222    KURL url = m_frame->document()->url();
    223223    url.setQuery(search);
    224224    m_frame->domWindow()->setLocation(url.string(), activeWindow, firstWindow);
    … …  
    229229    if (!m_frame)
    230230        return;
    231     KURL url = m_frame->loader()->url();
     231    KURL url = m_frame->document()->url();
    232232    String oldFragmentIdentifier = url.fragmentIdentifier();
    233233    String newFragmentIdentifier = hash;
    … …  
    269269        return;
    270270    }
    271     if (protocolIsJavaScript(m_frame->loader()->url()))
     271    if (protocolIsJavaScript(m_frame->document()->url()))
    272272        return;
    273273    m_frame->navigationScheduler()->scheduleRefresh();

  • trunk/Source/WebCore/page/Page.cpp

    r76518 r76872  
    340340#if ENABLE(DATABASE)
    341341        // If we're navigating the history via a fragment on the same document, then we do not want to stop databases.
    342         const KURL& currentURL = m_mainFrame->loader()->url();
     342        const KURL& currentURL = m_mainFrame->document()->url();
    343343        const KURL& newURL = item->url();
    344344   

  • trunk/Source/WebKit/efl/ChangeLog

    r75863 r76872  
     12011-01-27  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Use Document::url() instead of FrameLoader::url().
     6        https://bugs.webkit.org/show_bug.cgi?id=41165
     7
     8        * ewk/ewk_frame.cpp:
     9        (ewk_frame_uri_changed):
     10
    1112011-01-14  Patrick Gansterer  <paroga@webkit.org>
    212

  • trunk/Source/WebKit/efl/ewk/ewk_frame.cpp

    r75863 r76872  
    20092009    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
    20102010    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
    2011     WTF::CString uri(sd->frame->loader()->url().prettyURL().utf8());
     2011    WTF::CString uri(sd->frame->document()->url().prettyURL().utf8());
    20122012
    20132013    INF("uri=%s", uri.data());

  • trunk/Source/WebKit/gtk/ChangeLog

    r76822 r76872  
     12011-01-27  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Use Document::url() instead of FrameLoader::url().
     6        https://bugs.webkit.org/show_bug.cgi?id=41165
     7
     8        * webkit/webkitwebview.cpp:
     9        (webkit_web_view_get_icon_uri):
     10
    1112011-01-27  Mario Sanchez Prada  <msanchez@igalia.com>
    212

  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r75481 r76872  
    835835    WebKitWebFramePrivate* priv = m_frame->priv;
    836836    g_free(priv->uri);
    837     priv->uri = g_strdup(core(m_frame)->loader()->url().prettyURL().utf8().data());
     837    priv->uri = g_strdup(core(m_frame)->document()->url().prettyURL().utf8().data());
    838838    g_object_notify(G_OBJECT(m_frame), "uri");
    839839    WebKitWebView* webView = getViewFromFrame(m_frame);

  • trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

    r76351 r76872  
    50525052{
    50535053    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);
    5054     String iconURL = iconDatabase()->iconURLForPageURL(core(webView)->mainFrame()->loader()->url().prettyURL());
     5054    String iconURL = iconDatabase()->iconURLForPageURL(core(webView)->mainFrame()->document()->url().prettyURL());
    50555055    webView->priv->iconURI = iconURL.utf8();
    50565056    return webView->priv->iconURI.data();

  • trunk/Source/WebKit/haiku/ChangeLog

    r74571 r76872  
     12011-01-27  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Use Document::url() instead of FrameLoader::url().
     6        https://bugs.webkit.org/show_bug.cgi?id=41165
     7
     8        * WebCoreSupport/FrameLoaderClientHaiku.cpp:
     9        (WebCore::FrameLoaderClientHaiku::dispatchDidFinishDocumentLoad):
     10
    1112010-12-22  Sam Weinig  <sam@webkit.org>
    212

  • trunk/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp

    r74571 r76872  
    262262    if (m_webView) {
    263263        BMessage message(LOAD_DOC_COMPLETED);
    264         message.AddString("url", m_frame->loader()->url().string());
     264        message.AddString("url", m_frame->document()->url().string());
    265265        m_messenger->SendMessage(&message);
    266266    }
    … …  
    324324    if (m_webView) {
    325325        BMessage message(LOAD_DL_COMPLETED);
    326         message.AddString("url", m_frame->loader()->url().string());
     326        message.AddString("url", m_frame->document()->url().string());
    327327        m_messenger->SendMessage(&message);
    328328    }

  • trunk/Source/WebKit/mac/ChangeLog

    r76813 r76872  
     12011-01-27  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Use Document::url() instead of FrameLoader::url().
     6        https://bugs.webkit.org/show_bug.cgi?id=41165
     7
     8        * WebView/WebView.mm:
     9        (-[WebView _dispatchDidReceiveIconFromWebFrame:]):
     10
    1112011-01-27  Dan Bernstein  <mitz@apple.com>
    212

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r76390 r76872  
    58355835    WebFrameLoadDelegateImplementationCache* cache = &_private->frameLoadDelegateImplementations;
    58365836    if (cache->didReceiveIconForFrameFunc) {
    5837         Image* image = iconDatabase()->iconForPageURL(core(webFrame)->loader()->url().string(), IntSize(16, 16));
     5837        Image* image = iconDatabase()->iconForPageURL(core(webFrame)->document()->url().string(), IntSize(16, 16));
    58385838        if (NSImage *icon = webGetNSImage(image, NSMakeSize(16, 16)))
    58395839            CallFrameLoadDelegate(cache->didReceiveIconForFrameFunc, self, @selector(webView:didReceiveIcon:forFrame:), icon, webFrame);

  • trunk/Source/WebKit/qt/Api/qwebframe.cpp

    r76516 r76872  
    758758QUrl QWebFrame::url() const
    759759{
    760     return d->frame->loader()->url();
     760    return d->frame->document()->url();
    761761}
    762762
    … …  
    814814QIcon QWebFrame::icon() const
    815815{
    816     return QWebSettings::iconForUrl(d->frame->loader()->url());
     816    return QWebSettings::iconForUrl(d->frame->document()->url());
    817817}
    818818

  • trunk/Source/WebKit/qt/ChangeLog

    r76834 r76872  
     12011-01-27  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Use Document::url() instead of FrameLoader::url().
     6        https://bugs.webkit.org/show_bug.cgi?id=41165
     7
     8        * Api/qwebframe.cpp:
     9        (QWebFrame::url):
     10
    1112011-01-27  Robert Hogan  <robert@webkit.org>
    212

  • trunk/Source/WebKit/win/ChangeLog

    r76871 r76872  
     12011-01-27  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Use Document::url() instead of FrameLoader::url().
     6        https://bugs.webkit.org/show_bug.cgi?id=41165
     7
     8        * WebFrame.cpp:
     9        (WebFrame::url):
     10
    1112011-01-27  Sam Weinig  <sam@webkit.org>
    212

  • trunk/Source/WebKit/win/WebFrame.cpp

    r75377 r76872  
    704704        return KURL();
    705705
    706     return coreFrame->loader()->url();
     706    return coreFrame->document()->url();
    707707}
    708708

  • trunk/Source/WebKit/wx/ChangeLog

    r75857 r76872  
     12011-01-27  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Use Document::url() instead of FrameLoader::url().
     6        https://bugs.webkit.org/show_bug.cgi?id=41165
     7
     8        * WebKitSupport/FrameLoaderClientWx.cpp:
     9        (WebCore::FrameLoaderClientWx::dispatchDidFinishDocumentLoad):
     10
    1112011-01-14  Yuzo Fujishima  <yuzo@google.com>
    212

  • trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

    r74571 r76872  
    321321        wxWebViewLoadEvent wkEvent(m_webView);
    322322        wkEvent.SetState(wxWEBVIEW_LOAD_DOC_COMPLETED);
    323         wkEvent.SetURL(m_frame->loader()->url().string());
     323        wkEvent.SetURL(m_frame->document()->url().string());
    324324        m_webView->GetEventHandler()->ProcessEvent(wkEvent);
    325325    }
    … …  
    395395        wxWebViewLoadEvent wkEvent(m_webView);
    396396        wkEvent.SetState(wxWEBVIEW_LOAD_DL_COMPLETED);
    397         wkEvent.SetURL(m_frame->loader()->url().string());
     397        wkEvent.SetURL(m_frame->document()->url().string());
    398398        m_webView->GetEventHandler()->ProcessEvent(wkEvent);
    399399    }

  • trunk/Source/WebKit2/ChangeLog

    r76833 r76872  
     12011-01-27  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Use Document::url() instead of FrameLoader::url().
     6        https://bugs.webkit.org/show_bug.cgi?id=41165
     7
     8        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     9        (WebKit::WebFrameLoaderClient::dispatchDidChangeLocationWithinPage):
     10        (WebKit::WebFrameLoaderClient::dispatchDidPushStateWithinPage):
     11        (WebKit::WebFrameLoaderClient::dispatchDidReplaceStateWithinPage):
     12        (WebKit::WebFrameLoaderClient::dispatchDidPopStateWithinPage):
     13        * WebProcess/WebPage/WebFrame.cpp:
     14        (WebKit::WebFrame::url):
     15
    1162011-01-27  Sam Weinig  <sam@webkit.org>
    217

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r76701 r76872  
    313313
    314314    // Notify the UIProcess.
    315     webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), SameDocumentNavigationAnchorNavigation, m_frame->coreFrame()->loader()->url().string(), InjectedBundleUserMessageEncoder(userData.get())));
     315    webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), SameDocumentNavigationAnchorNavigation, m_frame->coreFrame()->document()->url().string(), InjectedBundleUserMessageEncoder(userData.get())));
    316316}
    317317
    … …  
    328328
    329329    // Notify the UIProcess.
    330     webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), SameDocumentNavigationSessionStatePush, m_frame->coreFrame()->loader()->url().string(), InjectedBundleUserMessageEncoder(userData.get())));
     330    webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), SameDocumentNavigationSessionStatePush, m_frame->coreFrame()->document()->url().string(), InjectedBundleUserMessageEncoder(userData.get())));
    331331}
    332332
    … …  
    343343
    344344    // Notify the UIProcess.
    345     webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), SameDocumentNavigationSessionStateReplace, m_frame->coreFrame()->loader()->url().string(), InjectedBundleUserMessageEncoder(userData.get())));
     345    webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), SameDocumentNavigationSessionStateReplace, m_frame->coreFrame()->document()->url().string(), InjectedBundleUserMessageEncoder(userData.get())));
    346346}
    347347
    … …  
    358358
    359359    // Notify the UIProcess.
    360     webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), SameDocumentNavigationSessionStatePop, m_frame->coreFrame()->loader()->url().string(), InjectedBundleUserMessageEncoder(userData.get())));
     360    webPage->send(Messages::WebPageProxy::DidSameDocumentNavigationForFrame(m_frame->frameID(), SameDocumentNavigationSessionStatePop, m_frame->coreFrame()->document()->url().string(), InjectedBundleUserMessageEncoder(userData.get())));
    361361}
    362362

  • trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp

    r76394 r76872  
    335335        return String();
    336336
    337     return m_coreFrame->loader()->url().string();
     337    return m_coreFrame->document()->url().string();
    338338}
    339339
Note: See TracChangeset for help on using the changeset viewer.