[webkit-changes] [158616] trunk/Source/WebKit/wince

Mon, 04 Nov 2013 16:45:33 -0800

Title: [158616] trunk/Source/WebKit/wince
Revision
158616
Author
[email protected]
Date
2013-11-04 16:46:55 -0800 (Mon, 04 Nov 2013)

Log Message

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

Patch by Zhuang Zhigang <[email protected]> on 2013-11-04
Reviewed by Darin Adler.

* WebCoreSupport/FrameLoaderClientWinCE.cpp:
(WebKit::FrameLoaderClientWinCE::createFrame):
* WebView.cpp:
(WebView::createFrame):
* WebView.h:

Modified Paths

Diff

Modified: trunk/Source/WebKit/wince/ChangeLog (158615 => 158616)


--- trunk/Source/WebKit/wince/ChangeLog	2013-11-05 00:46:04 UTC (rev 158615)
+++ trunk/Source/WebKit/wince/ChangeLog	2013-11-05 00:46:55 UTC (rev 158616)
@@ -1,3 +1,16 @@
+2013-11-04  Zhuang Zhigang  <[email protected]>
+
+        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  <[email protected]>
 
         [WINCE] Replace OwnPtr with GDIObject

Modified: trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp (158615 => 158616)


--- trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp	2013-11-05 00:46:04 UTC (rev 158615)
+++ trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp	2013-11-05 00:46:55 UTC (rev 158616)
@@ -171,7 +171,7 @@
 PassRefPtr<Frame> FrameLoaderClientWinCE::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
                                                  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);
 }
 
 void FrameLoaderClientWinCE::redirectDataToPlugin(Widget* pluginWidget)

Modified: trunk/Source/WebKit/wince/WebView.cpp (158615 => 158616)


--- trunk/Source/WebKit/wince/WebView.cpp	2013-11-05 00:46:04 UTC (rev 158615)
+++ trunk/Source/WebKit/wince/WebView.cpp	2013-11-05 00:46:55 UTC (rev 158616)
@@ -157,15 +157,13 @@
 }
 
 PassRefPtr<Frame> WebView::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement* ownerElement, const String& referrer,
-                                       bool /*allowsScrolling*/, int /*marginWidth*/, int /*marginHeight*/)
+    bool /*allowsScrolling*/, int /*marginWidth*/, int /*marginHeight*/, Frame* parentFrame)
 {
-    Frame* coreFrame = m_frame;
-
     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();
 
@@ -173,7 +171,7 @@
     if (!childFrame->page())
         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.
     if (!childFrame->tree().parent())

Modified: trunk/Source/WebKit/wince/WebView.h (158615 => 158616)


--- trunk/Source/WebKit/wince/WebView.h	2013-11-05 00:46:04 UTC (rev 158615)
+++ trunk/Source/WebKit/wince/WebView.h	2013-11-05 00:46:55 UTC (rev 158616)
@@ -69,7 +69,8 @@
 
     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
     void runJavaScriptAlert(const WTF::String& message);

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to