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));
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
// 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();
}
}
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,