Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
WebCore:
Reviewed by Sam. - remove all bridge-related things from WebCore except the bridge itself * WebCore.base.exp: Removed the bridge and setBridge functions. * loader/FrameLoader.cpp: (WebCore::FrameLoader::detachFromParent): Removed call to the bridge's close method. * page/Frame.cpp: (WebCore::Frame::~Frame): Removed call to setBridge(0). (WebCore::FramePrivate::FramePrivate): Removed initialization of m_bridge. * page/Frame.h: Removed setBridge and bridge functions. * page/FramePrivate.h: Removed m_bridge pointer. * page/mac/FrameMac.mm: Removed setBridge and bridge functions. * page/mac/WebCoreFrameBridge.h: Added setWebCoreFrame: method. Removed bridgeForDOMDocument: and clearFrame methods. * page/mac/WebCoreFrameBridge.mm: Ditto. (-[WebCoreFrameBridge close]): Changed to set m_frame to 0 directly. (-[WebCoreFrameBridge setWebCoreFrame:]): Added. WebKit/mac: Reviewed by Sam. - remove all bridge-related things from WebCore except the bridge itself * DOM/WebDOMOperations.mm: (-[DOMNode _bridge]): Reimplemented to not use the bridgeForDOMDocument: method. * DefaultDelegates/WebDefaultContextMenuDelegate.mm: Removed unneeded include. * Plugins/WebPluginController.mm: Ditto. * WebCoreSupport/WebFrameBridge.h: Removed unneeded things, including the init and close methods. Added a setWebFrame: method. * WebCoreSupport/WebFrameBridge.mm: (-[WebFrameBridge setWebFrame:]): Added. * WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::frameLoaderDestroyed): Added an assertion. (WebFrameLoaderClient::detachedFromParent4): Moved the call to close on the bridge here. Soon we will be able to remove this entirely! (WebFrameLoaderClient::createFrame): Rewrote this to use the method moved into WebFrame from the bridge. * WebView/WebFrame.mm: (-[WebFramePrivate dealloc]): Added code to release the bridge, because it's now owned by the frame. (-[WebFramePrivate finalize]): Added this missing method. We'd leak the script debugger under GC without this! (kit): Rewrote the function that maps from a WebCore::Frame to a WebFrame to use WebFrameLoaderClient instead of the bridge. (+[WebFrame _createFrameWithPage:frameName:frameView:ownerElement:]): Added. This is code that used to live in the bridge's init function. (+[WebFrame _createMainFrameWithPage:frameName:frameView:]): Ditto. (+[WebFrame WebCore::_createSubframeWithOwnerElement:frameName:frameView:]): Ditto. (-[WebFrame _initWithWebFrameView:webView:bridge:]): Retain the bridge, since the WebView is now the bridge's owner. (-[WebFrame _updateBackground]): Changed this one call site that was calling the WebCore::Frame::bridge function directly to use the kit function instead. (-[WebFrame dealloc]): Added code to clear the WebFrame pointer in the bridge. This code won't last long -- we're eliminating the bridge soon. (-[WebFrame finalize]): Ditto. * WebView/WebFrameInternal.h: Added a coreFrame backpointer and two new methods for creating frames. * WebView/WebView.mm: (-[WebView _commonInitializationWithFrameName:groupName:]): Rewrote this to use the method moved into WebFrame from the bridge. Gets rid of the unpleasant idiom where we have to allocate a WebFrameBridge and then immediately release it. Canonical link: https://commits.webkit.org/24664@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30980 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
Showing
with
172 additions
and 157 deletions.
- +25 −0 WebCore/ChangeLog
- +0 −2 WebCore/WebCore.base.exp
- +0 −3 WebCore/loader/FrameLoader.cpp
- +0 −6 WebCore/page/Frame.cpp
- +0 −7 WebCore/page/Frame.h
- +0 −3 WebCore/page/FramePrivate.h
- +0 −22 WebCore/page/mac/FrameMac.mm
- +1 −4 WebCore/page/mac/WebCoreFrameBridge.h
- +6 −18 WebCore/page/mac/WebCoreFrameBridge.mm
- +53 −0 WebKit/mac/ChangeLog
- +19 −9 WebKit/mac/DOM/WebDOMOperations.mm
- +0 −1 WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm
- +0 −1 WebKit/mac/Plugins/WebPluginController.mm
- +2 −10 WebKit/mac/WebCoreSupport/WebFrameBridge.h
- +4 −47 WebKit/mac/WebCoreSupport/WebFrameBridge.mm
- +10 −10 WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
- +46 −12 WebKit/mac/WebView/WebFrame.mm
- +5 −0 WebKit/mac/WebView/WebFrameInternal.h
- +1 −2 WebKit/mac/WebView/WebView.mm
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -3200,9 +3200,6 @@ void FrameLoader::detachFromParent() | ||
m_frame->setView(0); | ||
m_frame->pageDestroyed(); | ||
} | ||
m_client->detachedFromParent4(); | ||
} | ||
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -49,7 +49,6 @@ | ||
#import <WebCore/Frame.h> | ||
#import <WebCore/FrameLoader.h> | ||
#import <WebCore/KURL.h> | ||
#import <WebKit/DOM.h> | ||
#import <WebKit/DOMPrivate.h> | ||
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.