Commit 037e2a7c authored by mjs's avatar mjs
Browse files

WebCore:

        Rubber stamped by Eric.

        - rename WebCoreBridge to WebCoreFrameBridge

        * WebCore.exp:
        * WebCore.xcodeproj/project.pbxproj:
        * bridge/mac/KWQKHTMLPartBrowserExtension.mm:
        (KHTMLPartBrowserExtension::createNewWindow):
        * bridge/mac/MacFrame.h:
        (MacFrame::bridge):
        * bridge/mac/MacFrame.mm:
        (MacFrame::submitForm):
        (MacFrame::createPart):
        (MacFrame::bridgeForWidget):
        (MacFrame::documentViewForNode):
        (MacFrame::setBridge):
        * bridge/mac/WebCoreBridge.h: Removed.
        * bridge/mac/WebCoreBridge.mm: Removed.
        * bridge/mac/WebCoreFrameBridge.h: Added.
        * bridge/mac/WebCoreFrameBridge.mm: Added.
        (-[WebCoreFrameBridge executionContextForView:]):
        (frameHasSelection):
        (-[WebCoreFrameBridge firstChild]):
        (-[WebCoreFrameBridge lastChild]):
        (-[WebCoreFrameBridge previousSibling]):
        (-[WebCoreFrameBridge nextSibling]):
        (-[WebCoreFrameBridge isDescendantOfFrame:]):
        (-[WebCoreFrameBridge traverseNextFrameStayWithin:]):
        (-[WebCoreFrameBridge appendChild:]):
        (-[WebCoreFrameBridge removeChild:]):
        (-[WebCoreFrameBridge childFrameNamed:]):
        (-[WebCoreFrameBridge _deepLastChildFrame]):
        (-[WebCoreFrameBridge nextFrameWithWrap:]):
        (-[WebCoreFrameBridge previousFrameWithWrap:]):
        (-[WebCoreFrameBridge _shouldAllowAccessFrom:]):
        (-[WebCoreFrameBridge _descendantFrameNamed:sourceFrame:]):
        (-[WebCoreFrameBridge _frameInAnyWindowNamed:sourceFrame:]):
        (-[WebCoreFrameBridge findFrameNamed:]):
        (+[WebCoreFrameBridge bridgeForDOMDocument:]):
        (-[WebCoreFrameBridge setParent:]):
        (-[WebCoreFrameBridge parent]):
        (nowPrinting):
        (-[WebCoreFrameBridge opener]):
        (-[WebCoreFrameBridge setOpener:]):
        (+[WebCoreFrameBridge stringWithData:textEncodingName:]):
        * kwq/KWQAccObject.mm:
        (-[KWQAccObject rendererForView:]):
        * kwq/KWQComboBox.mm:
        (-[KWQPopUpButtonCell trackMouse:inRect:ofView:untilMouseUp:]):
        * kwq/KWQFileButton.mm:
        (KWQFileButton::focusPolicy):
        * kwq/KWQFrame.mm:
        * kwq/KWQKJavaAppletWidget.mm:
        * kwq/KWQLineEdit.mm:
        * kwq/KWQListBox.mm:
        (-[KWQTableView keyDown:]):
        (-[KWQTableView keyUp:]):
        * kwq/KWQLoader.mm:
        (KWQServeRequest):
        (KWQServeSynchronousRequest):
        (KWQCheckCacheObjectStatus):
        (KWQCacheObjectExpiresTime):
        * kwq/KWQSlider.mm:
        (QSlider::focusPolicy):
        * kwq/KWQTextArea.mm:
        (-[KWQTextAreaTextView textDidChange:]):
        (-[KWQTextAreaTextView _trackResizeFromMouseDown:]):
        (-[KWQTextAreaTextView keyDown:]):
        (-[KWQTextAreaTextView keyUp:]):
        * kwq/KWQTextField.mm:
        (-[KWQTextFieldController controlTextDidBeginEditing:]):
        (-[KWQTextFieldController controlTextDidEndEditing:]):
        (-[KWQTextFieldController controlTextDidChange:]):
        (-[KWQTextFieldController control:textView:doCommandBySelector:]):
        (-[KWQTextFieldController textView:shouldHandleEvent:]):
        * kwq/KWQWidget.mm:
        (QWidget::setFocus):
        * kwq/KWQWindowWidget.h:
        * kwq/KWQWindowWidget.mm:
        (KWQWindowWidget::KWQWindowWidget):
        * kwq/WebCoreFrameNamespaces.h:
        * kwq/WebCoreFrameNamespaces.m:
        (+[WebCoreFrameNamespaces addFrame:toNamespace:]):
        * kwq/WebCoreFrameView.h:
        * kwq/WebCoreSettings.mm:
        * kwq/WebCoreTextRendererFactory.mm:
        * kwq/WebCoreViewFactory.h:

