Skip to content
  • darin's avatar
    WebCore: · cd3d02e3
    darin authored
            Reviewed by Maciej.
    
            - move pointer from frame to page here from WebKit
    
            * WebCore.xcodeproj/project.pbxproj: Added PageMac.h.
    
            * bridge/mac/PageMac.h: Added.
    
            * bridge/mac/MacFrame.h: Added a page parameter to the constructor.
            * bridge/mac/MacFrame.mm:
            (WebCore::MacFrame::MacFrame): Pass the page and renderer to the Frame constructor.
            Moved the call to Cache::init up into Frame, and got rid of the call to Frame::init
            since that's now handled by the constructor. Also put the code to create the
            browser extension object here.
            (WebCore::MacFrame::submitForm): Update for new method name.
            (WebCore::MacFrame::createFrame): Ditto.
            (WebCore::MacFrame::sendContextMenuEvent): Update since m_doc is a RefPtr.
    
            * bridge/mac/WebCoreFrameBridge.h: Changed parameters on init methods. Renamed
            the part method to impl. Added a page method.
            * bridge/mac/WebCoreFrameBridge.mm:
            (frameHasSelection): Change use of part method to impl.
            (-[WebCoreFrameBridge appendChild:]): Use m_frame directly instead of calling part method.
            (-[WebCoreFrameBridge removeChild:]): Ditto.
            (-[WebCoreFrameBridge initMainFrameWithPage:]): Added. Now does the first-time initialization
            only here and create a frame for a main frame.
            (-[WebCoreFrameBridge initSubframeWithRenderer:]): Added. Doesn't do the first-time initialization
            and creates a frame for a subframe.
            (-[WebCoreFrameBridge page]): Added.
            (-[WebCoreFrameBridge setOpener:]): Change to use impl method instead of part.
            (-[WebCoreFrameBridge executionContextForView:]): Ditto.
            (-[WebCoreFrameBridge impl]): Added.
    
            * bridge/mac/WebCorePageBridge.h: Removed init method and added setMainFrame: method and impl method.
            * bridge/mac/WebCorePageBridge.mm:
            (-[WebCorePageBridge init]): Changed to create a PageMac.
            (-[WebCorePageBridge setMainFrame:]): Added.
            (-[WebCorePageBridge impl]): Added.
    
            * bridge/mac/BrowserExtensionMac.mm:
            (WebCore::BrowserExtensionMac::createNewWindow):
            * kwq/KWQAccObject.mm:
            (-[KWQAccObject rendererForView:]):
            * kwq/KWQComboBox.mm:
            (-[KWQPopUpButtonCell trackMouse:inRect:ofView:untilMouseUp:]):
            * kwq/KWQFileButton.mm:
            (KWQFileButton::focusPolicy):
            * kwq/KWQSlider.mm:
            (QSlider::focusPolicy):
            * kwq/KWQTextArea.mm:
            (-[KWQTextAreaTextView _isResizableByUser]):
            (-[KWQTextAreaTextView _trackResizeFromMouseDown:]):
            Change methods to get from bridge back to objects to be named "impl".
            The old one was named "part".
    
            * page/Frame.h: Added Page and RenderPart parameter to constructor.
            Added a page function. Removed the createBrowserExtension function.
            * page/Frame.cpp:
            (WebCore::parentFromOwnerRenderer): Added. Helper for constructor.
            (WebCore::Frame::Frame): Moved all the code from init into here. Also change
            to set the parent right from the start.
            (WebCore::Frame::stopLoading): Change since m_doc is now a RefPtr.
            (WebCore::Frame::clear): Ditto.
            (WebCore::Frame::document): Ditto.
            (WebCore::Frame::setDocument): Ditto.
            (WebCore::Frame::begin): Ditto.
            (WebCore::Frame::gotoAnchor): Ditto.
            (WebCore::Frame::typingStyle): Change since m_typingStyle is now a RefPtr.
            (WebCore::Frame::setTypingStyle): Ditto.
            (WebCore::Frame::clearTypingStyle): Ditto.
            (WebCore::Frame::isFrameSet): Change since m_doc is now a RefPtr.
            (WebCore::Frame::page): Added.
    
            * page/FramePrivate.h: Changed initialization to use member-initialization
            syntax. Removed unused m_frames. Changed m_doc and m_typingStyle to use
            RefPtr. Added an m_frame.
    
            * page/Page.h: Made destructor virtual so we could have a Mac derived class.
            Added a setMainFrame function and removed the mainFrame parameter from the constructor.
            * page/Page.cpp:
            (WebCore::Page::Page): Removed the mainFrame parameter.
            (WebCore::Page::setMainFrame): Added.
    
    WebKit:
    
            Reviewed by Maciej.
    
            - move pointer from frame to page over to WebCore
    
            * WebCoreSupport/WebPageBridge.m: (-[WebPageBridge initWithMainFrameName:webView:frameView:]):
            Call super init to create the page before creating the main frame and calling setMainFrame: with it.
    
            * WebCoreSupport/WebFrameBridge.h: Remove page pointer, and change init function parameters.
            * WebCoreSupport/WebFrameBridge.m:
            (-[WebFrameBridge initMainFrameWithPage:frameName:view:]): New function that is used only for
            the main frame. Passes the page over to the other side of the bridge.
            (-[WebFrameBridge initSubframeWithRenderer:frameName:view:]): New function that is used only for
            subframes. Passes the renderer over to the other side of the bridge.
            (-[WebFrameBridge mainFrame]):
            (-[WebFrameBridge webView]):
            (-[WebFrameBridge createWindowWithURL:frameName:]):
            (-[WebFrameBridge showWindow]):
            (-[WebFrameBridge areToolbarsVisible]):
            (-[WebFrameBridge setToolbarsVisible:]):
            (-[WebFrameBridge isStatusbarVisible]):
            (-[WebFrameBridge setStatusbarVisible:]):
            (-[WebFrameBridge setWindowFrame:]):
            (-[WebFrameBridge windowFrame]):
            (-[WebFrameBridge setWindowContentRect:]):
            (-[WebFrameBridge windowContentRect]):
            (-[WebFrameBridge setWindowIsResizable:]):
            (-[WebFrameBridge windowIsResizable]):
            (-[WebFrameBridge firstResponder]):
            (-[WebFrameBridge makeFirstResponder:]):
            (-[WebFrameBridge closeWindowSoon]):
            (-[WebFrameBridge runJavaScriptAlertPanelWithMessage:]):
            (-[WebFrameBridge runJavaScriptConfirmPanelWithMessage:]):
            (-[WebFrameBridge canRunBeforeUnloadConfirmPanel]):
            (-[WebFrameBridge runBeforeUnloadConfirmPanelWithMessage:]):
            (-[WebFrameBridge runJavaScriptTextInputPanelWithPrompt:defaultText:returningText:]):
            (-[WebFrameBridge addMessageToConsole:]):
            (-[WebFrameBridge runOpenPanelForFileButtonWithResultListener:]):
            (-[WebFrameBridge setStatusText:]):
            (-[WebFrameBridge syncLoadResourceWithURL:customHeaders:postData:finalURL:responseHeaders:statusCode:]):
            (-[WebFrameBridge focusWindow]):
            (-[WebFrameBridge createChildFrameNamed:withURL:referrer:renderPart:allowsScrolling:marginWidth:marginHeight:]):
            (-[WebFrameBridge userAgentForURL:]):
            (-[WebFrameBridge _nextKeyViewOutsideWebFrameViewsWithValidityCheck:]):
            (-[WebFrameBridge previousKeyViewOutsideWebFrameViews]):
            (-[WebFrameBridge defersLoading]):
            (-[WebFrameBridge setDefersLoading:]):
            (-[WebFrameBridge viewForPluginWithURL:attributeNames:attributeValues:MIMEType:]):
            (-[WebFrameBridge _preferences]):
            (-[WebFrameBridge selectWordBeforeMenuEvent]):
            (-[WebFrameBridge historyLength]):
            (-[WebFrameBridge canGoBackOrForward:]):
            (-[WebFrameBridge goBackOrForward:]):
            (-[WebFrameBridge print]):
            (-[WebFrameBridge pollForAppletInView:]):
            (-[WebFrameBridge respondToChangedContents]):
            (-[WebFrameBridge respondToChangedSelection]):
            (-[WebFrameBridge undoManager]):
            (-[WebFrameBridge issueCutCommand]):
            (-[WebFrameBridge issueCopyCommand]):
            (-[WebFrameBridge issuePasteCommand]):
            (-[WebFrameBridge issuePasteAndMatchStyleCommand]):
            (-[WebFrameBridge canPaste]):
            (-[WebFrameBridge overrideMediaType]):
            (-[WebFrameBridge isEditable]):
            (-[WebFrameBridge shouldChangeSelectedDOMRange:toDOMRange:affinity:stillSelecting:]):
            (-[WebFrameBridge shouldBeginEditing:]):
            (-[WebFrameBridge shouldEndEditing:]):
            (-[WebFrameBridge windowObjectCleared]):
            (-[WebFrameBridge spellCheckerDocumentTag]):
            (-[WebFrameBridge isContinuousSpellCheckingEnabled]):
            (-[WebFrameBridge didFirstLayout]):
            (-[WebFrameBridge dashboardRegionsChanged:]):
            (-[WebFrameBridge createModalDialogWithURL:]):
            (-[WebFrameBridge canRunModal]):
            (-[WebFrameBridge runModal]):
            Change all calls to [_page webView] to use [self webView] instead.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@12791 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    cd3d02e3