Changeset 158616 in webkit

Timestamp:

Nov 4, 2013 4:46:55 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Change structure of frame tree in WINCE port.
​https://bugs.webkit.org/show_bug.cgi?id=121079

Patch by Zhuang Zhigang <​zhuangzg@cn.fujitsu.com> on 2013-11-04
Reviewed by Darin Adler.

• WebCoreSupport/FrameLoaderClientWinCE.cpp:

(WebKit::FrameLoaderClientWinCE::createFrame):

• WebView.cpp:

(WebView::createFrame):

• WebView.h:

Location:

trunk/Source/WebKit/wince

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientWinCE.cpp (modified) (1 diff)
• WebView.cpp (modified) (2 diffs)
• WebView.h (modified) (1 diff)

trunk/Source/WebKit/wince/ChangeLog

@@ +1 @@
+2013-11-04  Zhuang Zhigang  <zhuangzg@cn.fujitsu.com>
+
+        Change structure of frame tree in WINCE port.
+        https://bugs.webkit.org/show_bug.cgi?id=121079
+
+        Reviewed by Darin Adler.
+
+        * WebCoreSupport/FrameLoaderClientWinCE.cpp:
+        (WebKit::FrameLoaderClientWinCE::createFrame):
+        * WebView.cpp:
+        (WebView::createFrame):
+        * WebView.h:
+
 2013-11-03  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp

@@ -172 +172 @@
                                                  const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight)
 {
-    return m_webView->createFrame(url, name, ownerElement, referrer, allowsScrolling, marginWidth, marginHeight);
+    return m_webView->createFrame(url, name, ownerElement, referrer, allowsScrolling, marginWidth, marginHeight, m_frame);
 }
 

trunk/Source/WebKit/wince/WebView.cpp

@@ -158 +158 @@
 
 PassRefPtr<Frame> WebView::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement* ownerElement, const String& referrer,
-                                       bool /*allowsScrolling*/, int /*marginWidth*/, int /*marginHeight*/)
-{
-    Frame* coreFrame = m_frame;
-
+    bool /*allowsScrolling*/, int /*marginWidth*/, int /*marginHeight*/, Frame* parentFrame)
+{
     WebKit::FrameLoaderClientWinCE *loaderClient = new WebKit::FrameLoaderClientWinCE(this);
     RefPtr<Frame> childFrame = Frame::create(m_page, ownerElement, loaderClient);
     loaderClient->setFrame(childFrame.get());
 
-    coreFrame->tree().appendChild(childFrame);
+    parentFrame->tree().appendChild(childFrame);
     childFrame->tree().setName(name);
     childFrame->init();
@@ -174 +172 @@
         return 0;
 
-    coreFrame->loader().loadURLIntoChildFrame(url, referrer, childFrame.get());
+    parentFrame->loader().loadURLIntoChildFrame(url, referrer, childFrame.get());
 
     // The frame's onload handler may have removed it from the document.

trunk/Source/WebKit/wince/WebView.h

@@ -70 +70 @@
     void frameRect(RECT* rect) const;
 
-    PassRefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String&, WebCore::HTMLFrameOwnerElement*, const WTF::String&, bool, int, int);
+    PassRefPtr<WebCore::Frame> createFrame(const WebCore::URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement*, 
+        const WTF::String& referrer, bool allowScrolling, int marginWidth, int marginHeight, WebCore::Frame* parentFrame);
 
     // JavaScript Dialog