WebKit:

        Rubber stamped by Eric.

        - rename WebBridge to WebFrameBridge
        
        - also removed all tabs from WebFrameBridge.m

        * DOM.subproj/WebDOMOperations.m:
        (-[DOMNode _bridge]):
        (-[DOMNode webArchive]):
        (-[DOMRange _bridge]):
        (-[DOMRange webArchive]):
        * DOM.subproj/WebDOMOperationsPrivate.h:
        * English.lproj/StringsNotToBeLocalized.txt:
        * Misc.subproj/WebCoreStatistics.m:
        * Misc.subproj/WebNSViewExtras.h:
        * Misc.subproj/WebNSViewExtras.m:
        (-[NSView _bridge]):
        * Plugins.subproj/WebBaseNetscapePluginView.m:
        * Plugins.subproj/WebNetscapePluginEmbeddedView.m:
        * Plugins.subproj/WebNetscapePluginStream.m:
        (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:sendNotification:]):
        * Plugins.subproj/WebPluginContainerCheck.m:
        (-[WebPluginContainerCheck _isForbiddenFileLoad]):
        * Plugins.subproj/WebPluginController.h:
        * Plugins.subproj/WebPluginController.m:
        (-[WebPluginController bridge]):
        * WebCoreSupport.subproj/WebBridge.h: Removed.
        * WebCoreSupport.subproj/WebBridge.m: Removed.
        * WebCoreSupport.subproj/WebFileButton.h:
        * WebCoreSupport.subproj/WebFileButton.m:
        (-[WebFileChooserButton initWithBridge:delegate:]):
        * WebCoreSupport.subproj/WebFrameBridge.h: Added.
        * WebCoreSupport.subproj/WebFrameBridge.m: Added.
        (-[WebFrameBridge mainFrame]):
        (-[WebFrameBridge createWindowWithURL:frameName:]):
        (-[WebFrameBridge canTargetLoadInFrame:]):
        (-[WebFrameBridge createChildFrameNamed:withURL:referrer:renderPart:allowsScrolling:marginWidth:marginHeight:]):
        (formDelegate):
        (-[WebFrameBridge createModalDialogWithURL:]):
        * WebCoreSupport.subproj/WebSubresourceLoader.m:
        * WebCoreSupport.subproj/WebTextRendererFactory.m:
        * WebCoreSupport.subproj/WebViewFactory.m:
        (-[WebViewFactory bridgeForView:]):
        * WebKit.xcodeproj/project.pbxproj:
        * WebView.subproj/WebDataSource.m:
        (-[WebDataSource _bridge]):
        (-[WebDataSource _receivedMainResourceError:complete:]):
        (-[WebDataSource _stringWithData:]):
        * WebView.subproj/WebDataSourcePrivate.h:
        * WebView.subproj/WebDebugDOMNode.m:
        * WebView.subproj/WebDefaultContextMenuDelegate.m:
        * WebView.subproj/WebFrame.m:
        (-[WebFrame _traverseNextFrameStayWithin::]):
        (Frame):
        (-[WebFrame _detachFromParent]):
        (-[WebFrame _bridge]):
        (-[WebFrame _initWithWebFrameView:webView:bridge:]):
        * WebView.subproj/WebFrameInternal.h:
        * WebView.subproj/WebFramePrivate.h:
        * WebView.subproj/WebFrameView.m:
        (-[WebFrameView webCoreBridge]):
        (-[WebFrameView _bridge]):
        * WebView.subproj/WebHTMLRepresentation.m:
        (+[WebHTMLRepresentation supportedMIMETypes]):
        (-[WebHTMLRepresentation _bridge]):
        (-[WebHTMLRepresentation documentSource]):
        * WebView.subproj/WebHTMLRepresentationPrivate.h:
        * WebView.subproj/WebHTMLView.m:
        (-[WebHTMLView _pasteWithPasteboard:allowPlainText:]):
        (-[WebHTMLView _deleteRange:killRing:prepend:smartDeleteOK:deletionAction:]):
        (-[WebHTMLView updateFocusState]):
        (-[NSArray validateUserInterfaceItem:]):
        (-[NSArray attributedString]):
        (-[NSArray selectedAttributedString]):
        (-[NSArray concludeDragForDraggingInfo:actionMask:]):
        (-[NSArray keyDown:]):
        (-[NSArray _alterCurrentSelection:direction:granularity:]):
        (-[NSArray _alterCurrentSelection:verticalDistance:]):
        (-[NSArray _expandSelectionToGranularity:]):
        (-[NSArray cut:]):
        (-[NSArray _applyStyleToSelection:withUndoAction:]):
        (-[NSArray _applyParagraphStyleToSelection:withUndoAction:]):
        (-[NSArray pasteAsPlainText:]):
        (-[NSArray insertNewline:]):
        (-[NSArray insertLineBreak:]):
        (-[NSArray insertParagraphSeparator:]):
        (-[NSArray _changeWordCaseWithSelector:]):
        (-[NSArray startSpeaking:]):
        (-[NSArray selectToMark:]):
        (-[NSArray swapWithMark:]):
        (-[NSArray transpose:]):
        (-[WebHTMLView characterIndexForPoint:]):
        (-[WebHTMLView firstRectForCharacterRange:]):
        (-[WebHTMLView selectedRange]):
        (-[WebHTMLView attributedSubstringFromRange:]):
        (-[WebHTMLView _selectMarkedText]):
        (-[WebHTMLView _selectRangeInMarkedText:]):
        (-[WebHTMLView setMarkedText:selectedRange:]):
        (-[WebHTMLView _selectionIsInsideMarkedText]):
        (-[WebTextCompleteController _insertMatch:]):
        (-[WebTextCompleteController doCompletion]):
        (-[WebTextCompleteController endRevertingChange:moveLeft:]):
        * WebView.subproj/WebHTMLViewPrivate.h:
        * WebView.subproj/WebImageView.m:
        * WebView.subproj/WebMainResourceLoader.m:
        * WebView.subproj/WebRenderNode.m:
        * WebView.subproj/WebResource.m:
        (-[WebResource _stringValue]):
        * WebView.subproj/WebScriptDebugDelegate.m:
        * WebView.subproj/WebTextView.m:
        * WebView.subproj/WebView.m:
        (-[WebView _createFrameNamed:inParent:allowsScrolling:]):
        (-[WebView _commonInitializationWithFrameName:groupName:]):
        (-[WebView writeSelectionWithPasteboardTypes:toPasteboard:]):
        (-[WebView moveDragCaretToPoint:]):
        (-[WebView shouldClose]):
        (-[WebView editableDOMRangeForPoint:]):
        (-[WebView setEditable:]):
        (-[WebView deleteSelection]):
        (-[WebView _bridgeForSelectedOrMainFrame]):
        (-[WebView _bridgeAtPoint:]):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@12072 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d7d82ce1
