Merge WebKit at r78450: FrameLoader::url() removed

See http://trac.webkit.org/changeset/76872

Change-Id: I54790419f4e3b7dcd1e6123d6ff4bda8d7997066

diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index 946a4a7..33c2920 100644 (file)
--- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -249,7 +249,7 @@ void FrameLoaderClientAndroid::dispatchDidReceiveIcon() {
     ASSERT(m_frame);
     if (m_frame->tree() && m_frame->tree()->parent())
         return;
-    WTF::String url(m_frame->loader()->url().string());
+    WTF::String url(m_frame->document()->url().string());
     // Try to obtain the icon image.
     WebCore::Image* icon = WebCore::iconDatabase()->iconForPageURL(
             url, WebCore::IntSize(16, 16));
@@ -761,7 +761,7 @@ bool FrameLoaderClientAndroid::shouldFallBack(const ResourceError&) {
 bool FrameLoaderClientAndroid::canHandleRequest(const ResourceRequest& request) const {
     ASSERT(m_frame);
     // Don't allow hijacking of intrapage navigation
-    if (WebCore::equalIgnoringFragmentIdentifier(request.url(), m_frame->loader()->url()))
+    if (WebCore::equalIgnoringFragmentIdentifier(request.url(), m_frame->document()->url()))
         return true;
 
     // Don't allow hijacking of iframe urls that are http or https
@@ -1334,7 +1334,7 @@ void FrameLoaderClientAndroid::didAddIconForPageUrl(const String& pageUrl) {
     // to be read from disk.
     registerForIconNotification(false);
     KURL u(ParsedURLString, pageUrl);
-    if (equalIgnoringFragmentIdentifier(u, m_frame->loader()->url())) {
+    if (equalIgnoringFragmentIdentifier(u, m_frame->document()->url())) {
         dispatchDidReceiveIcon();
     }
 }

diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 09626d1..f4ef9a5 100644 (file)
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -1035,13 +1035,12 @@ void WebViewCore::didFirstLayout()
     DEBUG_NAV_UI_LOGD("%s", __FUNCTION__);
     LOG_ASSERT(m_javaGlue->m_obj, "A Java widget was not associated with this view bridge!");
 
-    WebCore::FrameLoader* loader = m_mainFrame->loader();
-    const WebCore::KURL& url = loader->url();
+    const WebCore::KURL& url = m_mainFrame->document()->url();
     if (url.isEmpty())
         return;
     LOGV("::WebCore:: didFirstLayout %s", url.string().ascii().data());
 
-    WebCore::FrameLoadType loadType = loader->loadType();
+    WebCore::FrameLoadType loadType = m_mainFrame->loader()->loadType();
 
     JNIEnv* env = JSC::Bindings::getJNIEnv();
     env->CallVoidMethod(m_javaGlue->object(env).get(), m_javaGlue->m_didFirstLayout,