Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / FrameLoaderClientImpl.cpp

diff --git a/src/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/src/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
index 38342fa..fa782ec 100644 (file)
--- a/src/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
+++ b/src/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
@@ -234,6 +234,42 @@ bool FrameLoaderClientImpl::hasWebView() const
     return m_webFrame->viewImpl();
 }
 
+Frame* FrameLoaderClientImpl::parent() const
+{
+    WebFrameImpl* frame = toWebFrameImpl(m_webFrame->parent());
+    return frame ? frame->frame() : 0;
+}
+
+Frame* FrameLoaderClientImpl::top() const
+{
+    WebFrameImpl* frame = toWebFrameImpl(m_webFrame->top());
+    return frame ? frame->frame() : 0;
+}
+
+Frame* FrameLoaderClientImpl::previousSibling() const
+{
+    WebFrameImpl* frame = toWebFrameImpl(m_webFrame->previousSibling());
+    return frame ? frame->frame() : 0;
+}
+
+Frame* FrameLoaderClientImpl::nextSibling() const
+{
+    WebFrameImpl* frame = toWebFrameImpl(m_webFrame->nextSibling());
+    return frame ? frame->frame() : 0;
+}
+
+Frame* FrameLoaderClientImpl::firstChild() const
+{
+    WebFrameImpl* frame = toWebFrameImpl(m_webFrame->firstChild());
+    return frame ? frame->frame() : 0;
+}
+
+Frame* FrameLoaderClientImpl::lastChild() const
+{
+    WebFrameImpl* frame = toWebFrameImpl(m_webFrame->lastChild());
+    return frame ? frame->frame() : 0;
+}
+
 void FrameLoaderClientImpl::detachedFromParent()
 {
     // Alert the client that the frame is being detached. This is the last
@@ -566,11 +602,11 @@ void FrameLoaderClientImpl::transitionToCommittedForNewPage()
 PassRefPtr<Frame> FrameLoaderClientImpl::createFrame(
     const KURL& url,
     const AtomicString& name,
-    const String& referrer,
+    const Referrer& referrer,
     HTMLFrameOwnerElement* ownerElement)
 {
     FrameLoadRequest frameRequest(m_webFrame->frame()->document(),
-        ResourceRequest(url, AtomicString(referrer)), name);
+        ResourceRequest(url, referrer), name);
     return m_webFrame->createChildFrame(frameRequest, ownerElement);
 }
 
@@ -727,17 +763,13 @@ void FrameLoaderClientImpl::didLoseWebGLContext(int arbRobustnessContextLostReas
         m_webFrame->client()->didLoseWebGLContext(m_webFrame, arbRobustnessContextLostReason);
 }
 
-bool FrameLoaderClientImpl::allowWebGLDebugRendererInfo()
-{
-    if (m_webFrame->permissionClient())
-        return m_webFrame->permissionClient()->allowWebGLDebugRendererInfo(m_webFrame);
-    return false;
-}
-
 void FrameLoaderClientImpl::dispatchWillInsertBody()
 {
     if (m_webFrame->client())
         m_webFrame->client()->willInsertBody(m_webFrame);
+
+    if (m_webFrame->viewImpl())
+        m_webFrame->viewImpl()->willInsertBody(m_webFrame);
 }
 
 PassOwnPtr<WebServiceWorkerProvider> FrameLoaderClientImpl::createServiceWorkerProvider(PassOwnPtr<WebServiceWorkerProviderClient> client)