2006-01-12 Maciej Stachowiak <mjs@apple.com>
Rubber stamped by Eric.
- rename WebCoreBridge to WebCoreFrameBridge
* WebCore.exp:
* WebCore.xcodeproj/project.pbxproj:
* bridge/mac/KWQKHTMLPartBrowserExtension.mm:
(KHTMLPartBrowserExtension::createNewWindow):
* bridge/mac/MacFrame.h:
(MacFrame::bridge):
* bridge/mac/MacFrame.mm:
(MacFrame::submitForm):
(MacFrame::createPart):
(MacFrame::bridgeForWidget):
(MacFrame::documentViewForNode):
(MacFrame::setBridge):
* bridge/mac/WebCoreBridge.h: Removed.
* bridge/mac/WebCoreBridge.mm: Removed.
* bridge/mac/WebCoreFrameBridge.h: Added.
* bridge/mac/WebCoreFrameBridge.mm: Added.
(-[WebCoreFrameBridge executionContextForView:]):
(frameHasSelection):
(-[WebCoreFrameBridge firstChild]):
(-[WebCoreFrameBridge lastChild]):
(-[WebCoreFrameBridge previousSibling]):
(-[WebCoreFrameBridge nextSibling]):
(-[WebCoreFrameBridge isDescendantOfFrame:]):
(-[WebCoreFrameBridge traverseNextFrameStayWithin:]):
(-[WebCoreFrameBridge appendChild:]):
(-[WebCoreFrameBridge removeChild:]):
(-[WebCoreFrameBridge childFrameNamed:]):
(-[WebCoreFrameBridge _deepLastChildFrame]):
(-[WebCoreFrameBridge nextFrameWithWrap:]):
(-[WebCoreFrameBridge previousFrameWithWrap:]):
(-[WebCoreFrameBridge _shouldAllowAccessFrom:]):
(-[WebCoreFrameBridge _descendantFrameNamed:sourceFrame:]):
(-[WebCoreFrameBridge _frameInAnyWindowNamed:sourceFrame:]):
(-[WebCoreFrameBridge findFrameNamed:]):
(+[WebCoreFrameBridge bridgeForDOMDocument:]):
(-[WebCoreFrameBridge setParent:]):
(-[WebCoreFrameBridge parent]):
(nowPrinting):
(-[WebCoreFrameBridge opener]):
(-[WebCoreFrameBridge setOpener:]):
(+[WebCoreFrameBridge stringWithData:textEncodingName:]):
* kwq/KWQAccObject.mm:
(-[KWQAccObject rendererForView:]):
* kwq/KWQComboBox.mm:
(-[KWQPopUpButtonCell trackMouse:inRect:ofView:untilMouseUp:]):
* kwq/KWQFileButton.mm:
(KWQFileButton::focusPolicy):
* kwq/KWQFrame.mm:
* kwq/KWQKJavaAppletWidget.mm:
* kwq/KWQLineEdit.mm:
* kwq/KWQListBox.mm:
(-[KWQTableView keyDown:]):
(-[KWQTableView keyUp:]):
* kwq/KWQLoader.mm:
(KWQServeRequest):
(KWQServeSynchronousRequest):
(KWQCheckCacheObjectStatus):
(KWQCacheObjectExpiresTime):
* kwq/KWQSlider.mm:
(QSlider::focusPolicy):
* kwq/KWQTextArea.mm:
(-[KWQTextAreaTextView textDidChange:]):
(-[KWQTextAreaTextView _trackResizeFromMouseDown:]):
(-[KWQTextAreaTextView keyDown:]):
(-[KWQTextAreaTextView keyUp:]):
* kwq/KWQTextField.mm:
(-[KWQTextFieldController controlTextDidBeginEditing:]):
(-[KWQTextFieldController controlTextDidEndEditing:]):
(-[KWQTextFieldController controlTextDidChange:]):
(-[KWQTextFieldController control:textView:doCommandBySelector:]):
(-[KWQTextFieldController textView:shouldHandleEvent:]):
* kwq/KWQWidget.mm:
(QWidget::setFocus):
* kwq/KWQWindowWidget.h:
* kwq/KWQWindowWidget.mm:
(KWQWindowWidget::KWQWindowWidget):
* kwq/WebCoreFrameNamespaces.h:
* kwq/WebCoreFrameNamespaces.m:
(+[WebCoreFrameNamespaces addFrame:toNamespace:]):
* kwq/WebCoreFrameView.h:
* kwq/WebCoreSettings.mm:
* kwq/WebCoreTextRendererFactory.mm:
* kwq/WebCoreViewFactory.h:
2006-01-13 Darin Adler <darin@apple.com>
- Replaced tabs with spaces in source files that had less than 10 lines with tabs.
......@@ -130,6 +220,96 @@
* khtml/ecma/kjs_window.cpp:
(KJS::intFeature):
2006-01-12 Maciej Stachowiak <mjs@apple.com>
Reviewed by NOBODY (OOPS!).
WARNING: NO TEST CASES ADDED OR CHANGED
* WebCore.exp:
* WebCore.xcodeproj/project.pbxproj:
* bridge/mac/KWQKHTMLPartBrowserExtension.mm:
(KHTMLPartBrowserExtension::createNewWindow):
* bridge/mac/MacFrame.h:
(MacFrame::bridge):
* bridge/mac/MacFrame.mm:
(MacFrame::submitForm):
(MacFrame::createPart):
(MacFrame::bridgeForWidget):
(MacFrame::documentViewForNode):
(MacFrame::setBridge):
* bridge/mac/WebCoreBridge.h: Removed.
* bridge/mac/WebCoreBridge.mm: Removed.
* bridge/mac/WebCoreFrameBridge.h: Added.
* bridge/mac/WebCoreFrameBridge.mm: Added.
(-[WebCoreFrameBridge executionContextForView:]):
(frameHasSelection):
(-[WebCoreFrameBridge firstChild]):
(-[WebCoreFrameBridge lastChild]):
(-[WebCoreFrameBridge previousSibling]):
(-[WebCoreFrameBridge nextSibling]):
(-[WebCoreFrameBridge isDescendantOfFrame:]):
(-[WebCoreFrameBridge traverseNextFrameStayWithin:]):
(-[WebCoreFrameBridge appendChild:]):
(-[WebCoreFrameBridge removeChild:]):
(-[WebCoreFrameBridge childFrameNamed:]):
(-[WebCoreFrameBridge _deepLastChildFrame]):
(-[WebCoreFrameBridge nextFrameWithWrap:]):
(-[WebCoreFrameBridge previousFrameWithWrap:]):
(-[WebCoreFrameBridge _shouldAllowAccessFrom:]):
(-[WebCoreFrameBridge _descendantFrameNamed:sourceFrame:]):
(-[WebCoreFrameBridge _frameInAnyWindowNamed:sourceFrame:]):
(-[WebCoreFrameBridge findFrameNamed:]):
(+[WebCoreFrameBridge bridgeForDOMDocument:]):
(-[WebCoreFrameBridge setParent:]):
(-[WebCoreFrameBridge parent]):
(nowPrinting):
(-[WebCoreFrameBridge opener]):
(-[WebCoreFrameBridge setOpener:]):
(+[WebCoreFrameBridge stringWithData:textEncodingName:]):
* kwq/KWQAccObject.mm:
(-[KWQAccObject rendererForView:]):
* kwq/KWQComboBox.mm:
(-[KWQPopUpButtonCell trackMouse:inRect:ofView:untilMouseUp:]):
* kwq/KWQFileButton.mm:
(KWQFileButton::focusPolicy):
* kwq/KWQFrame.mm:
* kwq/KWQKJavaAppletWidget.mm:
* kwq/KWQLineEdit.mm:
* kwq/KWQListBox.mm:
(-[KWQTableView keyDown:]):
(-[KWQTableView keyUp:]):
* kwq/KWQLoader.mm:
(KWQServeRequest):
(KWQServeSynchronousRequest):
(KWQCheckCacheObjectStatus):
(KWQCacheObjectExpiresTime):
* kwq/KWQSlider.mm:
(QSlider::focusPolicy):
* kwq/KWQTextArea.mm:
(-[KWQTextAreaTextView textDidChange:]):
(-[KWQTextAreaTextView _trackResizeFromMouseDown:]):
(-[KWQTextAreaTextView keyDown:]):
(-[KWQTextAreaTextView keyUp:]):
* kwq/KWQTextField.mm:
(-[KWQTextFieldController controlTextDidBeginEditing:]):
(-[KWQTextFieldController controlTextDidEndEditing:]):
(-[KWQTextFieldController controlTextDidChange:]):
(-[KWQTextFieldController control:textView:doCommandBySelector:]):
(-[KWQTextFieldController textView:shouldHandleEvent:]):
* kwq/KWQWidget.mm:
(QWidget::setFocus):
* kwq/KWQWindowWidget.h:
* kwq/KWQWindowWidget.mm:
(KWQWindowWidget::KWQWindowWidget):
* kwq/WebCoreFrameNamespaces.h:
* kwq/WebCoreFrameNamespaces.m:
(+[WebCoreFrameNamespaces addFrame:toNamespace:]):
* kwq/WebCoreFrameView.h:
* kwq/WebCoreSettings.mm:
* kwq/WebCoreTextRendererFactory.mm:
* kwq/WebCoreViewFactory.h:
2006-01-12 Maciej Stachowiak <mjs@apple.com>
Reviewed by Dave Hyatt.
......
......@@ -102,7 +102,7 @@
.objc_class_name_DOMText
.objc_class_name_DOMTreeWalker
.objc_class_name_DOMUIEvent
.objc_class_name_WebCoreBridge
.objc_class_name_WebCoreFrameBridge
.objc_class_name_WebCoreCache
.objc_class_name_WebCoreCookieAdapter
.objc_class_name_WebCoreEncodings
......
......@@ -68,6 +68,8 @@
65436082083DB9FC00C20475 /* wrap_contents_in_dummy_span_command.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6543606E083DB9FB00C20475 /* wrap_contents_in_dummy_span_command.cpp */; };
654D87B70831973B0082DCA1 /* edit_command.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 654D87B50831973B0082DCA1 /* edit_command.cpp */; };
654D87B80831973B0082DCA1 /* edit_command.h in Headers */ = {isa = PBXBuildFile; fileRef = 654D87B60831973B0082DCA1 /* edit_command.h */; };
654EC611097778F500DAB52C /* WebCoreFrameBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 654EC60F097778F500DAB52C /* WebCoreFrameBridge.h */; settings = {ATTRIBUTES = (Private, ); }; };
654EC612097778F500DAB52C /* WebCoreFrameBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 654EC610097778F500DAB52C /* WebCoreFrameBridge.mm */; };
6552E7AA096AA11B0006F248 /* WebCoreFrameNamespaces.h in Headers */ = {isa = PBXBuildFile; fileRef = 6552E7A8096AA11B0006F248 /* WebCoreFrameNamespaces.h */; settings = {ATTRIBUTES = (Private, ); }; };
6552E7AB096AA11B0006F248 /* WebCoreFrameNamespaces.m in Sources */ = {isa = PBXBuildFile; fileRef = 6552E7A9096AA11B0006F248 /* WebCoreFrameNamespaces.m */; };
65743B52097076F8001E7CEF /* RenderSVGText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65743B50097076F8001E7CEF /* RenderSVGText.cpp */; };
......@@ -85,8 +87,6 @@
65BF02420974819000C43196 /* KWQKPartsBrowserExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 65BF02390974819000C43196 /* KWQKPartsBrowserExtension.h */; };
65BF02440974819000C43196 /* MacFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 65BF023B0974819000C43196 /* MacFrame.h */; };
65BF02450974819000C43196 /* MacFrame.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65BF023C0974819000C43196 /* MacFrame.mm */; };
65BF02460974819000C43196 /* WebCoreBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 65BF023D0974819000C43196 /* WebCoreBridge.h */; settings = {ATTRIBUTES = (Private, ); }; };
65BF02470974819000C43196 /* WebCoreBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65BF023E0974819000C43196 /* WebCoreBridge.mm */; };
65C97AF308EA908800ACD273 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 65C97AF208EA908800ACD273 /* config.h */; };
65CBFEF90974F607001DAC25 /* FrameView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65CBFEF70974F607001DAC25 /* FrameView.cpp */; };
65CBFEFA0974F607001DAC25 /* FrameView.h in Headers */ = {isa = PBXBuildFile; fileRef = 65CBFEF80974F607001DAC25 /* FrameView.h */; };
......@@ -1771,6 +1771,8 @@
654D87B60831973B0082DCA1 /* edit_command.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = edit_command.h; path = editing/edit_command.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
654E7EE00569FD4600358BD2 /* xmlhttprequest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xmlhttprequest.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
654E7EE10569FD4600358BD2 /* xmlhttprequest.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = xmlhttprequest.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
654EC60F097778F500DAB52C /* WebCoreFrameBridge.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreFrameBridge.h; sourceTree = "<group>"; };
654EC610097778F500DAB52C /* WebCoreFrameBridge.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreFrameBridge.mm; sourceTree = "<group>"; };
6552E7A8096AA11B0006F248 /* WebCoreFrameNamespaces.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreFrameNamespaces.h; sourceTree = "<group>"; };
6552E7A9096AA11B0006F248 /* WebCoreFrameNamespaces.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebCoreFrameNamespaces.m; sourceTree = "<group>"; };
65743B50097076F8001E7CEF /* RenderSVGText.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGText.cpp; sourceTree = "<group>"; };
......@@ -1791,8 +1793,6 @@
65BF02390974819000C43196 /* KWQKPartsBrowserExtension.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsBrowserExtension.h; sourceTree = "<group>"; };
65BF023B0974819000C43196 /* MacFrame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MacFrame.h; sourceTree = "<group>"; };
65BF023C0974819000C43196 /* MacFrame.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = MacFrame.mm; sourceTree = "<group>"; };
65BF023D0974819000C43196 /* WebCoreBridge.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreBridge.h; sourceTree = "<group>"; };
65BF023E0974819000C43196 /* WebCoreBridge.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreBridge.mm; sourceTree = "<group>"; };
65C97AF208EA908800ACD273 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
65CBFEF70974F607001DAC25 /* FrameView.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FrameView.cpp; sourceTree = "<group>"; };
65CBFEF80974F607001DAC25 /* FrameView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FrameView.h; sourceTree = "<group>"; };
......@@ -2959,14 +2959,14 @@
65BF02350974819000C43196 /* mac */ = {
isa = PBXGroup;
children = (
654EC60F097778F500DAB52C /* WebCoreFrameBridge.h */,
654EC610097778F500DAB52C /* WebCoreFrameBridge.mm */,
65BF02360974819000C43196 /* KWQKHTMLPartBrowserExtension.h */,
65BF02370974819000C43196 /* KWQKHTMLPartBrowserExtension.mm */,
65BF02380974819000C43196 /* KWQKHTMLView.cpp */,
65BF02390974819000C43196 /* KWQKPartsBrowserExtension.h */,
65BF023B0974819000C43196 /* MacFrame.h */,
65BF023C0974819000C43196 /* MacFrame.mm */,
65BF023D0974819000C43196 /* WebCoreBridge.h */,
65BF023E0974819000C43196 /* WebCoreBridge.mm */,
);
path = mac;
sourceTree = "<group>";
......@@ -4895,7 +4895,6 @@
65BF023F0974819000C43196 /* KWQKHTMLPartBrowserExtension.h in Headers */,
65BF02420974819000C43196 /* KWQKPartsBrowserExtension.h in Headers */,
65BF02440974819000C43196 /* MacFrame.h in Headers */,
65BF02460974819000C43196 /* WebCoreBridge.h in Headers */,
FAE0418B09759694000540BE /* RenderSVGImage.h in Headers */,
FAE04190097596C9000540BE /* SVGImageLoader.h in Headers */,
65CBFEFA0974F607001DAC25 /* FrameView.h in Headers */,
......@@ -4904,6 +4903,7 @@
A8185F3B09765766005826D9 /* DOMImplementationImpl.h in Headers */,
A8185F3D09765766005826D9 /* DocumentFragmentImpl.h in Headers */,
A8185F4009765766005826D9 /* DocumentImpl.h in Headers */,
654EC611097778F500DAB52C /* WebCoreFrameBridge.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -6764,7 +6764,6 @@
65BF02400974819000C43196 /* KWQKHTMLPartBrowserExtension.mm in Sources */,
65BF02410974819000C43196 /* KWQKHTMLView.cpp in Sources */,
65BF02450974819000C43196 /* MacFrame.mm in Sources */,
65BF02470974819000C43196 /* WebCoreBridge.mm in Sources */,
FAE0418C09759694000540BE /* RenderSVGImage.cpp in Sources */,
FAE0418F097596C9000540BE /* SVGImageLoader.cpp in Sources */,
65CBFEF90974F607001DAC25 /* FrameView.cpp in Sources */,
......@@ -6772,6 +6771,7 @@
A8185F3C09765766005826D9 /* DocumentImpl.cpp in Sources */,
A8185F3E09765766005826D9 /* DOMImplementationImpl.cpp in Sources */,
A8185F3F09765766005826D9 /* DocumentFragmentImpl.cpp in Sources */,
654EC612097778F500DAB52C /* WebCoreFrameBridge.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
......@@ -28,7 +28,7 @@
#import <kxmlcore/Assertions.h>
#import "KWQExceptions.h"
#import "WebCoreBridge.h"
#import "WebCoreFrameBridge.h"
#import "MacFrame.h"
KHTMLPartBrowserExtension::KHTMLPartBrowserExtension(Frame *frame)
......@@ -80,7 +80,7 @@ void KHTMLPartBrowserExtension::createNewWindow(const KURL &url,
NSString *frameName = urlArgs.frameName.length() == 0 ? nil : urlArgs.frameName.getNSString();
if (frameName) {
// FIXME: Can't you just use m_frame->findFrame?
if (WebCoreBridge *bridge = [m_frame->bridge() findFrameNamed:frameName]) {
if (WebCoreFrameBridge *bridge = [m_frame->bridge() findFrameNamed:frameName]) {
if (!url.isEmpty()) {
QString argsReferrer = urlArgs.metaData()["referrer"];
NSString *referrer;
......@@ -108,7 +108,7 @@ void KHTMLPartBrowserExtension::createNewWindow(const KURL &url,
}
}
WebCoreBridge *bridge;
WebCoreFrameBridge *bridge;
if (winArgs.dialog)
bridge = [m_frame->bridge() createModalDialogWithURL:url.getNSURL()];
else
......
......@@ -88,7 +88,7 @@ typedef DOMElement ObjCDOMElement;
@class NSResponder;
@class NSString;
@class NSView;
@class WebCoreBridge;
@class WebCoreFrameBridge;
@class WebScriptObject;
#else
......@@ -109,7 +109,7 @@ class NSMutableDictionary;
class NSResponder;
class NSString;
class NSView;
class WebCoreBridge;
class WebCoreFrameBridge;
class WebScriptObject;
typedef int NSWritingDirection;
......@@ -129,8 +129,8 @@ public:
void clear();
void setBridge(WebCoreBridge *p);
WebCoreBridge *bridge() const { return _bridge; }
void setBridge(WebCoreFrameBridge *p);
WebCoreFrameBridge *bridge() const { return _bridge; }
void setView(KHTMLView *view);
virtual bool openURL(const KURL &);
......@@ -185,7 +185,7 @@ public:
void createEmptyDocument();
static WebCoreBridge *bridgeForWidget(const QWidget *);
static WebCoreFrameBridge *bridgeForWidget(const QWidget *);
QString requestedURLString() const;
QString incomingReferrer() const;
......@@ -333,7 +333,7 @@ private:
void registerCommandForUndoOrRedo(const khtml::EditCommandPtr &cmd, bool isRedo);
WebCoreBridge *_bridge;
WebCoreFrameBridge *_bridge;
KWQSignal _started;
KWQSignal _completed;
......
......@@ -42,7 +42,7 @@
#import "KWQWindowWidget.h"
#import "KWQTextCodec.h"
#import "WebCoreBridge.h"
#import "WebCoreFrameBridge.h"
#import "WebCoreGraphicsBridge.h"
#import "WebCoreImageRenderer.h"
#import "WebCoreViewFactory.h"
......@@ -524,7 +524,7 @@ void MacFrame::submitForm(const KURL &url, const URLArgs &args)
// FIXME: Frame targeting is only one of the ways the submission could end up doing something other
// than replacing this frame's content, so this check is flawed. On the other hand, the check is hardly
// needed any more now that we reset _submittedFormURL on each mouse or key down event.
WebCoreBridge *target = args.frameName.isEmpty() ? _bridge : [_bridge findFrameNamed:args.frameName.getNSString()];
WebCoreFrameBridge *target = args.frameName.isEmpty() ? _bridge : [_bridge findFrameNamed:args.frameName.getNSString()];
Frame *targetPart = [target part];
bool willReplaceThisFrame = false;
for (Frame *p = this; p; p = p->parentFrame()) {
......@@ -653,7 +653,7 @@ ObjectContents *MacFrame::createPart(const ChildFrame &child, const KURL &url, c
marginWidth = o->getMarginWidth();
marginHeight = o->getMarginHeight();
}
WebCoreBridge *childBridge = [_bridge createChildFrameNamed:child.m_name.getNSString()
WebCoreFrameBridge *childBridge = [_bridge createChildFrameNamed:child.m_name.getNSString()
withURL:url.getNSURL()
referrer:child.m_args.metaData()["referrer"].getNSString()
renderPart:child.m_renderer
......@@ -1268,7 +1268,7 @@ void MacFrame::openURLFromPageCache(KWQPageState *state)
checkCompleted();
}
WebCoreBridge *MacFrame::bridgeForWidget(const QWidget *widget)
WebCoreFrameBridge *MacFrame::bridgeForWidget(const QWidget *widget)
{
ASSERT_ARG(widget, widget);
......@@ -1279,7 +1279,7 @@ WebCoreBridge *MacFrame::bridgeForWidget(const QWidget *widget)
NSView *MacFrame::documentViewForNode(NodeImpl *node)
{
WebCoreBridge *bridge = Mac(frameForNode(node))->bridge();
WebCoreFrameBridge *bridge = Mac(frameForNode(node))->bridge();
return [bridge documentView];
}
......@@ -2995,7 +2995,7 @@ void MacFrame::tokenizerProcessedData()
[_bridge tokenizerProcessedData];
}
void MacFrame::setBridge(WebCoreBridge *p)
void MacFrame::setBridge(WebCoreFrameBridge *p)
{
if (_bridge != p)
delete _windowWidget;
......
......@@ -175,32 +175,32 @@ typedef enum
ObjectElementPlugin,
} ObjectElementType;
// WebCoreBridge objects are used by WebCore to abstract away operations that need
// WebCoreFrameBridge objects are used by WebCore to abstract away operations that need
// to be implemented by library clients, for example WebKit. The objects are also
// used in the opposite direction, for simple access to WebCore functions without dealing
// directly with the KHTML C++ classes.
// A WebCoreBridge creates and holds a reference to a Frame.
// A WebCoreFrameBridge creates and holds a reference to a Frame.
// The WebCoreBridge interface contains methods for use by the non-WebCore side of the bridge.
// The WebCoreFrameBridge interface contains methods for use by the non-WebCore side of the bridge.
@interface WebCoreBridge : NSObject
@interface WebCoreFrameBridge : NSObject
{
MacFrame *m_frame;
KHTMLRenderPart *_renderPart;
RenderArena *_renderPartArena;
BOOL _shouldCreateRenderers;
WebCoreBridge *_nextSibling;
WebCoreBridge *_previousSibling;
WebCoreBridge *_firstChild;
WebCoreBridge *_lastChild;
WebCoreFrameBridge *_nextSibling;
WebCoreFrameBridge *_previousSibling;
WebCoreFrameBridge *_firstChild;
WebCoreFrameBridge *_lastChild;
int _childCount;
NSString *_frameNamespace;
}
+ (WebCoreBridge *)bridgeForDOMDocument:(DOMDocument *)document;
+ (WebCoreFrameBridge *)bridgeForDOMDocument:(DOMDocument *)document;
+ (NSArray *)supportedMIMETypes;
......@@ -216,26 +216,26 @@ typedef enum
- (MacFrame *)part;
- (void)setParent:(WebCoreBridge *)parent;
- (WebCoreBridge *)parent;
- (void)setParent:(WebCoreFrameBridge *)parent;
- (WebCoreFrameBridge *)parent;
- (WebCoreBridge *)firstChild;
- (WebCoreBridge *)lastChild;
- (WebCoreBridge *)previousSibling;
- (WebCoreBridge *)nextSibling;
- (WebCoreFrameBridge *)firstChild;
- (WebCoreFrameBridge *)lastChild;
- (WebCoreFrameBridge *)previousSibling;
- (WebCoreFrameBridge *)nextSibling;
- (void)appendChild:(WebCoreBridge *)child;
- (void)removeChild:(WebCoreBridge *)child;
- (void)appendChild:(WebCoreFrameBridge *)child;
- (void)removeChild:(WebCoreFrameBridge *)child;
- (unsigned)childCount;
- (BOOL)isDescendantOfFrame:(WebCoreBridge *)ancestor;
- (WebCoreBridge *)traverseNextFrameStayWithin:(WebCoreBridge *)stayWithin;
- (BOOL)isDescendantOfFrame:(WebCoreFrameBridge *)ancestor;
- (WebCoreFrameBridge *)traverseNextFrameStayWithin:(WebCoreFrameBridge *)stayWithin;
- (WebCoreBridge *)nextFrameWithWrap:(BOOL)wrap;
- (WebCoreBridge *)previousFrameWithWrap:(BOOL)wrap;
- (WebCoreFrameBridge *)nextFrameWithWrap:(BOOL)wrap;
- (WebCoreFrameBridge *)previousFrameWithWrap:(BOOL)wrap;
- (WebCoreBridge *)childFrameNamed:(NSString *)name;
- (WebCoreBridge *)findFrameNamed:(NSString *)name;
- (WebCoreFrameBridge *)childFrameNamed:(NSString *)name;
- (WebCoreFrameBridge *)findFrameNamed:(NSString *)name;
- (void)setFrameNamespace:(NSString *)ns;
- (NSString *)frameNamespace;
......@@ -268,8 +268,8 @@ typedef enum
- (NSURL *)baseURL;
- (NSString *)referrer;
- (NSString *)domain;
- (WebCoreBridge *)opener;
- (void)setOpener:(WebCoreBridge *)bridge;
- (WebCoreFrameBridge *)opener;
- (void)setOpener:(WebCoreFrameBridge *)bridge;
- (void)installInFrame:(NSView *)view;
- (void)removeFromFrame;
......@@ -491,14 +491,14 @@ typedef enum
@end
// The WebCoreBridge protocol contains methods for use by the WebCore side of the bridge.
// The WebCoreFrameBridge protocol contains methods for use by the WebCore side of the bridge.
// In NSArray objects for post data, NSData objects represent literal data, and NSString objects represent encoded files.
// The encoding is the standard form encoding for uploading files.
@protocol WebCoreBridge
@protocol WebCoreFrameBridge
- (WebCoreBridge *)mainFrame;
- (WebCoreFrameBridge *)mainFrame;
- (void)frameDetached;
- (NSView *)documentView;
- (WebView *)webView;
......@@ -506,12 +506,12 @@ typedef enum
- (void)loadURL:(NSURL *)URL referrer:(NSString *)referrer reload:(BOOL)reload userGesture:(BOOL)forUser target:(NSString *)target triggeringEvent:(NSEvent *)event form:(DOMElement *)form formValues:(NSDictionary *)values;
- (void)postWithURL:(NSURL *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSArray *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(DOMElement *)form formValues:(NSDictionary *)values;
- (WebCoreBridge *)createWindowWithURL:(NSURL *)URL frameName:(NSString *)name;
- (WebCoreFrameBridge *)createWindowWithURL:(NSURL *)URL frameName:(NSString *)name;
- (void)showWindow;
- (BOOL)canRunModal;
- (BOOL)canRunModalNow;
- (WebCoreBridge *)createModalDialogWithURL:(NSURL *)URL;
- (WebCoreFrameBridge *)createModalDialogWithURL:(NSURL *)URL;
- (void)runModal;
- (NSString *)userAgentForURL:(NSURL *)URL;
......@@ -522,7 +522,7 @@ typedef enum
- (void)setIconURL:(NSURL *)URL;
- (void)setIconURL:(NSURL *)URL withType:(NSString *)string;
- (WebCoreBridge *)createChildFrameNamed:(NSString *)frameName withURL:(NSURL *)URL
- (WebCoreFrameBridge *)createChildFrameNamed:(NSString *)frameName withURL:(NSURL *)URL
referrer:(NSString *)referrer
renderPart:(KHTMLRenderPart *)renderPart
allowsScrolling:(BOOL)allowsScrolling marginWidth:(int)width marginHeight:(int)height;
......@@ -677,11 +677,11 @@ typedef enum
@end
// This interface definition allows those who hold a WebCoreBridge * to call all the methods
// in the WebCoreBridge protocol without requiring the base implementation to supply the methods.
// This idiom is appropriate because WebCoreBridge is an abstract class.
// This interface definition allows those who hold a WebCoreFrameBridge * to call all the methods
// in the WebCoreFrameBridge protocol without requiring the base implementation to supply the methods.
// This idiom is appropriate because WebCoreFrameBridge is an abstract class.
@interface WebCoreBridge (SubclassResponsibility) <WebCoreBridge>
@interface WebCoreFrameBridge (SubclassResponsibility) <WebCoreFrameBridge>
@end
@protocol WebCoreDOMTreeCopier <NSObject>
......
......@@ -24,7 +24,7 @@
*/
#include "config.h"
#import "WebCoreBridge.h"
#import "WebCoreFrameBridge.h"
#import "csshelper.h"
#import "dom2_eventsimpl.h"
......@@ -163,14 +163,14 @@ NSString *WebCoreElementTitleKey = @"WebCoreElementTitle"; // not i
NSString *WebCorePageCacheStateKey = @"WebCorePageCacheState";
@interface WebCoreBridge (WebCoreBridgeInternal)
@interface WebCoreFrameBridge (WebCoreBridgeInternal)
- (RootObject *)executionContextForView:(NSView *)aView;
@end
static RootObject *rootForView(void *v)
{
NSView *aView = (NSView *)v;
WebCoreBridge *aBridge = [[WebCoreViewFactory sharedFactory] bridgeForView:aView];
WebCoreFrameBridge *aBridge = [[WebCoreViewFactory sharedFactory] bridgeForView:aView];
RootObject *root = 0;
if (aBridge)
......@@ -198,7 +198,7 @@ static void updateRenderingForBindings (ExecState *exec, JSObject *rootObject)
doc->updateRendering();
}
static BOOL frameHasSelection(WebCoreBridge *bridge)
static BOOL frameHasSelection(WebCoreFrameBridge *bridge)
{
if (!bridge)
return NO;
......@@ -227,17 +227,17 @@ static BOOL isCaseSensitiveEqual(NSString *a, NSString *b)
return [a caseInsensitiveCompare:b] == NSOrderedSame;
}
@implementation WebCoreBridge
@implementation WebCoreFrameBridge
static bool initializedObjectCacheSize = FALSE;
static bool initializedKJS = FALSE;
- (WebCoreBridge *)firstChild
- (WebCoreFrameBridge *)firstChild
{
return _firstChild;
}
- (WebCoreBridge *)lastChild
- (WebCoreFrameBridge *)lastChild
{
return _lastChild;
}
......@@ -247,28 +247,28 @@ static bool initializedKJS = FALSE;
return _childCount;
}