diff options
| author | Steve Block <steveblock@google.com> | 2011-05-19 15:53:15 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-25 15:27:49 +0100 |
| commit | 009b983c891f32393abb660c7ddcba669fbd5b94 (patch) | |
| tree | e599f643bffb2d387661531568171ff2a0c5e0b7 /Source/WebKit/android/jni/WebViewCore.cpp | |
| parent | 4807ac696f910b8bee0a12b5bba5ae39c1deefe4 (diff) | |
| download | external_webkit-009b983c891f32393abb660c7ddcba669fbd5b94.zip external_webkit-009b983c891f32393abb660c7ddcba669fbd5b94.tar.gz external_webkit-009b983c891f32393abb660c7ddcba669fbd5b94.tar.bz2 | |
Merge WebKit at r78450: FrameLoader::url() removed
See http://trac.webkit.org/changeset/76872
Change-Id: I54790419f4e3b7dcd1e6123d6ff4bda8d7997066
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 09626d1..f4ef9a5 100644 --- 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, |