2010-10-22 Jenn Braithwaite <jennb@chromium.org>

Reviewed by Adam Roben. Windows client needs updating when live iframe element is moved between pages https://bugs.webkit.org/show_bug.cgi?id=46915 * platform/win/Skipped: Stop skipping fast/frames/iframe-reparenting-adopt-node.html 2010-10-22 Jenn Braithwaite <jennb@chromium.org> Reviewed by Adam Roben. Windows client needs updating when live iframe element is moved between pages https://bugs.webkit.org/show_bug.cgi?id=46915 * WebCoreSupport/WebFrameLoaderClient.cpp: (WebFrameLoaderClient::didTransferChildFrameToNewDocument): Update WebView in WebFrame to match that of the current page. * WebFrame.cpp: (WebFrame::setWebView): Added. * WebFrame.h: Canonical link: https://commits.webkit.org/60913@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@70376 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Oct 23, 2010 · 1af6232 · 1af6232
1 parent 41ad860
commit 1af6232
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 3 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-22  Jenn Braithwaite  <jennb@chromium.org>
+
+        Reviewed by Adam Roben.
+
+        Windows client needs updating when live iframe element is moved between pages
+        https://bugs.webkit.org/show_bug.cgi?id=46915
+
+        * platform/win/Skipped:
+        Stop skipping fast/frames/iframe-reparenting-adopt-node.html
+
 2010-10-22  Abhishek Arya  <inferno@chromium.org>
 
         Unreviewed.

diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
@@ -298,9 +298,6 @@ editing/selection/context-menu-on-text.html
 # and https://bugs.webkit.org/show_bug.cgi?id=45021
 media/context-menu-actions.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=44713
-fast/frames/iframe-reparenting-adopt-node.html
-
 # Assertion failure in replaySavedEvents http://webkit.org/b/21796
 editing/pasteboard/drop-text-events.html
 editing/selection/drag-in-iframe.html

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-22  Jenn Braithwaite  <jennb@chromium.org>
+
+        Reviewed by Adam Roben.
+
+        Windows client needs updating when live iframe element is moved between pages
+        https://bugs.webkit.org/show_bug.cgi?id=46915
+
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::didTransferChildFrameToNewDocument):
+        Update WebView in WebFrame to match that of the current page.
+        * WebFrame.cpp:
+        (WebFrame::setWebView):
+        Added.
+        * WebFrame.h:
+
 2010-10-22  Sam Weinig  <sam@webkit.org>
 
         Fix windows build.

diff --git a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -730,6 +730,11 @@ PassRefPtr<Frame> WebFrameLoaderClient::createFrame(const KURL& url, const Strin
 
 void WebFrameLoaderClient::didTransferChildFrameToNewDocument(Page*)
 {
+    Frame* coreFrame = core(m_webFrame);
+    ASSERT(coreFrame);
+    WebView* webView = kit(coreFrame->page());
+    if (m_webFrame->webView() != webView)
+        m_webFrame->setWebView(webView);
 }
 
 PassRefPtr<Frame> WebFrameLoaderClient::createFrame(const KURL& URL, const String& name, HTMLFrameOwnerElement* ownerElement, const String& referrer)

diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
@@ -2586,6 +2586,11 @@ WebView* WebFrame::webView() const
     return d->webView;
 }
 
+void WebFrame::setWebView(WebView* webView)
+{
+    d->webView = webView;
+}
+
 COMPtr<IAccessible> WebFrame::accessible() const
 {
     Frame* coreFrame = core(this);

diff --git a/WebKit/win/WebFrame.h b/WebKit/win/WebFrame.h
@@ -376,6 +376,7 @@ class DECLSPEC_UUID("{A3676398-4485-4a9d-87DC-CB5A40E6351D}") WebFrame : public
     WebCore::KURL url() const;
 
     WebView* webView() const;
+    void setWebView(WebView*);
 
     COMPtr<IAccessible> accessible() const;