Changeset 68576 in webkit
- Timestamp:
- Sep 28, 2010 3:27:30 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 34 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r68574 r68576 1 2010-09-28 Jenn Braithwaite <jennb@chromium.org> 2 3 Reviewed by Dmitry Titov. 4 5 Added oldPage param to FrameLoaderClient::didTransferChildFrameToNewDocument. 6 https://bugs.webkit.org/show_bug.cgi?id=46663 7 8 No new tests. API addition only. Will be used in separate patch. 9 10 * loader/EmptyClients.h: 11 (WebCore::EmptyFrameLoaderClient::didTransferChildFrameToNewDocument): 12 * loader/FrameLoaderClient.h: 13 * page/Frame.cpp: 14 (WebCore::Frame::transferChildFrameToNewDocument): 15 Pass former page to didTransferChildFrameToNewDocument. 16 1 17 2010-09-28 W. James MacLean <wjmaclean@chromium.org> 2 18 -
trunk/WebCore/loader/EmptyClients.h
r68061 r68576 337 337 virtual void didRunInsecureContent(SecurityOrigin*) { } 338 338 virtual PassRefPtr<Frame> createFrame(const KURL&, const String&, HTMLFrameOwnerElement*, const String&, bool, int, int) { return 0; } 339 virtual void didTransferChildFrameToNewDocument( ) { }339 virtual void didTransferChildFrameToNewDocument(Page*) { } 340 340 virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool) { return 0; } 341 341 virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL&, const Vector<String>&, const Vector<String>&) { return 0; } -
trunk/WebCore/loader/FrameLoaderClient.h
r68061 r68576 65 65 class KURL; 66 66 class NavigationAction; 67 class Page; 67 68 class ProtectionSpace; 68 69 class PluginView; … … 230 231 virtual PassRefPtr<Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement, 231 232 const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) = 0; 232 virtual void didTransferChildFrameToNewDocument( ) = 0;233 virtual void didTransferChildFrameToNewDocument(Page* oldPage) = 0; 233 234 virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) = 0; 234 235 virtual void redirectDataToPlugin(Widget* pluginWidget) = 0; -
trunk/WebCore/page/Frame.cpp
r67956 r68576 718 718 // Switch page. 719 719 Page* newPage = newParent ? newParent->page() : 0; 720 Page* oldPage = m_page; 720 721 if (m_page != newPage) { 721 722 if (page()->focusController()->focusedFrame() == this) … … 749 750 if (didTransfer) { 750 751 // Let external clients update themselves. 751 loader()->client()->didTransferChildFrameToNewDocument( );752 loader()->client()->didTransferChildFrameToNewDocument(oldPage); 752 753 753 754 // Do the same for all the children. -
trunk/WebKit/chromium/ChangeLog
r68504 r68576 1 2010-09-28 Jenn Braithwaite <jennb@chromium.org> 2 3 Reviewed by Dmitry Titov. 4 5 Added oldPage param to FrameLoaderClient::didTransferChildFrameToNewDocument. 6 https://bugs.webkit.org/show_bug.cgi?id=46663 7 8 * src/FrameLoaderClientImpl.cpp: 9 (WebKit::FrameLoaderClientImpl::didTransferChildFrameToNewDocument): 10 * src/FrameLoaderClientImpl.h: 11 1 12 2010-09-28 Andrei Popescu <andreip@google.com> 2 13 -
trunk/WebKit/chromium/src/FrameLoaderClientImpl.cpp
r68061 r68576 1369 1369 } 1370 1370 1371 void FrameLoaderClientImpl::didTransferChildFrameToNewDocument( )1371 void FrameLoaderClientImpl::didTransferChildFrameToNewDocument(Page*) 1372 1372 { 1373 1373 ASSERT(m_webFrame->frame()->ownerElement()); -
trunk/WebKit/chromium/src/FrameLoaderClientImpl.h
r68061 r68576 180 180 const WTF::String& referrer, bool allowsScrolling, 181 181 int marginWidth, int marginHeight); 182 virtual void didTransferChildFrameToNewDocument( );182 virtual void didTransferChildFrameToNewDocument(WebCore::Page*); 183 183 virtual PassRefPtr<WebCore::Widget> createPlugin( 184 184 const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, -
trunk/WebKit/efl/ChangeLog
r68363 r68576 1 2010-09-28 Jenn Braithwaite <jennb@chromium.org> 2 3 Reviewed by Dmitry Titov. 4 5 Added oldPage param to FrameLoaderClient::didTransferChildFrameToNewDocument. 6 https://bugs.webkit.org/show_bug.cgi?id=46663 7 8 * WebCoreSupport/FrameLoaderClientEfl.cpp: 9 (WebCore::FrameLoaderClientEfl::didTransferChildFrameToNewDocument): 10 * WebCoreSupport/FrameLoaderClientEfl.h: 11 1 12 2010-09-26 Gyuyoung Kim <gyuyoung.kim@samsung.com> 2 13 -
trunk/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
r67476 r68576 47 47 #include "MIMETypeRegistry.h" 48 48 #include "NotImplemented.h" 49 #include "Page.h" 49 50 #include "PluginDatabase.h" 50 51 #include "ProgressTracker.h" … … 380 381 } 381 382 382 void FrameLoaderClientEfl::didTransferChildFrameToNewDocument( )383 void FrameLoaderClientEfl::didTransferChildFrameToNewDocument(Page*) 383 384 { 384 385 } -
trunk/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
r67403 r68576 138 138 virtual PassRefPtr<Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement, 139 139 const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); 140 virtual void didTransferChildFrameToNewDocument( );140 virtual void didTransferChildFrameToNewDocument(Page*); 141 141 142 142 virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const WTF::Vector<String>&, const WTF::Vector<String>&, const String&, bool); -
trunk/WebKit/gtk/ChangeLog
r68415 r68576 1 2010-09-28 Jenn Braithwaite <jennb@chromium.org> 2 3 Reviewed by Dmitry Titov. 4 5 Added oldPage param to FrameLoaderClient::didTransferChildFrameToNewDocument. 6 https://bugs.webkit.org/show_bug.cgi?id=46663 7 8 * WebCoreSupport/FrameLoaderClientGtk.cpp: 9 (WebKit::FrameLoaderClient::didTransferChildFrameToNewDocument): 10 * WebCoreSupport/FrameLoaderClientGtk.h: 11 1 12 2010-09-27 Mario Sanchez Prada <msanchez@igalia.com> 2 13 -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
r68373 r68576 602 602 } 603 603 604 void FrameLoaderClient::didTransferChildFrameToNewDocument( )604 void FrameLoaderClient::didTransferChildFrameToNewDocument(WebCore::Page*) 605 605 { 606 606 ASSERT(m_frame); -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
r67403 r68576 115 115 virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement, 116 116 const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); 117 virtual void didTransferChildFrameToNewDocument( );117 virtual void didTransferChildFrameToNewDocument(WebCore::Page*); 118 118 virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const WTF::Vector<WTF::String>&, const WTF::Vector<WTF::String>&, const WTF::String&, bool); 119 119 virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget); -
trunk/WebKit/haiku/ChangeLog
r67403 r68576 1 2010-09-28 Jenn Braithwaite <jennb@chromium.org> 2 3 Reviewed by Dmitry Titov. 4 5 Added oldPage param to FrameLoaderClient::didTransferChildFrameToNewDocument. 6 https://bugs.webkit.org/show_bug.cgi?id=46663 7 8 * WebCoreSupport/FrameLoaderClientHaiku.cpp: 9 (WebCore::FrameLoaderClientHaiku::didTransferChildFrameToNewDocument): 10 * WebCoreSupport/FrameLoaderClientHaiku.h: 11 1 12 2010-09-13 Enrica Casucci <enrica@apple.com> 2 13 -
trunk/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
r67403 r68576 742 742 } 743 743 744 void FrameLoaderClientHaiku::didTransferChildFrameToNewDocument( )744 void FrameLoaderClientHaiku::didTransferChildFrameToNewDocument(Page*) 745 745 { 746 746 } … … 855 855 856 856 } // namespace WebCore 857 -
trunk/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h
r67403 r68576 222 222 HTMLFrameOwnerElement*, const String& referrer, 223 223 bool allowsScrolling, int marginWidth, int marginHeight); 224 virtual void didTransferChildFrameToNewDocument( );224 virtual void didTransferChildFrameToNewDocument(WebCore::Page*); 225 225 virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, 226 226 const Vector<String>&, const Vector<String>&, const String&, … … 253 253 254 254 #endif // FrameLoaderClientHaiku_h 255 -
trunk/WebKit/mac/ChangeLog
r68356 r68576 1 2010-09-28 Jenn Braithwaite <jennb@chromium.org> 2 3 Reviewed by Dmitry Titov. 4 5 Added oldPage param to FrameLoaderClient::didTransferChildFrameToNewDocument. 6 https://bugs.webkit.org/show_bug.cgi?id=46663 7 8 * WebCoreSupport/WebFrameLoaderClient.h: 9 * WebCoreSupport/WebFrameLoaderClient.mm: 10 (WebFrameLoaderClient::didTransferChildFrameToNewDocument): 11 1 12 2010-09-26 Antonio Gomes <agomes@rim.com> 2 13 -
trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
r67403 r68576 194 194 virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const WTF::String& name, WebCore::HTMLFrameOwnerElement*, 195 195 const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); 196 virtual void didTransferChildFrameToNewDocument( );196 virtual void didTransferChildFrameToNewDocument(WebCore::Page* oldPage); 197 197 virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const Vector<WTF::String>&, 198 198 const Vector<WTF::String>&, const WTF::String&, bool); -
trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
r67403 r68576 1383 1383 } 1384 1384 1385 void WebFrameLoaderClient::didTransferChildFrameToNewDocument() 1386 { 1385 void WebFrameLoaderClient::didTransferChildFrameToNewDocument(Page* oldPage) 1386 { 1387 if (oldPage == core(m_webFrame.get())->page()) 1388 return; 1389 1390 // Update resource tracking now that frame is in a different page. 1391 // TODO(jennb): update resource tracking [bug 44713] 1387 1392 } 1388 1393 -
trunk/WebKit/qt/ChangeLog
r68525 r68576 1 2010-09-28 Jenn Braithwaite <jennb@chromium.org> 2 3 Reviewed by Dmitry Titov. 4 5 Added oldPage param to FrameLoaderClient::didTransferChildFrameToNewDocument. 6 https://bugs.webkit.org/show_bug.cgi?id=46663 7 8 * WebCoreSupport/FrameLoaderClientQt.cpp: 9 (WebCore::FrameLoaderClientQt::didTransferChildFrameToNewDocument): 10 * WebCoreSupport/FrameLoaderClientQt.h: 11 1 12 2010-09-28 Andreas Kling <andreas.kling@nokia.com> 2 13 -
trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
r68521 r68576 1246 1246 } 1247 1247 1248 void FrameLoaderClientQt::didTransferChildFrameToNewDocument( )1248 void FrameLoaderClientQt::didTransferChildFrameToNewDocument(Page*) 1249 1249 { 1250 1250 ASSERT(m_frame->ownerElement()); -
trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
r67781 r68576 199 199 virtual PassRefPtr<Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement, 200 200 const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); 201 virtual void didTransferChildFrameToNewDocument( );201 virtual void didTransferChildFrameToNewDocument(WebCore::Page*); 202 202 virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool); 203 203 virtual void redirectDataToPlugin(Widget* pluginWidget); -
trunk/WebKit/win/ChangeLog
r68384 r68576 1 2010-09-28 Jenn Braithwaite <jennb@chromium.org> 2 3 Reviewed by Dmitry Titov. 4 5 Added oldPage param to FrameLoaderClient::didTransferChildFrameToNewDocument. 6 https://bugs.webkit.org/show_bug.cgi?id=46663 7 8 * WebCoreSupport/WebFrameLoaderClient.cpp: 9 (WebFrameLoaderClient::didTransferChildFrameToNewDocument): 10 * WebCoreSupport/WebFrameLoaderClient.h: 11 1 12 2010-09-27 Andrey Kosyakov <caseq@chromium.org> 2 13 -
trunk/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
r67253 r68576 729 729 } 730 730 731 void WebFrameLoaderClient::didTransferChildFrameToNewDocument( )731 void WebFrameLoaderClient::didTransferChildFrameToNewDocument(Page*) 732 732 { 733 733 } -
trunk/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
r67253 r68576 113 113 virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement, 114 114 const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); 115 virtual void didTransferChildFrameToNewDocument( );115 virtual void didTransferChildFrameToNewDocument(WebCore::Page*); 116 116 virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&, bool loadManually); 117 117 virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget); -
trunk/WebKit/wince/ChangeLog
r68172 r68576 1 2010-09-28 Jenn Braithwaite <jennb@chromium.org> 2 3 Reviewed by Dmitry Titov. 4 5 Added oldPage param to FrameLoaderClient::didTransferChildFrameToNewDocument. 6 https://bugs.webkit.org/show_bug.cgi?id=46663 7 8 * WebCoreSupport/FrameLoaderClientWinCE.cpp: 9 (WebKit::FrameLoaderClientWinCE::didTransferChildFrameToNewDocument): 10 * WebCoreSupport/FrameLoaderClientWinCE.h: 11 1 12 2010-09-23 Patrick Gansterer <paroga@webkit.org> 2 13 -
trunk/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp
r68132 r68576 33 33 #include "MIMETypeRegistry.h" 34 34 #include "NotImplemented.h" 35 #include "Page.h" 35 36 #include "PluginDatabase.h" 36 37 #include "RenderPart.h" … … 161 162 } 162 163 163 void FrameLoaderClientWinCE::didTransferChildFrameToNewDocument( )164 void FrameLoaderClientWinCE::didTransferChildFrameToNewDocument(Page*) 164 165 { 165 166 } -
trunk/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h
r68132 r68576 109 109 virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement, 110 110 const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); 111 virtual void didTransferChildFrameToNewDocument( );111 virtual void didTransferChildFrameToNewDocument(WebCore::Page*); 112 112 virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const WTF::Vector<WTF::String>&, const WTF::Vector<WTF::String>&, const WTF::String&, bool); 113 113 virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget); -
trunk/WebKit/wx/ChangeLog
r68319 r68576 1 2010-09-28 Jenn Braithwaite <jennb@chromium.org> 2 3 Reviewed by Dmitry Titov. 4 5 Added oldPage param to FrameLoaderClient::didTransferChildFrameToNewDocument. 6 https://bugs.webkit.org/show_bug.cgi?id=46663 7 8 * WebKitSupport/FrameLoaderClientWx.cpp: 9 (WebCore::FrameLoaderClientWx::didTransferChildFrameToNewDocument): 10 * WebKitSupport/FrameLoaderClientWx.h: 11 1 12 2010-09-24 Kwang Yul Seo <skyul@company100.net> 2 13 -
trunk/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
r67515 r68576 861 861 } 862 862 863 void FrameLoaderClientWx::didTransferChildFrameToNewDocument( )863 void FrameLoaderClientWx::didTransferChildFrameToNewDocument(Page*) 864 864 { 865 865 } -
trunk/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
r67515 r68576 204 204 virtual PassRefPtr<Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement, 205 205 const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); 206 virtual void didTransferChildFrameToNewDocument( );206 virtual void didTransferChildFrameToNewDocument(Page*); 207 207 virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) ; 208 208 virtual void redirectDataToPlugin(Widget* pluginWidget); -
trunk/WebKit2/ChangeLog
r68562 r68576 1 2010-09-28 Jenn Braithwaite <jennb@chromium.org> 2 3 Reviewed by Dmitry Titov. 4 5 Added oldPage param to FrameLoaderClient::didTransferChildFrameToNewDocument. 6 https://bugs.webkit.org/show_bug.cgi?id=46663 7 8 * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: 9 (WebKit::WebFrameLoaderClient::didTransferChildFrameToNewDocument): 10 * WebProcess/WebCoreSupport/WebFrameLoaderClient.h: 11 1 12 2010-09-28 Anders Carlsson <andersca@apple.com> 2 13 -
trunk/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
r68220 r68576 963 963 } 964 964 965 void WebFrameLoaderClient::didTransferChildFrameToNewDocument( )965 void WebFrameLoaderClient::didTransferChildFrameToNewDocument(Page*) 966 966 { 967 967 notImplemented(); -
trunk/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
r67775 r68576 176 176 virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const String& name, WebCore::HTMLFrameOwnerElement* ownerElement, 177 177 const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); 178 virtual void didTransferChildFrameToNewDocument( );178 virtual void didTransferChildFrameToNewDocument(WebCore::Page*); 179 179 180 180 virtual PassRefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually);
Note: See TracChangeset
for help on using the changeset viewer.