[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:30:15 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 8c794ad5319253280cc2018919def9b9f93b1baa
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 19 04:29:47 2003 +0000
WebKit:
Stage 2 of WebController to WebView renaming.
Reviewed by hyatt.
* API-Issues.rtf:
* Carbon.subproj/HIWebView.h:
* Carbon.subproj/HIWebView.m:
* Misc.subproj/WebNSPasteboardExtras.m:
(-[NSPasteboard _web_bestURL]):
* Panels.subproj/WebStandardPanels.m:
(-[WebStandardPanels _didStartLoadingURL:inController:]):
(-[WebStandardPanels _didStopLoadingURL:inController:]):
(-[WebStandardPanels frontmostWindowLoadingURL:]):
* Panels.subproj/WebStandardPanelsPrivate.h:
* Plugins.subproj/WebBaseNetscapePluginView.h:
* Plugins.subproj/WebBaseNetscapePluginView.m:
(-[WebBaseNetscapePluginView controller]):
(-[WebBaseNetscapePluginView loadPluginRequest:]):
* Plugins.subproj/WebNetscapePluginDocumentView.m:
(-[WebNetscapePluginDocumentView setDataSource:]):
* Plugins.subproj/WebNetscapePluginRepresentation.m:
(-[WebNetscapePluginRepresentation isPluginViewStarted]):
(-[WebNetscapePluginRepresentation receivedData:withDataSource:]):
* Plugins.subproj/WebNullPluginView.m:
(-[WebNullPluginView viewDidMoveToWindow]):
* Plugins.subproj/WebPluginController.m:
(-[WebPluginController showStatus:]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge mainFrame]):
(-[WebBridge createWindowWithURL:frameName:]):
(-[WebBridge showWindow]):
(-[WebBridge areToolbarsVisible]):
(-[WebBridge setToolbarsVisible:]):
(-[WebBridge areScrollbarsVisible]):
(-[WebBridge setScrollbarsVisible:]):
(-[WebBridge isStatusBarVisible]):
(-[WebBridge setStatusBarVisible:]):
(-[WebBridge setWindowFrame:]):
(-[WebBridge window]):
(-[WebBridge runJavaScriptAlertPanelWithMessage:]):
(-[WebBridge runJavaScriptConfirmPanelWithMessage:]):
(-[WebBridge runJavaScriptTextInputPanelWithPrompt:defaultText:returningText:]):
(-[WebBridge runOpenPanelForFileButtonWithResultListener:]):
(-[WebBridge setStatusText:]):
(-[WebBridge objectLoadedFromCacheWithURL:response:size:]):
(-[WebBridge setWebFrame:]):
(-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]):
(-[WebBridge userAgentForURL:]):
(-[WebBridge nextKeyViewOutsideWebFrameViews]):
(-[WebBridge previousKeyViewOutsideWebFrameViews]):
(-[WebBridge defersLoading]):
(-[WebBridge setDefersLoading:]):
(-[WebBridge setNeedsReapplyStyles]):
(-[WebBridge setNeedsLayout]):
(-[WebBridge pluginViewWithPackage:attributes:baseURL:]):
(-[WebBridge handleMouseDragged:]):
(-[WebBridge mayStartDragWithMouseDragged:]):
(-[WebBridge historyLength]):
(-[WebBridge goBackOrForward:]):
(formDelegate):
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
* WebKit.exp:
* WebView.subproj/WebBaseResourceHandleDelegate.h:
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate resource:willSendRequest:]):
(-[WebBaseResourceHandleDelegate resource:didReceiveResponse:]):
(-[WebBaseResourceHandleDelegate resource:didReceiveData:]):
(-[WebBaseResourceHandleDelegate resourceDidFinishLoading:]):
(-[WebBaseResourceHandleDelegate resource:didFailLoadingWithError:]):
(-[WebBaseResourceHandleDelegate cancelWithError:]):
* WebView.subproj/WebContextMenuDelegate.h:
* WebView.subproj/WebController.h:
* WebView.subproj/WebController.m:
(-[WebView _commonInitialization:frameName:groupName:]):
(-[WebView initWithFrame:]):
(-[WebView supportsTextEncoding]):
(-[WebView userAgentForURL:]):
* WebView.subproj/WebControllerPolicyDelegate.h:
* WebView.subproj/WebControllerPrivate.h:
* WebView.subproj/WebControllerPrivate.m:
(-[WebViewPrivate _clearControllerReferences:]):
(+[WebView canShowFile:]):
(+[WebView suggestedFileExtensionForMIMEType:]):
(-[WebView _createFrameNamed:inParent:allowsScrolling:]):
(-[WebView _findFrameNamed:]):
(-[WebView _openNewWindowWithRequest:]):
(-[WebView _menuForElement:]):
(-[WebView _mouseDidMoveOverElement:modifierFlags:]):
(-[WebView _frameForView:fromFrame:]):
* WebView.subproj/WebControllerSets.h:
* WebView.subproj/WebControllerSets.m:
(+[WebControllerSets addController:toSetNamed:]):
(+[WebControllerSets removeController:fromSetNamed:]):
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _controller]):
(-[WebDataSource _setController:]):
(-[WebDataSource _startLoading:]):
(-[WebDataSource _setTitle:]):
(-[WebDataSource _setRequest:]):
(-[WebDataSource _layoutChildren]):
(+[WebDataSource _repTypes]):
(-[WebDataSource _receivedData:]):
(-[WebDataSource _updateIconDatabaseWithURL:]):
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultContextMenuDelegate webView:contextMenuItemsForElement:defaultMenuItems:]):
(-[WebDefaultContextMenuDelegate openNewWindowWithURL:]):
(-[WebDefaultContextMenuDelegate downloadURL:]):
* WebView.subproj/WebDefaultLocationChangeDelegate.m:
(-[WebDefaultLocationChangeDelegate webView:locationChangeStartedForDataSource:]):
(-[WebDefaultLocationChangeDelegate webView:serverRedirectedForDataSource:]):
(-[WebDefaultLocationChangeDelegate webView:locationChangeCommittedForDataSource:]):
(-[WebDefaultLocationChangeDelegate webView:receivedPageTitle:forDataSource:]):
(-[WebDefaultLocationChangeDelegate webView:receivedPageIcon:forDataSource:]):
(-[WebDefaultLocationChangeDelegate webView:locationChangeDone:forDataSource:]):
(-[WebDefaultLocationChangeDelegate webView:willCloseLocationForDataSource:]):
(-[WebDefaultLocationChangeDelegate webView:locationChangedWithinPageForDataSource:]):
(-[WebDefaultLocationChangeDelegate webView:clientWillRedirectTo:delay:fireDate:forFrame:]):
(-[WebDefaultLocationChangeDelegate webView:clientRedirectCancelledForFrame:]):
* WebView.subproj/WebDefaultPolicyDelegate.m:
(-[WebDefaultPolicyDelegate webView:unableToImplementPolicyWithError:inFrame:]):
(-[WebDefaultPolicyDelegate webView:decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
(-[WebDefaultPolicyDelegate webView:decideNewWindowPolicyForAction:andRequest:newFrameName:decisionListener:]):
* WebView.subproj/WebDefaultResourceLoadDelegate.m:
(-[WebDefaultResourceLoadDelegate webView:identifierForInitialRequest:fromDataSource:]):
(-[WebDefaultResourceLoadDelegate webView:resource:willSendRequest:fromDataSource:]):
(-[WebDefaultResourceLoadDelegate webView:resource:didReceiveResponse:fromDataSource:]):
(-[WebDefaultResourceLoadDelegate webView:resource:didReceiveContentLength:fromDataSource:]):
(-[WebDefaultResourceLoadDelegate webView:resource:didFinishLoadingFromDataSource:]):
(-[WebDefaultResourceLoadDelegate webView:resource:didFailLoadingWithError:fromDataSource:]):
(-[WebDefaultResourceLoadDelegate webView:pluginFailedWithError:dataSource:]):
* WebView.subproj/WebDefaultWindowOperationsDelegate.m:
(-[WebDefaultWindowOperationsDelegate webView:runJavaScriptConfirmPanelWithMessage:]):
(-[WebDefaultWindowOperationsDelegate webView:runJavaScriptTextInputPanelWithPrompt:defaultText:]):
(-[WebDefaultWindowOperationsDelegate webView:runOpenPanelForFileButtonWithResultListener:]):
* WebView.subproj/WebFrame.h:
* WebView.subproj/WebFrame.m:
(-[WebFrame init]):
(-[WebFrame initWithName:webFrameView:webView:]):
(-[WebFrame frameView]):
(-[WebFrame webView]):
(-[WebFrame findFrameNamed:]):
(+[WebFrame registerViewClass:representationClass:forMIMEType:]):
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
(if):
(switch):
* WebView.subproj/WebHTMLView.h:
* WebView.subproj/WebHTMLViewPrivate.h:
* WebView.subproj/WebHTMLViewPrivate.m:
(-[WebHTMLView _controller]):
* WebView.subproj/WebImageView.m:
(-[WebImageView controller]):
(-[WebImageView menuForEvent:]):
* WebView.subproj/WebLocationChangeDelegate.h:
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient continueAfterContentPolicy:response:]):
(-[WebMainResourceClient checkContentPolicyForResponse:]):
* WebView.subproj/WebResourceLoadDelegate.h:
* WebView.subproj/WebTextView.m:
(-[WebTextView menuForEvent:]):
* WebView.subproj/WebView.h:
* WebView.subproj/WebView.m:
(-[WebFrameView setAllowsScrolling:]):
(-[WebFrameView allowsScrolling]):
(-[WebFrameView scrollView]):
(-[WebFrameView documentView]):
(-[WebFrameView drawRect:]):
(-[WebFrameView setFrameSize:]):
* WebView.subproj/WebViewPrivate.h:
* WebView.subproj/WebViewPrivate.m:
(-[WebFrameView _controller]):
(-[WebFrameView _setDocumentView:]):
(-[WebFrameView _setController:]):
(-[WebFrameView _contentView]):
(-[WebFrameView _verticalKeyboardScrollAmount]):
(-[WebFrameView _horizontalKeyboardScrollAmount]):
(-[WebFrameView _scrollToBottomLeft]):
(+[WebFrameView _viewTypes]):
* WebView.subproj/WebWindowOperationsDelegate.h:
WebBrowser:
Stage 2 of WebController to WebView renaming.
Reviewed by hyatt.
* BrowserDocument.m:
(-[BrowserDocument fileType]):
(-[BrowserDocument mainWebFrameView]):
(-[BrowserDocument text]):
* BrowserTabViewItem.m:
(-[BrowserTabViewItem webController]):
* BrowserWebController.h:
* BrowserWebController.m:
(-[BrowserWebController webView:setStatusText:]):
(-[BrowserWebController webViewStatusText:]):
(-[BrowserWebController mouseoverTextForElement:modifierFlags:]):
(-[BrowserWebController webView:mouseDidMoveOverElement:modifierFlags:]):
(-[BrowserWebController webView:createWindowWithRequest:]):
(-[BrowserWebController webViewCloseWindow:]):
(-[BrowserWebController webViewShowWindow:]):
(-[BrowserWebController webViewShowWindowBehindFrontmost:]):
(-[BrowserWebController webViewFocusWindow:]):
(-[BrowserWebController webViewUnfocusWindow:]):
(-[BrowserWebController webViewFirstResponderInWindow:]):
(-[BrowserWebController webView:makeFirstResponderInWindow:]):
(-[BrowserWebController webViewIsResizable:]):
(-[BrowserWebController webView:setResizable:]):
(-[BrowserWebController webViewAreToolbarsVisible:]):
(-[BrowserWebController webView:setToolbarsVisible:]):
(-[BrowserWebController webViewIsStatusBarVisible:]):
(-[BrowserWebController webView:setStatusBarVisible:]):
(-[BrowserWebController mainWebFrameView]):
(-[BrowserWebController webView:setFrame:]):
(-[BrowserWebController webViewFrame:]):
(-[BrowserWebController webView:runJavaScriptAlertPanelWithMessage:]):
(-[BrowserWebController webView:runJavaScriptConfirmPanelWithMessage:]):
(-[BrowserWebController webView:runJavaScriptTextInputPanelWithPrompt:defaultText:]):
(-[BrowserWebController webView:runOpenPanelForFileButtonWithResultListener:]):
(-[BrowserWebController webView:unableToImplementPolicyWithError:inFrame:]):
(-[BrowserWebController openURLExternallyWithRequest:inFrame:]):
(-[BrowserWebController webView:decideContentPolicyForMIMEType:andRequest:inFrame:decisionListener:]):
(-[BrowserWebController webView:decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
(-[BrowserWebController webView:decideNewWindowPolicyForAction:andRequest:newFrameName:decisionListener:]):
(-[BrowserWebController goToURL:withFallbackURLs:]):
* BrowserWebFrameExtras.m:
(-[WebFrame isMainFrame]):
* BrowserWebViewExtras.m:
(-[WebFrameView isScrollable]):
(-[WebFrameView largestScrollableWebView]):
* BrowserWindowController.m:
(-[BrowserWindowController updateLabelForTab:]):
(-[BrowserWindowController setUpTabForController:]):
(-[BrowserWindowController bestWindowSizeForCurrentPageWithDefaultSize:]):
(-[BrowserWindowController frameLoadStarted:]):
(-[BrowserWindowController frameLoadCommitted:]):
(-[BrowserWindowController closeTab:]):
(-[BrowserWindowController closeOtherTabs:]):
(-[BrowserWindowController didSelectTabViewItem]):
(-[BrowserWindowController tabBarView:menuForClippedTabViewItems:]):
(-[BrowserWindowController replaceTabSwitcher:]):
(-[BrowserWindowController releaseTabSwitcher:]):
(-[BrowserWindowController replaceTabURLs:usingTabLabelsFromBookmarks:]):
(-[BrowserWindowController orderedTabs]):
(-[BrowserWindowController canReloadTab:]):
(-[BrowserWindowController canReloadAllTabs]):
(-[BrowserWindowController validateMenuItem:]):
* ContextMenuHandler.m:
(-[ContextMenuHandler webView:contextMenuItemsForElement:defaultMenuItems:]):
(-[ContextMenuHandler _window]):
(-[ContextMenuHandler search:]):
(-[ContextMenuHandler goToAddress:]):
* Debug/DebugUtilities.m:
(-[BrowserDocument setUserAgent:]):
(-[BrowserDocument validate_setUserAgent:]):
* Debug/Snippet.nib:
* Debug/SnippetController.h:
* Debug/SnippetController.m:
(-[SnippetController dealloc]):
(-[SnippetController windowWillClose:]):
(-[SnippetController load]):
(-[SnippetController loadComplete]):
(-[SnippetController mainDataSource]):
(-[SnippetController webView:locationChangeDone:forDataSource:]):
* FormCompletionController.h:
* FormCompletionController.m:
(+[FormCompletionController autoFillInController:]):
(+[AutoFillController autoFillInController:]):
* LoadProgressMonitor.m:
(-[LoadProgressMonitor _monitorProvisionalDataSourceForFrame:]):
(-[LoadProgressMonitor monitorFrame:]):
(-[LoadProgressMonitor webView:identifierForInitialRequest:fromDataSource:]):
(-[LoadProgressMonitor webView:resource:willSendRequest:fromDataSource:]):
(-[LoadProgressMonitor webView:resource:didReceiveResponse:fromDataSource:]):
(-[LoadProgressMonitor webView:resource:didReceiveContentLength:fromDataSource:]):
(-[LoadProgressMonitor webView:resource:didFinishLoadingFromDataSource:]):
(-[LoadProgressMonitor webView:pluginFailedWithError:dataSource:]):
* LocationChangeHandler.m:
(-[LocationChangeHandler webView:locationChangeStartedForDataSource:]):
(-[LocationChangeHandler webView:locationChangeCommittedForDataSource:]):
(-[LocationChangeHandler webView:locationChangeDone:forDataSource:]):
(-[LocationChangeHandler webView:willCloseLocationForDataSource:]):
(-[LocationChangeHandler webView:receivedPageTitle:forDataSource:]):
(-[LocationChangeHandler webView:receivedPageIcon:forDataSource:]):
(-[LocationChangeHandler webView:serverRedirectedForDataSource:]):
(-[LocationChangeHandler webView:locationChangedWithinPageForDataSource:]):
(-[LocationChangeHandler webView:clientWillRedirectTo:delay:fireDate:forFrame:]):
(-[LocationChangeHandler webView:clientRedirectCancelledForFrame:]):
Tests:
Stage 2 of WebController to WebView renaming.
Reviewed by hyatt.
* Carbon/CarbonWeb/MyWebResourceLoadAdapter.m:
(-[MyWebResourceLoadAdapter webView:identifierForInitialRequest:fromDataSource:]):
(-[MyWebResourceLoadAdapter webView:resource:didReceiveResponse:fromDataSource:]):
(-[MyWebResourceLoadAdapter webView:resource:didReceiveContentLength:fromDataSource:]):
(-[MyWebResourceLoadAdapter webView:resource:didFinishLoadingFromDataSource:]):
(-[MyWebResourceLoadAdapter webView:resource:didFailLoadingWithError:fromDataSource:]):
(-[MyWebResourceLoadAdapter webView:pluginFailedWithError:dataSource:]):
* DumpBackForward/main.m:
(main):
(-[WaitUntilDoneDelegate webView:locationChangeDone:forDataSource:]):
(-[CheapWindowOpsDelegate webView:createWindowWithRequest:]):
* DumpRenderTree/main.m:
(main):
(-[WaitUntilDoneDelegate webView:locationChangeDone:forDataSource:]):
* HeaderView/ApplicationController.m:
* HeaderView/DocumentController.h:
* HeaderView/DocumentController.m:
(-[DocumentController dealloc]):
(-[DocumentController awakeFromNib]):
(-[DocumentController loadURL:]):
(-[DocumentController updateLayout]):
(-[DocumentController webView:locationChangeStartedForDataSource:]):
(-[DocumentController webView:receivedPageTitle:forDataSource:]):
(-[DocumentController webView:locationChangeDone:forDataSource:]):
(-[DocumentController webView:identifierForInitialRequest:fromDataSource:]):
(-[DocumentController webView:resource:willSendRequest:fromDataSource:]):
(-[DocumentController webView:resource:didFinishLoadingFromDataSource:]):
(-[DocumentController webView:resource:didFailLoadingWithError:fromDataSource:]):
* IBViewer/DocumentController.m:
(-[DocumentController webView:locationChangeStartedForDataSource:]):
(-[DocumentController webView:receivedPageTitle:forDataSource:]):
(-[DocumentController webView:locationChangeDone:forDataSource:]):
(-[DocumentController webView:identifierForInitialRequest:fromDataSource:]):
(-[DocumentController webView:resource:willSendRequest:fromDataSource:]):
(-[DocumentController webView:resource:didFinishLoadingFromDataSource:]):
(-[DocumentController webView:resource:didFailLoadingWithError:fromDataSource:]):
* PDFBundle/PDFView.m:
(-[PDFView layout]):
* PDFViewer/DocumentController.h:
* PDFViewer/DocumentController.m:
(-[DocumentController loadURL:]):
(-[DocumentController webView:locationChangeStartedForDataSource:]):
(-[DocumentController webView:receivedPageTitle:forDataSource:]):
(-[DocumentController webView:locationChangeDone:forDataSource:]):
(-[DocumentController webView:identifierForInitialRequest:fromDataSource:]):
(-[DocumentController webView:resource:willSendRequest:fromDataSource:]):
(-[DocumentController webView:resource:didFinishLoadingFromDataSource:]):
(-[DocumentController webView:resource:didFailLoadingWithError:fromDataSource:]):
* PDFViewer/PDFRepresentation.m:
(-[PDFView layout]):
* SimpleViewer/DocumentController.h:
* SimpleViewer/DocumentController.m:
(-[DocumentController loadURL:]):
(-[DocumentController webView:locationChangeStartedForDataSource:]):
(-[DocumentController webView:receivedPageTitle:forDataSource:]):
(-[DocumentController webView:locationChangeDone:forDataSource:]):
(-[DocumentController webView:identifierForInitialRequest:fromDataSource:]):
(-[DocumentController webView:resource:willSendRequest:fromDataSource:]):
(-[DocumentController webView:resource:didFinishLoadingFromDataSource:]):
(-[DocumentController webView:resource:didFailLoadingWithError:fromDataSource:]):
* SnippetEditor/SnippetController.h:
* SnippetEditor/SnippetController.m:
(-[SnippetController dealloc]):
(-[SnippetController windowWillClose:]):
(-[SnippetController awakeFromNib]):
(-[SnippetController _resetViews]):
(-[SnippetController _updateTitleWithURL]):
(-[SnippetController updateFromURL:]):
(-[SnippetController updateFromText:]):
(-[SnippetController loadComplete]):
(-[SnippetController mainDataSource]):
(-[SnippetController webView:locationChangeDone:forDataSource:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3859 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/API-Issues.rtf b/WebKit/API-Issues.rtf
index 8ca64ef..6cd5a50 100644
--- a/WebKit/API-Issues.rtf
+++ b/WebKit/API-Issues.rtf
@@ -1,5 +1,6 @@
{\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}
+{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fnil\fcharset77 Monaco;
+}
{\colortbl;\red255\green255\blue255;}
\margl1440\margr1440\vieww16540\viewh12180\viewkind0
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
@@ -7,42 +8,20 @@
\f0\b\fs24 \cf0 API Cleanup:
\f1\b0 \
\
-1. WebHistory currently inherits from WebCoreHistory. No WebCore related APIs should be publicly visible. (1day) (DONE)\
-2. Methods from specific representations (WebHTMLView and WebHTMLRepresentation) need to be factored into protocols or moved to WebView and WebDataSource. This task is mostly complete already. (3083733, 1 day) (DONE)\
-3. Need closure on whether WebFoundation APIs will be public or not. If public, not much work needs to be done. If private, we need to expose relevant WebFoundation APIs in WebKit (WebError, WebResourceRequest, WebResourceResponse, WebHandle). (2 days) (DONE)\
-3a. Need to finalize decision on use of NSString or NSURL to express URLs in APIs. (1 day)\
-4. WebKit error codes should use WebKit prefix. (3078996, .5 day). (DONE, still need to update WebFoundation errors)\
-5. Remove all references to DOM classes from public API and make DOM classes SPI. (.5 day) DONE\
-6. Separate download behavior from WebResourceLoadDelegate. (DONE)\
-7. Make NSMenuItems identifiable in WebContentMenuDelegate. (DONE)\
-\
-\
-
-\f0\b Incomplete API:
-\f1\b0 \
-\
-1. API to support the notion of a focused frame. (2959069, 2 days)\
-2. WebPreferences needs to be scoped to a WebController (and/or set). (3083707, 3 days) (DONE)\
-\
-
-\f0\b Issues relating to internal clients:
-\f1\b0 \
-\
-1. Ensure that all interaction with users via sheets and panels is done with delegates. (Ed Voas, carbon integration, 2 days)\
-1a. Ensure that WebWindowOperations delegate is sufficient for tabbed browsing. (? days)\
-2. Allow custom views to share scrollview with WebView. (Grant B., mail, 2 days)\
-3. Ensure that clients (Help, Mail, PB) can cleanly write their own protocol handlers with API/SPI. (3163688, ? days)\
-\
-
-\f0\b Sample Code:
-\f1\b0 \
-1. More complete example code. Our current sample code doesn't demonstrate all the delegate APIs. (5 days)\
-\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\f0\b Documentation:
-\f1\b0 \
-1. More complete documentation. I gather that Peter Wilson (?) will be our technical writer. This task will include time spent meeting with Matt to 'brain dump' conceptual material and nitty gritty details. (ongoing)\
-\
+\f2\fs20 \cf0 + Use "WebFrame" in the API when we refer to a WebFrame, rather than just "Frame".\
++ Change WebController's userStyleSheetLocation to an NSURL.\
++ Change WebController's setUsesBackForwardList to setMaintainsBackForwardList.\
++ Remove WebController's customUserAgent property.\
++ Remove suggestedFileExtensionForMIMEType from public API.\
++ On WebController:\
+ Add -(BOOL)canGoBack, -(BOOL)canGoForward, -(BOOL)canCanel.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\f0\b Total Time To Complete:
-\f1\b0 20 days}
\ No newline at end of file
+\f1\fs24 \cf0 \
++ remove
+\f2\fs20 \CocoaLigature0 suggestedFileExtensionForMIMEType\
++ remove canShowFile\
++ put class methods from WebContentTypes back on WebController (WebView)\
+}
\ No newline at end of file
diff --git a/WebKit/Carbon.subproj/HIWebView.h b/WebKit/Carbon.subproj/HIWebView.h
index 677fd6d..449d70b 100644
--- a/WebKit/Carbon.subproj/HIWebView.h
+++ b/WebKit/Carbon.subproj/HIWebView.h
@@ -60,10 +60,10 @@ HIWebFrameViewCreate(HIViewRef * outControl);
* CarbonLib: not available
* Non-Carbon CFM: not available
*/
-extern WebController*
+extern WebView*
HIWebFrameViewGetController(HIViewRef inView);
-extern WebController*
+extern WebView*
WebControllerCreateWithHIView( HIViewRef inView, CFStringRef inName );
#ifdef __cplusplus
diff --git a/WebKit/Carbon.subproj/HIWebView.m b/WebKit/Carbon.subproj/HIWebView.m
index 5fcc8d3..e28c6e2 100644
--- a/WebKit/Carbon.subproj/HIWebView.m
+++ b/WebKit/Carbon.subproj/HIWebView.m
@@ -220,26 +220,26 @@ HIWebFrameViewGetNSView( HIViewRef inView )
// HIWebFrameViewGetController
//----------------------------------------------------------------------------------
//
-WebController*
+WebView*
HIWebFrameViewGetController( HIViewRef inControl )
{
HIWebFrameView* view = (HIWebFrameView*)HIObjectDynamicCast( (HIObjectRef)inControl, kHIWebFrameViewClassID );
- WebController* result = NULL;
+ WebView* result = NULL;
if ( view )
- result = [[view->fWebFrameView webFrame] controller];
+ result = [[view->fWebFrameView webFrame] webView];
return result;
}
-extern WebController*
+extern WebView*
WebControllerCreateWithHIView( HIViewRef inView, CFStringRef inName )
{
NSView* view = HIWebFrameViewGetNSView( inView );
- WebController* result = NULL;
+ WebView* result = NULL;
if ( view )
- result = [[WebController alloc] initWithView: (WebFrameView*)view frameName:nil groupName:(NSString*)inName];
+ result = [[WebView alloc] initWithView: (WebFrameView*)view frameName:nil groupName:(NSString*)inName];
return result;
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index db4b033..d523118 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,188 @@
+2003-03-18 Richard Williamson <rjw at apple.com>
+
+ Stage 2 of WebController to WebView renaming.
+
+ Reviewed by hyatt.
+
+ * API-Issues.rtf:
+ * Carbon.subproj/HIWebView.h:
+ * Carbon.subproj/HIWebView.m:
+ * Misc.subproj/WebNSPasteboardExtras.m:
+ (-[NSPasteboard _web_bestURL]):
+ * Panels.subproj/WebStandardPanels.m:
+ (-[WebStandardPanels _didStartLoadingURL:inController:]):
+ (-[WebStandardPanels _didStopLoadingURL:inController:]):
+ (-[WebStandardPanels frontmostWindowLoadingURL:]):
+ * Panels.subproj/WebStandardPanelsPrivate.h:
+ * Plugins.subproj/WebBaseNetscapePluginView.h:
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView controller]):
+ (-[WebBaseNetscapePluginView loadPluginRequest:]):
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ (-[WebNetscapePluginDocumentView setDataSource:]):
+ * Plugins.subproj/WebNetscapePluginRepresentation.m:
+ (-[WebNetscapePluginRepresentation isPluginViewStarted]):
+ (-[WebNetscapePluginRepresentation receivedData:withDataSource:]):
+ * Plugins.subproj/WebNullPluginView.m:
+ (-[WebNullPluginView viewDidMoveToWindow]):
+ * Plugins.subproj/WebPluginController.m:
+ (-[WebPluginController showStatus:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge mainFrame]):
+ (-[WebBridge createWindowWithURL:frameName:]):
+ (-[WebBridge showWindow]):
+ (-[WebBridge areToolbarsVisible]):
+ (-[WebBridge setToolbarsVisible:]):
+ (-[WebBridge areScrollbarsVisible]):
+ (-[WebBridge setScrollbarsVisible:]):
+ (-[WebBridge isStatusBarVisible]):
+ (-[WebBridge setStatusBarVisible:]):
+ (-[WebBridge setWindowFrame:]):
+ (-[WebBridge window]):
+ (-[WebBridge runJavaScriptAlertPanelWithMessage:]):
+ (-[WebBridge runJavaScriptConfirmPanelWithMessage:]):
+ (-[WebBridge runJavaScriptTextInputPanelWithPrompt:defaultText:returningText:]):
+ (-[WebBridge runOpenPanelForFileButtonWithResultListener:]):
+ (-[WebBridge setStatusText:]):
+ (-[WebBridge objectLoadedFromCacheWithURL:response:size:]):
+ (-[WebBridge setWebFrame:]):
+ (-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]):
+ (-[WebBridge userAgentForURL:]):
+ (-[WebBridge nextKeyViewOutsideWebFrameViews]):
+ (-[WebBridge previousKeyViewOutsideWebFrameViews]):
+ (-[WebBridge defersLoading]):
+ (-[WebBridge setDefersLoading:]):
+ (-[WebBridge setNeedsReapplyStyles]):
+ (-[WebBridge setNeedsLayout]):
+ (-[WebBridge pluginViewWithPackage:attributes:baseURL:]):
+ (-[WebBridge handleMouseDragged:]):
+ (-[WebBridge mayStartDragWithMouseDragged:]):
+ (-[WebBridge historyLength]):
+ (-[WebBridge goBackOrForward:]):
+ (formDelegate):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+ * WebKit.exp:
+ * WebView.subproj/WebBaseResourceHandleDelegate.h:
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate resource:willSendRequest:]):
+ (-[WebBaseResourceHandleDelegate resource:didReceiveResponse:]):
+ (-[WebBaseResourceHandleDelegate resource:didReceiveData:]):
+ (-[WebBaseResourceHandleDelegate resourceDidFinishLoading:]):
+ (-[WebBaseResourceHandleDelegate resource:didFailLoadingWithError:]):
+ (-[WebBaseResourceHandleDelegate cancelWithError:]):
+ * WebView.subproj/WebContextMenuDelegate.h:
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ (-[WebView _commonInitialization:frameName:groupName:]):
+ (-[WebView initWithFrame:]):
+ (-[WebView supportsTextEncoding]):
+ (-[WebView userAgentForURL:]):
+ * WebView.subproj/WebControllerPolicyDelegate.h:
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebViewPrivate _clearControllerReferences:]):
+ (+[WebView canShowFile:]):
+ (+[WebView suggestedFileExtensionForMIMEType:]):
+ (-[WebView _createFrameNamed:inParent:allowsScrolling:]):
+ (-[WebView _findFrameNamed:]):
+ (-[WebView _openNewWindowWithRequest:]):
+ (-[WebView _menuForElement:]):
+ (-[WebView _mouseDidMoveOverElement:modifierFlags:]):
+ (-[WebView _frameForView:fromFrame:]):
+ * WebView.subproj/WebControllerSets.h:
+ * WebView.subproj/WebControllerSets.m:
+ (+[WebControllerSets addController:toSetNamed:]):
+ (+[WebControllerSets removeController:fromSetNamed:]):
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _controller]):
+ (-[WebDataSource _setController:]):
+ (-[WebDataSource _startLoading:]):
+ (-[WebDataSource _setTitle:]):
+ (-[WebDataSource _setRequest:]):
+ (-[WebDataSource _layoutChildren]):
+ (+[WebDataSource _repTypes]):
+ (-[WebDataSource _receivedData:]):
+ (-[WebDataSource _updateIconDatabaseWithURL:]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate webView:contextMenuItemsForElement:defaultMenuItems:]):
+ (-[WebDefaultContextMenuDelegate openNewWindowWithURL:]):
+ (-[WebDefaultContextMenuDelegate downloadURL:]):
+ * WebView.subproj/WebDefaultLocationChangeDelegate.m:
+ (-[WebDefaultLocationChangeDelegate webView:locationChangeStartedForDataSource:]):
+ (-[WebDefaultLocationChangeDelegate webView:serverRedirectedForDataSource:]):
+ (-[WebDefaultLocationChangeDelegate webView:locationChangeCommittedForDataSource:]):
+ (-[WebDefaultLocationChangeDelegate webView:receivedPageTitle:forDataSource:]):
+ (-[WebDefaultLocationChangeDelegate webView:receivedPageIcon:forDataSource:]):
+ (-[WebDefaultLocationChangeDelegate webView:locationChangeDone:forDataSource:]):
+ (-[WebDefaultLocationChangeDelegate webView:willCloseLocationForDataSource:]):
+ (-[WebDefaultLocationChangeDelegate webView:locationChangedWithinPageForDataSource:]):
+ (-[WebDefaultLocationChangeDelegate webView:clientWillRedirectTo:delay:fireDate:forFrame:]):
+ (-[WebDefaultLocationChangeDelegate webView:clientRedirectCancelledForFrame:]):
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate webView:unableToImplementPolicyWithError:inFrame:]):
+ (-[WebDefaultPolicyDelegate webView:decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
+ (-[WebDefaultPolicyDelegate webView:decideNewWindowPolicyForAction:andRequest:newFrameName:decisionListener:]):
+ * WebView.subproj/WebDefaultResourceLoadDelegate.m:
+ (-[WebDefaultResourceLoadDelegate webView:identifierForInitialRequest:fromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate webView:resource:willSendRequest:fromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate webView:resource:didReceiveResponse:fromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate webView:resource:didReceiveContentLength:fromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate webView:resource:didFinishLoadingFromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate webView:resource:didFailLoadingWithError:fromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate webView:pluginFailedWithError:dataSource:]):
+ * WebView.subproj/WebDefaultWindowOperationsDelegate.m:
+ (-[WebDefaultWindowOperationsDelegate webView:runJavaScriptConfirmPanelWithMessage:]):
+ (-[WebDefaultWindowOperationsDelegate webView:runJavaScriptTextInputPanelWithPrompt:defaultText:]):
+ (-[WebDefaultWindowOperationsDelegate webView:runOpenPanelForFileButtonWithResultListener:]):
+ * WebView.subproj/WebFrame.h:
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame init]):
+ (-[WebFrame initWithName:webFrameView:webView:]):
+ (-[WebFrame frameView]):
+ (-[WebFrame webView]):
+ (-[WebFrame findFrameNamed:]):
+ (+[WebFrame registerViewClass:representationClass:forMIMEType:]):
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (if):
+ (switch):
+ * WebView.subproj/WebHTMLView.h:
+ * WebView.subproj/WebHTMLViewPrivate.h:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _controller]):
+ * WebView.subproj/WebImageView.m:
+ (-[WebImageView controller]):
+ (-[WebImageView menuForEvent:]):
+ * WebView.subproj/WebLocationChangeDelegate.h:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient continueAfterContentPolicy:response:]):
+ (-[WebMainResourceClient checkContentPolicyForResponse:]):
+ * WebView.subproj/WebResourceLoadDelegate.h:
+ * WebView.subproj/WebTextView.m:
+ (-[WebTextView menuForEvent:]):
+ * WebView.subproj/WebView.h:
+ * WebView.subproj/WebView.m:
+ (-[WebFrameView setAllowsScrolling:]):
+ (-[WebFrameView allowsScrolling]):
+ (-[WebFrameView scrollView]):
+ (-[WebFrameView documentView]):
+ (-[WebFrameView drawRect:]):
+ (-[WebFrameView setFrameSize:]):
+ * WebView.subproj/WebViewPrivate.h:
+ * WebView.subproj/WebViewPrivate.m:
+ (-[WebFrameView _controller]):
+ (-[WebFrameView _setDocumentView:]):
+ (-[WebFrameView _setController:]):
+ (-[WebFrameView _contentView]):
+ (-[WebFrameView _verticalKeyboardScrollAmount]):
+ (-[WebFrameView _horizontalKeyboardScrollAmount]):
+ (-[WebFrameView _scrollToBottomLeft]):
+ (+[WebFrameView _viewTypes]):
+ * WebView.subproj/WebWindowOperationsDelegate.h:
+
2003-03-18 Darin Adler <darin at apple.com>
Reviewed by Richard.
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index 1ee49c6..815113c 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -6,7 +6,7 @@
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebURLsWithTitles.h>
@@ -66,7 +66,7 @@ NSString *WebURLNamePboardType = nil;
NSString *file = [files objectAtIndex:0];
BOOL isDirectory;
if([[NSFileManager defaultManager] fileExistsAtPath:file isDirectory:&isDirectory] && !isDirectory){
- if ([WebContentTypes canShowFile:file]) {
+ if ([WebView canShowFile:file]) {
return [[NSURL fileURLWithPath:file] _web_canonicalize];
}
}
diff --git a/WebKit/Panels.subproj/WebStandardPanels.m b/WebKit/Panels.subproj/WebStandardPanels.m
index 2db6b62..70f6dd4 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.m
+++ b/WebKit/Panels.subproj/WebStandardPanels.m
@@ -143,10 +143,10 @@ static void initSharedStandardPanels(void)
}
}
--(void)_didStartLoadingURL:(NSURL *)URL inController:(WebController *)controller
+-(void)_didStartLoadingURL:(NSURL *)URL inController:(WebView *)webView
{
ASSERT_ARG(URL, URL);
- ASSERT_ARG(controller, controller);
+ ASSERT_ARG(webView, webView);
NSString *URLString = [URL absoluteString];
@@ -157,25 +157,25 @@ static void initSharedStandardPanels(void)
[_privatePanels->URLContainers setObject:set forKey:URLString];
}
- [set addObject:controller];
+ [set addObject:webView];
}
--(void)_didStopLoadingURL:(NSURL *)URL inController:(WebController *)controller
+-(void)_didStopLoadingURL:(NSURL *)URL inController:(WebView *)webView
{
ASSERT_ARG(URL, URL);
- ASSERT_ARG(controller, controller);
+ ASSERT_ARG(webView, webView);
NSString *URLString = [URL absoluteString];
NSCountedSet *set = [_privatePanels->URLContainers objectForKey:URLString];
- ASSERT([set containsObject:controller]);
+ ASSERT([set containsObject:webView]);
if (set == nil) {
return;
}
- [set removeObject:controller];
+ [set removeObject:webView];
if ([set count] == 0) {
[_privatePanels->URLContainers removeObjectForKey:URLString];
@@ -215,7 +215,7 @@ static BOOL WindowInFront(NSWindow *a, NSWindow *b)
if ([object isKindOfClass:[NSWindow class]]) {
window = object;
} else {
- window = [[[object mainFrame] view] window];
+ window = [[[object mainFrame] frameView] window];
}
if (window != nil && [window isVisible] && (frontmostWindow == nil || WindowInFront(window, frontmostWindow))) {
diff --git a/WebKit/Panels.subproj/WebStandardPanelsPrivate.h b/WebKit/Panels.subproj/WebStandardPanelsPrivate.h
index 003e3ff..a3aa0d8 100644
--- a/WebKit/Panels.subproj/WebStandardPanelsPrivate.h
+++ b/WebKit/Panels.subproj/WebStandardPanelsPrivate.h
@@ -9,7 +9,7 @@
@interface WebStandardPanels (Private)
--(void)_didStartLoadingURL:(NSURL *)URL inController:(WebController *)controller;
--(void)_didStopLoadingURL:(NSURL *)URL inController:(WebController *)controller;
+-(void)_didStartLoadingURL:(NSURL *)URL inController:(WebView *)controller;
+-(void)_didStopLoadingURL:(NSURL *)URL inController:(WebView *)controller;
@end
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h
index eee7c3f..82a30cb 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h
@@ -7,11 +7,11 @@
#import <npapi.h>
- at class WebController;
@class WebDataSource;
@class WebFrame;
@class WebNetscapePluginPackage;
@class WebNetscapePluginNullEventSender;
+ at class WebView;
@interface WebBaseNetscapePluginView : NSView
@@ -63,7 +63,7 @@
- (WebFrame *)webFrame;
- (WebDataSource *)dataSource;
-- (WebController *)controller;
+- (WebView *)controller;
- (NPP)pluginPointer;
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index db08abb..f154c73 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -760,9 +760,9 @@ typedef struct {
return [[self dataSource] webFrame];
}
-- (WebController *)controller
+- (WebView *)controller
{
- return [[self webFrame] controller];
+ return [[self webFrame] webView];
}
- (NPP)pluginPointer
@@ -1036,16 +1036,16 @@ typedef struct {
WebFrame *frame = [[self webFrame] findFrameNamed:frameName];
if (frame == nil) {
- WebController *newController = nil;
- WebController *currentController = [self controller];
+ WebView *newController = nil;
+ WebView *currentController = [self controller];
id wd = [currentController windowOperationsDelegate];
- if ([wd respondsToSelector:@selector(controller:createWindowWithRequest:)])
- newController = [wd controller:currentController createWindowWithRequest:nil];
+ if ([wd respondsToSelector:@selector(webView:createWindowWithRequest:)])
+ newController = [wd webView:currentController createWindowWithRequest:nil];
else
- newController = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] controller:currentController createWindowWithRequest:nil];
+ newController = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] webView:currentController createWindowWithRequest:nil];
[newController _setTopLevelFrameName:frameName];
- [[newController _windowOperationsDelegateForwarder] controllerShowWindow:newController];
+ [[newController _windowOperationsDelegateForwarder] webViewShowWindow:newController];
frame = [newController mainFrame];
}
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index bba2fd7..c120ac3 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -88,8 +88,8 @@
pluginName:[thePlugin name]
MIMEType:MIME];
- WebController *c = [[theDataSource webFrame] controller];
- [[c _resourceLoadDelegateForwarder] controller:c pluginFailedWithError:error dataSource:theDataSource];
+ WebView *c = [[theDataSource webFrame] webView];
+ [[c _resourceLoadDelegateForwarder] webView:c pluginFailedWithError:error dataSource:theDataSource];
return;
}
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
index 9ea00d3..e39dcdd 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
@@ -30,14 +30,14 @@
- (BOOL)isPluginViewStarted
{
- WebNetscapePluginDocumentView *view = (WebNetscapePluginDocumentView *)[[[_dataSource webFrame] view] documentView];
+ WebNetscapePluginDocumentView *view = (WebNetscapePluginDocumentView *)[[[_dataSource webFrame] frameView] documentView];
ASSERT([view isKindOfClass:[WebNetscapePluginDocumentView class]]);
return [view isStarted];
}
- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)ds
{
- WebNetscapePluginDocumentView *view = (WebNetscapePluginDocumentView *)[[[_dataSource webFrame] view] documentView];
+ WebNetscapePluginDocumentView *view = (WebNetscapePluginDocumentView *)[[[_dataSource webFrame] frameView] documentView];
ASSERT([view isKindOfClass:[WebNetscapePluginDocumentView class]]);
if (![view isStarted]) {
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index b9d016a..bccf7c1 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -48,10 +48,10 @@ static NSImage *image = nil;
didSendError = YES;
WebFrameView *view = (WebFrameView *)[self _web_superviewOfClass:[WebFrameView class]];
WebFrame *webFrame = [view webFrame];
- WebController *controller = [webFrame controller];
+ WebView *webView = [webFrame webView];
WebDataSource *dataSource = [webFrame dataSource];
- [[controller _resourceLoadDelegateForwarder] controller:controller pluginFailedWithError:error dataSource:dataSource];
+ [[webView _resourceLoadDelegateForwarder] webView:webView pluginFailedWithError:error dataSource:dataSource];
}
}
diff --git a/WebKit/Plugins.subproj/WebPluginController.m b/WebKit/Plugins.subproj/WebPluginController.m
index 8f25905..4e7efd8 100644
--- a/WebKit/Plugins.subproj/WebPluginController.m
+++ b/WebKit/Plugins.subproj/WebPluginController.m
@@ -120,8 +120,8 @@
ERROR("could not show status message (%@) because plug-in has already been destroyed", message);
return;
}
- WebController *c = [_HTMLView _controller];
- [[c _windowOperationsDelegateForwarder] controller:c setStatusText:message];
+ WebView *c = [_HTMLView _controller];
+ [[c _windowOperationsDelegateForwarder] webView:c setStatusText:message];
}
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 50cd63f..409eb2a 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -91,7 +91,7 @@
- (WebCoreBridge *)mainFrame
{
ASSERT(frame != nil);
- return [[[frame controller] mainFrame] _bridge];
+ return [[[frame webView] mainFrame] _bridge];
}
- (WebCoreBridge *)findFrameNamed:(NSString *)name;
@@ -111,106 +111,106 @@
[request setReferrer:[self referrer]];
}
- WebController *currentController = [frame controller];
+ WebView *currentController = [frame webView];
id wd = [currentController windowOperationsDelegate];
- WebController *newController = nil;
+ WebView *newController = nil;
- if ([wd respondsToSelector:@selector(controller:createWindowWithRequest:)])
- newController = [wd controller:currentController createWindowWithRequest:request];
+ if ([wd respondsToSelector:@selector(webView:createWindowWithRequest:)])
+ newController = [wd webView:currentController createWindowWithRequest:request];
else
- newController = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] controller:currentController createWindowWithRequest:request];
+ newController = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] webView:currentController createWindowWithRequest:request];
[newController _setTopLevelFrameName:name];
return [[newController mainFrame] _bridge];
}
- (void)showWindow
{
- WebController *c = [frame controller];
- [[c _windowOperationsDelegateForwarder] controllerShowWindow: c];
+ WebView *c = [frame webView];
+ [[c _windowOperationsDelegateForwarder] webViewShowWindow: c];
}
- (BOOL)areToolbarsVisible
{
ASSERT(frame != nil);
- WebController *c = [frame controller];
+ WebView *c = [frame webView];
id wd = [c windowOperationsDelegate];
- if ([wd respondsToSelector: @selector(controllerAreToolbarsVisible:)])
- return [wd controllerAreToolbarsVisible: c];
- return [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] controllerAreToolbarsVisible:c];
+ if ([wd respondsToSelector: @selector(webViewAreToolbarsVisible:)])
+ return [wd webViewAreToolbarsVisible: c];
+ return [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] webViewAreToolbarsVisible:c];
}
- (void)setToolbarsVisible:(BOOL)visible
{
ASSERT(frame != nil);
- WebController *c = [frame controller];
- [[c _windowOperationsDelegateForwarder] controller:c setToolbarsVisible:visible];
+ WebView *c = [frame webView];
+ [[c _windowOperationsDelegateForwarder] webView:c setToolbarsVisible:visible];
}
- (BOOL)areScrollbarsVisible
{
ASSERT(frame != nil);
- return [[frame view] allowsScrolling];
+ return [[frame frameView] allowsScrolling];
}
- (void)setScrollbarsVisible:(BOOL)visible
{
ASSERT(frame != nil);
- return [[frame view] setAllowsScrolling:visible];
+ return [[frame frameView] setAllowsScrolling:visible];
}
- (BOOL)isStatusBarVisible
{
ASSERT(frame != nil);
- WebController *c = [frame controller];
+ WebView *c = [frame webView];
id wd = [c windowOperationsDelegate];
- if ([wd respondsToSelector: @selector(controllerIsStatusBarVisible:)])
- return [wd controllerIsStatusBarVisible:c];
- return [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] controllerIsStatusBarVisible:c];
+ if ([wd respondsToSelector: @selector(webViewIsStatusBarVisible:)])
+ return [wd webViewIsStatusBarVisible:c];
+ return [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] webViewIsStatusBarVisible:c];
}
- (void)setStatusBarVisible:(BOOL)visible
{
ASSERT(frame != nil);
- WebController *c = [frame controller];
- [[c _windowOperationsDelegateForwarder] controller:c setStatusBarVisible:visible];
+ WebView *c = [frame webView];
+ [[c _windowOperationsDelegateForwarder] webView:c setStatusBarVisible:visible];
}
- (void)setWindowFrame:(NSRect)frameRect
{
ASSERT(frame != nil);
- WebController *c = [frame controller];
- [[c _windowOperationsDelegateForwarder] controller:c setFrame:frameRect];
+ WebView *c = [frame webView];
+ [[c _windowOperationsDelegateForwarder] webView:c setFrame:frameRect];
}
- (NSWindow *)window
{
ASSERT(frame != nil);
- return [[frame view] window];
+ return [[frame frameView] window];
}
- (void)runJavaScriptAlertPanelWithMessage:(NSString *)message
{
- WebController *c = [frame controller];
- [[c _windowOperationsDelegateForwarder] controller:c runJavaScriptAlertPanelWithMessage:message];
+ WebView *c = [frame webView];
+ [[c _windowOperationsDelegateForwarder] webView:c runJavaScriptAlertPanelWithMessage:message];
}
- (BOOL)runJavaScriptConfirmPanelWithMessage:(NSString *)message
{
- WebController *c = [frame controller];
+ WebView *c = [frame webView];
id wd = [c windowOperationsDelegate];
- if ([wd respondsToSelector: @selector(controller:runJavaScriptConfirmPanelWithMessage:)])
- return [wd controller:c runJavaScriptConfirmPanelWithMessage:message];
- return [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] controller:c runJavaScriptConfirmPanelWithMessage:message];
+ if ([wd respondsToSelector: @selector(webView:runJavaScriptConfirmPanelWithMessage:)])
+ return [wd webView:c runJavaScriptConfirmPanelWithMessage:message];
+ return [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] webView:c runJavaScriptConfirmPanelWithMessage:message];
}
- (BOOL)runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText returningText:(NSString **)result
{
- WebController *c = [frame controller];
+ WebView *c = [frame webView];
id wd = [c windowOperationsDelegate];
- if ([wd respondsToSelector: @selector(controller:runJavaScriptTextInputPanelWithPrompt:defaultText:)])
- *result = [wd controller:c runJavaScriptTextInputPanelWithPrompt:prompt defaultText:defaultText];
+ if ([wd respondsToSelector: @selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:)])
+ *result = [wd webView:c runJavaScriptTextInputPanelWithPrompt:prompt defaultText:defaultText];
else
- *result = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] controller:c runJavaScriptTextInputPanelWithPrompt:prompt defaultText:defaultText];
+ *result = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] webView:c runJavaScriptTextInputPanelWithPrompt:prompt defaultText:defaultText];
return *result != nil;
}
@@ -221,8 +221,8 @@
- (void)runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener
{
- WebController *c = [frame controller];
- [[c _windowOperationsDelegateForwarder] controller:c runOpenPanelForFileButtonWithResultListener:resultListener];
+ WebView *c = [frame webView];
+ [[c _windowOperationsDelegateForwarder] webView:c runOpenPanelForFileButtonWithResultListener:resultListener];
}
@@ -245,8 +245,8 @@
- (void)setStatusText:(NSString *)status
{
ASSERT(frame != nil);
- WebController *c = [frame controller];
- [[c _windowOperationsDelegateForwarder] controller:c setStatusText:status];
+ WebView *c = [frame webView];
+ [[c _windowOperationsDelegateForwarder] webView:c setStatusText:status];
}
- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)withDataSource
@@ -282,21 +282,21 @@
ASSERT(response != nil);
WebRequest *request = [[WebRequest alloc] initWithURL:[NSURL _web_URLWithString:URL]];
- WebController *c = [frame controller];
+ WebView *c = [frame webView];
id delegate = [c resourceLoadDelegate];
id _delegate = [c _resourceLoadDelegateForwarder];
id identifier;
// No chance for delegate to modify request, so we don't send a willSendRequest: message.
- if ([delegate respondsToSelector:@selector(controller:identifierForInitialRequest:fromDataSource:)])
- identifier = [delegate controller:c identifierForInitialRequest: request fromDataSource: [self dataSource]];
+ if ([delegate respondsToSelector:@selector(webView:identifierForInitialRequest:fromDataSource:)])
+ identifier = [delegate webView:c identifierForInitialRequest: request fromDataSource: [self dataSource]];
else
- identifier = [[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] controller:c identifierForInitialRequest:request fromDataSource:[self dataSource]];
- [_delegate controller:c resource: identifier didReceiveResponse: response fromDataSource: [self dataSource]];
- [_delegate controller:c resource: identifier didReceiveContentLength: bytes fromDataSource: [self dataSource]];
- [_delegate controller:c resource: identifier didFinishLoadingFromDataSource: [self dataSource]];
+ identifier = [[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] webView:c identifierForInitialRequest:request fromDataSource:[self dataSource]];
+ [_delegate webView:c resource: identifier didReceiveResponse: response fromDataSource: [self dataSource]];
+ [_delegate webView:c resource: identifier didReceiveContentLength: bytes fromDataSource: [self dataSource]];
+ [_delegate webView:c resource: identifier didFinishLoadingFromDataSource: [self dataSource]];
- [[frame controller] _finishedLoadingResourceFromDataSource:[self dataSource]];
+ [[frame webView] _finishedLoadingResourceFromDataSource:[self dataSource]];
[request release];
}
@@ -322,7 +322,7 @@
if (frame == nil) {
// Non-retained because data source owns representation owns bridge
frame = webFrame;
- [self setTextSizeMultiplier:[[frame controller] textSizeMultiplier]];
+ [self setTextSizeMultiplier:[[frame webView] textSizeMultiplier]];
} else {
ASSERT(frame == webFrame);
}
@@ -373,15 +373,15 @@
allowsScrolling:(BOOL)allowsScrolling marginWidth:(int)width marginHeight:(int)height
{
ASSERT(frame != nil);
- WebFrame *newFrame = [[frame controller] _createFrameNamed:frameName inParent:frame allowsScrolling:allowsScrolling];
+ WebFrame *newFrame = [[frame webView] _createFrameNamed:frameName inParent:frame allowsScrolling:allowsScrolling];
if (newFrame == nil) {
return nil;
}
[[newFrame _bridge] setRenderPart:childRenderPart];
- [[newFrame view] _setMarginWidth:width];
- [[newFrame view] _setMarginHeight:height];
+ [[newFrame frameView] _setMarginWidth:width];
+ [[newFrame frameView] _setMarginHeight:height];
[frame _loadURL:[NSURL _web_URLWithString:URL] intoChild:newFrame];
@@ -418,32 +418,32 @@
- (NSString *)userAgentForURL:(NSString *)URL
{
- return [[frame controller] userAgentForURL:[NSURL _web_URLWithString:URL]];
+ return [[frame webView] userAgentForURL:[NSURL _web_URLWithString:URL]];
}
- (NSView *)nextKeyViewOutsideWebFrameViews
{
- return [[[[frame controller] mainFrame] view] nextKeyView];
+ return [[[[frame webView] mainFrame] frameView] nextKeyView];
}
- (NSView *)previousKeyViewOutsideWebFrameViews
{
- return [[[[frame controller] mainFrame] view] previousKeyView];
+ return [[[[frame webView] mainFrame] frameView] previousKeyView];
}
- (BOOL)defersLoading
{
- return [[frame controller] defersCallbacks];
+ return [[frame webView] defersCallbacks];
}
- (void)setDefersLoading:(BOOL)defers
{
- [[frame controller] setDefersCallbacks:defers];
+ [[frame webView] setDefersCallbacks:defers];
}
- (void)setNeedsReapplyStyles
{
- NSView <WebDocumentView> *view = [[frame view] documentView];
+ NSView <WebDocumentView> *view = [[frame frameView] documentView];
if ([view isKindOfClass:[WebHTMLView class]]) {
[(WebHTMLView *)view setNeedsToApplyStyles:YES];
[view setNeedsLayout:YES];
@@ -453,7 +453,7 @@
- (void)setNeedsLayout
{
- NSView <WebDocumentView> *view = [[frame view] documentView];
+ NSView <WebDocumentView> *view = [[frame frameView] documentView];
[view setNeedsLayout:YES];
[view setNeedsDisplay:YES];
}
@@ -472,7 +472,7 @@
attributes:(NSDictionary *)attributes
baseURL:(NSURL *)baseURL
{
- WebHTMLView *docView = (WebHTMLView *)[[frame view] documentView];
+ WebHTMLView *docView = (WebHTMLView *)[[frame frameView] documentView];
ASSERT ([docView isKindOfClass:[WebHTMLView class]]);
@@ -668,7 +668,7 @@ static BOOL loggedObjectCacheSize = NO;
- (void)handleMouseDragged:(NSEvent *)event
{
- WebHTMLView *docView = (WebHTMLView *)[[frame view] documentView];
+ WebHTMLView *docView = (WebHTMLView *)[[frame frameView] documentView];
ASSERT ([docView isKindOfClass:[WebHTMLView class]]);
@@ -677,7 +677,7 @@ static BOOL loggedObjectCacheSize = NO;
- (void)handleAutoscrollForMouseDragged:(NSEvent *)event;
{
- WebHTMLView *docView = (WebHTMLView *)[[frame view] documentView];
+ WebHTMLView *docView = (WebHTMLView *)[[frame frameView] documentView];
ASSERT ([docView isKindOfClass:[WebHTMLView class]]);
@@ -686,7 +686,7 @@ static BOOL loggedObjectCacheSize = NO;
- (BOOL)mayStartDragWithMouseDragged:(NSEvent *)event
{
- WebHTMLView *docView = (WebHTMLView *)[[frame view] documentView];
+ WebHTMLView *docView = (WebHTMLView *)[[frame frameView] documentView];
ASSERT ([docView isKindOfClass:[WebHTMLView class]]);
@@ -695,7 +695,7 @@ static BOOL loggedObjectCacheSize = NO;
- (int)historyLength
{
- return [[[frame controller] backForwardList] backListCount];
+ return [[[frame webView] backForwardList] backListCount];
}
- (void)goBackOrForward:(int)distance
@@ -703,7 +703,7 @@ static BOOL loggedObjectCacheSize = NO;
if (distance == 0) {
return;
}
- WebController *controller = [frame controller];
+ WebView *controller = [frame webView];
WebBackForwardList *list = [controller backForwardList];
WebHistoryItem *item = [list entryAtIndex:distance];
if (!item) {
@@ -727,7 +727,7 @@ static BOOL loggedObjectCacheSize = NO;
static id <WebFormDelegate> formDelegate(WebBridge *self)
{
ASSERT(self->frame != nil);
- return [[self->frame controller] _formDelegate];
+ return [[self->frame webView] _formDelegate];
}
- (void)controlTextDidBeginEditing:(NSNotification *)obj
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 9f9ed5a..03d4a01 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -50,7 +50,7 @@
[newRequest setResponseCachePolicy:[[source request] responseCachePolicy]];
[newRequest setReferrer:referrer];
- WebController *_controller = [source _controller];
+ WebView *_controller = [source _controller];
[newRequest setCookiePolicyBaseURL:[[[[_controller mainFrame] dataSource] request] URL]];
[newRequest setUserAgent:[_controller userAgentForURL:URL]];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 9f9ed5a..03d4a01 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -50,7 +50,7 @@
[newRequest setResponseCachePolicy:[[source request] responseCachePolicy]];
[newRequest setReferrer:referrer];
- WebController *_controller = [source _controller];
+ WebView *_controller = [source _controller];
[newRequest setCookiePolicyBaseURL:[[[[_controller mainFrame] dataSource] request] URL]];
[newRequest setUserAgent:[_controller userAgentForURL:URL]];
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index e809b93..487db79 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -1,6 +1,4 @@
.objc_class_name_WebBackForwardList
-.objc_class_name_WebContentTypes
-.objc_class_name_WebController
.objc_class_name_WebCoreStatistics
.objc_class_name_WebDataSource
.objc_class_name_WebDebugDOMNode
@@ -9,6 +7,7 @@
.objc_class_name_WebDownload
.objc_class_name_WebFormDelegate
.objc_class_name_WebFrame
+.objc_class_name_WebFrameView
.objc_class_name_WebHTMLRepresentation
.objc_class_name_WebHTMLView
.objc_class_name_WebHistory
@@ -23,7 +22,7 @@
.objc_class_name_WebStringTruncator
.objc_class_name_WebTextView
.objc_class_name_WebURLsWithTitles
-.objc_class_name_WebFrameView
+.objc_class_name_WebView
_WebActionButtonKey
_WebActionButtonKey
_WebActionElementKey
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
index 4181ed1..f908d4a 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
@@ -5,7 +5,7 @@
#import <Foundation/Foundation.h>
- at class WebController;
+ at class WebView;
@class WebDataSource;
@class WebError;
@class WebResource;
@@ -21,7 +21,7 @@
WebResource *resource;
WebRequest *request;
@private
- WebController *controller;
+ WebView *controller;
WebResponse *response;
id identifier;
id resourceLoadDelegate;
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 17f8cbe..4197224 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -139,17 +139,17 @@
if (identifier == nil) {
// The identifier is released after the last callback, rather than in dealloc
// to avoid potential cycles.
- if ([resourceLoadDelegate respondsToSelector: @selector(controller:identifierForInitialRequest:fromDataSource:)])
- identifier = [[resourceLoadDelegate controller: controller identifierForInitialRequest:newRequest fromDataSource:dataSource] retain];
+ if ([resourceLoadDelegate respondsToSelector: @selector(webView:identifierForInitialRequest:fromDataSource:)])
+ identifier = [[resourceLoadDelegate webView: controller identifierForInitialRequest:newRequest fromDataSource:dataSource] retain];
else
- identifier = [[[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] controller:controller identifierForInitialRequest:newRequest fromDataSource:dataSource] retain];
+ identifier = [[[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] webView:controller identifierForInitialRequest:newRequest fromDataSource:dataSource] retain];
}
if (resourceLoadDelegate) {
- if ([resourceLoadDelegate respondsToSelector: @selector(controller:resource:willSendRequest:fromDataSource:)])
- newRequest = [resourceLoadDelegate controller:controller resource:identifier willSendRequest:newRequest fromDataSource:dataSource];
+ if ([resourceLoadDelegate respondsToSelector: @selector(webView:resource:willSendRequest:fromDataSource:)])
+ newRequest = [resourceLoadDelegate webView:controller resource:identifier willSendRequest:newRequest fromDataSource:dataSource];
else
- newRequest = [[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] controller:controller resource:identifier willSendRequest:newRequest fromDataSource:dataSource];
+ newRequest = [[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] webView:controller resource:identifier willSendRequest:newRequest fromDataSource:dataSource];
}
// Store a copy of the request.
@@ -185,7 +185,7 @@
response = r;
[dataSource _addResponse: r];
- [[controller _resourceLoadDelegateForwarder] controller:controller resource:identifier didReceiveResponse:r fromDataSource:dataSource];
+ [[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didReceiveResponse:r fromDataSource:dataSource];
}
- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
@@ -193,7 +193,7 @@
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
- [[controller _resourceLoadDelegateForwarder] controller:controller resource:identifier didReceiveContentLength:[data length] fromDataSource:dataSource];
+ [[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didReceiveContentLength:[data length] fromDataSource:dataSource];
}
- (void)resourceDidFinishLoading:(WebResource *)h
@@ -201,7 +201,7 @@
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
- [[controller _resourceLoadDelegateForwarder] controller:controller resource:identifier didFinishLoadingFromDataSource:dataSource];
+ [[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didFinishLoadingFromDataSource:dataSource];
ASSERT(currentURL);
[[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController:controller];
@@ -214,7 +214,7 @@
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
- [[controller _resourceLoadDelegateForwarder] controller:controller resource:identifier didFailLoadingWithError:result fromDataSource:dataSource];
+ [[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didFailLoadingWithError:result fromDataSource:dataSource];
// currentURL may be nil if the request was aborted
if (currentURL)
@@ -234,7 +234,7 @@
[[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController:controller];
if (error) {
- [[controller _resourceLoadDelegateForwarder] controller:controller resource:identifier didFailLoadingWithError:error fromDataSource:dataSource];
+ [[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didFailLoadingWithError:error fromDataSource:dataSource];
}
[self _releaseResources];
diff --git a/WebKit/WebView.subproj/WebContextMenuDelegate.h b/WebKit/WebView.subproj/WebContextMenuDelegate.h
index 5949c6a..968f0f0 100644
--- a/WebKit/WebView.subproj/WebContextMenuDelegate.h
+++ b/WebKit/WebView.subproj/WebContextMenuDelegate.h
@@ -5,7 +5,7 @@
Public header file.
*/
- at class WebController;
+ at class WebView;
/*!
@category WebContextMenuDelegate
@@ -41,7 +41,7 @@ enum {
@param defaultMenuItems An array of default NSMenuItems to include in all contextual menus.
@result An array of NSMenuItems to include in the contextual menu.
*/
-- (NSArray *)controller:(WebController *)controller contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems;
+- (NSArray *)webView:(WebView *)webView contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems;
@end
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index a8bb8fd..7a50723 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -1,5 +1,5 @@
/*
- WebController.h
+ WebView.h
Copyright 2001, 2002, Apple Computer, Inc.
Public header file.
@@ -9,8 +9,7 @@
@class WebBackForwardList;
@class WebHistoryItem;
- at class WebController;
- at class WebControllerPrivate;
+ at class WebViewPrivate;
@class WebDataSource;
@class WebDownload;
@class WebError;
@@ -19,32 +18,6 @@
@class WebPreferences;
@class WebFrameView;
- at interface WebContentTypes : NSObject
-/*!
- @method canShowMIMEType:
- @abstract Checks if the WebKit can show content of a certain MIME type.
- @param MIMEType The MIME type to check.
- @result YES if the WebKit can show content with MIMEtype.
-*/
-+ (BOOL)canShowMIMEType:(NSString *)MIMEType;
-
-/*!
- @method canShowFile:
- @abstract Checks if the WebKit can show the content of the file at the specified path.
- @param path The path of the file to check
- @result YES if the WebKit can show the content of the file at the specified path.
-*/
-+ (BOOL)canShowFile:(NSString *)path;
-
-/*!
- @method suggestedFileExtensionForMIMEType:
- @param MIMEType The MIME type to check.
- @result The extension based on the MIME type
-*/
-+ (NSString *)suggestedFileExtensionForMIMEType: (NSString *)MIMEType;
-
-
- at end
// These strings are keys into the element dictionary provided in
// the WebContextMenuDelegate's contextMenuItemsForElement and the WebControllerPolicyDelegate's clickPolicyForElement.
@@ -61,50 +34,59 @@ extern NSString *WebElementLinkTitleKey; // NSString of the title of the anchor
extern NSString *WebElementLinkLabelKey; // NSString of the text within the anchor
/*!
- @class WebController
- WebController manages the interaction between WebFrameViews and WebDataSources. Modification
- of the policies and behavior of the WebKit is largely managed by WebControllers and their
+ @class WebView
+ WebView manages the interaction between WebFrameViews and WebDataSources. Modification
+ of the policies and behavior of the WebKit is largely managed by WebViews and their
delegates.
<p>
Typical usage:
</p>
<pre>
- WebController *webController;
+ WebView *WebView;
WebFrame *mainFrame;
- webController = [[WebController alloc] initWithView: webFrameView];
- mainFrame = [webController mainFrame];
+ webView = [[WebController alloc] initWithFrame: NSMakeRect (0,0,640,480)];
+ mainFrame = [webView mainFrame];
[mainFrame loadRequest:request];
</pre>
- WebControllers have the following delegates: WebWindowOperationsDelegate,
+ WebViews have the following delegates: WebWindowOperationsDelegate,
WebResourceLoadDelegate, WebContextMenuDelegate, WebLocationChangeDelegate,
- and WebControllerPolicyDelegate.
+ and WebPolicyDelegate.
- WebKit depends on the WebController's WebWindowOperationsDelegate for all window
+ WebKit depends on the WebView's WebWindowOperationsDelegate for all window
related management, including opening new windows and controlling the user interface
elements in those windows.
WebResourceLoadDelegate is used to monitor the progress of resources as they are
loaded. This delegate may be used to present users with a progress monitor.
- WebController's WebContextMenuDelegate can customize the context menus that appear
+ WebView's WebContextMenuDelegate can customize the context menus that appear
over content managed by the WebKit.
The WebLocationChangeDelegate receives messages when the URL in a WebFrame is
changed.
- WebController's WebControllerPolicyDelegate can make determinations about how
+ WebView's WebPolicyDelegate can make determinations about how
content should be handled, based on the resource's URL and MIME type.
*/
- at interface WebController : NSView
+ at interface WebView : NSView
{
@private
- WebControllerPrivate *_private;
+ WebViewPrivate *_private;
}
/*!
+ @method canShowMIMEType:
+ @abstract Checks if the WebKit can show content of a certain MIME type.
+ @param MIMEType The MIME type to check.
+ @result YES if the WebKit can show content with MIMEtype.
+*/
++ (BOOL)canShowMIMEType:(NSString *)MIMEType;
+
+
+/*!
@method initWithView:
@abstract This method is a convenience equivalent to initWithView:view frameName:nil groupName:nil
@param view The view to use.
@@ -113,15 +95,15 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
/*!
@method initWithView:frameName:setName:
- @abstract The designated initializer for WebController.
- @discussion Initialize a WebController with the supplied parameters. This method will
+ @abstract The designated initializer for WebView.
+ @discussion Initialize a WebView with the supplied parameters. This method will
create a main WebFrame with the view. Passing a top level frame name is useful if you
handle a targetted frame navigation that would normally open a window in some other
- way that still ends up creating a new WebController.
+ way that still ends up creating a new WebView.
@param view The main view to be associated with the controller. May be nil.
@param frameName The name to use for the top level frame. May be nil.
@param groupName The name of the controller set to which this controller will be added. May be nil.
- @result Returns an initialized WebController.
+ @result Returns an initialized WebView.
*/
- initWithView: (WebFrameView *)view frameName: (NSString *)frameName groupName: (NSString *)name ;
@@ -197,15 +179,15 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
/*!
@method setPolicyDelegate:
- @abstract Set the controller's WebControllerPolicyDelegate delegate.
- @param delegate The WebControllerPolicyDelegate to set as the delegate.
+ @abstract Set the controller's WebPolicyDelegate delegate.
+ @param delegate The WebPolicyDelegate to set as the delegate.
*/
- (void)setPolicyDelegate: (id)delegate;
/*!
@method policyDelegate
- @abstract Return the controller's WebControllerPolicyDelegate.
- @result The controller's WebControllerPolicyDelegate.
+ @abstract Return the controller's WebPolicyDelegate.
+ @result The controller's WebPolicyDelegate.
*/
- (id)policyDelegate;
@@ -357,7 +339,7 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
@end
- at interface WebController (WebIBActions)
+ at interface WebView (WebIBActions)
- (IBAction)stopLoading:(id)sender;
- (IBAction)goBack:(id)sender;
- (IBAction)goForward:(id)sender;
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index b92f6e0..d63ba4b 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -1,5 +1,5 @@
/*
- WebController.m
+ WebView.m
Copyright 2001, 2002 Apple, Inc. All rights reserved.
*/
@@ -55,7 +55,8 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
- at implementation WebContentTypes
+
+ at implementation WebView
+ (BOOL)canShowMIMEType:(NSString *)MIMEType
{
@@ -70,27 +71,10 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
return NO;
}
-+ (BOOL)canShowFile:(NSString *)path
-{
- NSString *MIMEType;
-
- MIMEType = [WebController _MIMETypeForFile:path];
- return [[self class] canShowMIMEType:MIMEType];
-}
-
-+ (NSString *)suggestedFileExtensionForMIMEType: (NSString *)type
-{
- return [[WebFileTypeMappings sharedMappings] preferredExtensionForMIMEType:type];
-}
-
- at end
-
- at implementation WebController
-
- (void)_commonInitialization: (WebFrameView *)wv frameName:(NSString *)frameName groupName:(NSString *)groupName
{
- _private = [[WebControllerPrivate alloc] init];
- _private->mainFrame = [[WebFrame alloc] initWithName: frameName webFrameView: wv controller: self];
+ _private = [[WebViewPrivate alloc] init];
+ _private->mainFrame = [[WebFrame alloc] initWithName: frameName webFrameView: wv webView: self];
_private->controllerSetName = [groupName retain];
if (_private->controllerSetName != nil) {
[WebControllerSets addController:self toSetNamed:_private->controllerSetName];
@@ -114,7 +98,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
- initWithFrame: (NSRect)f
{
[super initWithFrame: f];
- WebFrameView *wv = [[WebFrameView alloc] initWithFrame: f];
+ WebFrameView *wv = [[WebFrameView alloc] initWithFrame: NSMakeRect(0,0,f.size.width,f.size.height)];
[wv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[self addSubview: wv];
[self _commonInitialization: wv frameName:nil groupName:nil];
@@ -327,7 +311,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
- (BOOL)supportsTextEncoding
{
- id documentView = [[[self mainFrame] view] documentView];
+ id documentView = [[[self mainFrame] frameView] documentView];
return [documentView conformsToProtocol:@protocol(WebDocumentText)]
&& [documentView supportsTextEncoding];
}
@@ -421,7 +405,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
// FIXME: Some day we will start reporting the actual CPU here instead of hardcoding PPC.
NSString *language = [NSUserDefaults _web_preferredLanguageCode];
- id sourceVersion = [[NSBundle bundleForClass:[WebController class]]
+ id sourceVersion = [[NSBundle bundleForClass:[WebView class]]
objectForInfoDictionaryKey:(id)kCFBundleVersionKey];
NSString *applicationName = _private->applicationNameForUserAgent;
@@ -462,7 +446,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
@end
- at implementation WebController (WebIBActions)
+ at implementation WebView (WebIBActions)
- (IBAction)takeStringURLFrom: sender
{
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index 46674eb..2c0404e 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -1,5 +1,5 @@
/*
- WebControllerPolicyDelegate.h
+ WebPolicyDelegate.h
Copyright 2002, Apple, Inc. All rights reserved.
Public header file.
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
- at class WebController;
+ at class WebView;
@class WebError;
@class WebFrame;
@class WebPolicyPrivate;
@@ -116,7 +116,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
@discussion This method will be called before loading starts, and
on every redirect.
*/
-- (void)controller:(WebController *)c decideNavigationPolicyForAction:(NSDictionary *)actionInformation
+- (void)webView:(WebView *)webView decideNavigationPolicyForAction:(NSDictionary *)actionInformation
andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(id<WebPolicyDecisionListener>)listener;
@@ -137,7 +137,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
will be called with a WebNavigationType of WebNavigationTypeOther
in its action. This is to avoid possible confusion about the modifiers.
*/
-- (void)controller:(WebController *)c decideNewWindowPolicyForAction:(NSDictionary *)actionInformation
+- (void)webView:(WebView *)webView decideNewWindowPolicyForAction:(NSDictionary *)actionInformation
andRequest:(WebRequest *)request
newFrameName:(NSString *)frameName
decisionListener:(id<WebPolicyDecisionListener>)listener;
@@ -150,7 +150,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
@param frame The frame which is loading the URL.
@param listener The object to call when the decision is made
*/
-- (void)controller:(WebController *)c decideContentPolicyForMIMEType:(NSString *)type
+- (void)webView:(WebView *)webView decideContentPolicyForMIMEType:(NSString *)type
andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(id<WebPolicyDecisionListener>)listener;
@@ -163,6 +163,6 @@ extern NSString *WebActionOriginalURLKey; // NSURL
@param URL The URL of the resource for which a particular action was requested but failed.
@param frame The frame in which the policy could not be implemented.
*/
-- (void)controller:(WebController *)c unableToImplementPolicyWithError:(WebError *)error inFrame:(WebFrame *)frame;
+- (void)webView:(WebView *)webView unableToImplementPolicyWithError:(WebError *)error inFrame:(WebFrame *)frame;
@end
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index d1dd150..8c5c050 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -1,6 +1,6 @@
/*
- WebController.m
- Copyright 2001, Apple, Inc. All rights reserved.
+ WebViewPrivate.m
+ Copyright 2001, Apple, Inc. All rights reserved.
*/
#import <WebKit/WebController.h>
@@ -17,7 +17,7 @@ enum { NumUserAgentStringTypes = WinIE + 1 };
#define NUM_LOCATION_CHANGE_DELEGATE_SELECTORS 10
- at interface WebControllerPrivate : NSObject
+ at interface WebViewPrivate : NSObject
{
@public
WebFrame *mainFrame;
@@ -52,7 +52,22 @@ enum { NumUserAgentStringTypes = WinIE + 1 };
}
@end
- at interface WebController (WebPrivate)
+ at interface WebView (WebPrivate)
+
+/*!
+ @method canShowFile:
+ @abstract Checks if the WebKit can show the content of the file at the specified path.
+ @param path The path of the file to check
+ @result YES if the WebKit can show the content of the file at the specified path.
+*/
++ (BOOL)canShowFile:(NSString *)path;
+
+/*!
+ @method suggestedFileExtensionForMIMEType:
+ @param MIMEType The MIME type to check.
+ @result The extension based on the MIME type
+*/
++ (NSString *)suggestedFileExtensionForMIMEType: (NSString *)MIMEType;
/*!
@method frameForDataSource:
@@ -92,7 +107,7 @@ enum { NumUserAgentStringTypes = WinIE + 1 };
- (WebFrame *)_findFrameInThisWindowNamed: (NSString *)name;
- (WebFrame *)_findFrameNamed: (NSString *)name;
-- (WebController *)_openNewWindowWithRequest:(WebRequest *)request;
+- (WebView *)_openNewWindowWithRequest:(WebRequest *)request;
- (NSMenu *)_menuForElement:(NSDictionary *)element;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index c4b904d..f364157 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -1,6 +1,6 @@
/*
WebControllerPrivate.m
- Copyright (c) 2001, 2002, Apple, Inc. All rights reserved.
+ Copyright (c) 2001, 2002, Apple, Inc. All rights reserved.
*/
#import <WebKit/WebBackForwardList.h>
@@ -34,7 +34,7 @@
#import <WebCore/WebCoreSettings.h>
- at implementation WebControllerPrivate
+ at implementation WebViewPrivate
- init
{
@@ -54,7 +54,7 @@
int i, count;
[[aFrame dataSource] _setController: nil];
- [[aFrame view] _setController: nil];
+ [[aFrame frameView] _setController: nil];
[aFrame _setController: nil];
// Walk the frame tree, niling the controller.
@@ -92,7 +92,21 @@
@end
- at implementation WebController (WebPrivate)
+ at implementation WebView (WebPrivate)
+
++ (BOOL)canShowFile:(NSString *)path
+{
+ NSString *MIMEType;
+
+ MIMEType = [WebView _MIMETypeForFile:path];
+ return [[self class] canShowMIMEType:MIMEType];
+}
+
++ (NSString *)suggestedFileExtensionForMIMEType: (NSString *)type
+{
+ return [[WebFileTypeMappings sharedMappings] preferredExtensionForMIMEType:type];
+}
+
- (WebFrame *)_createFrameNamed:(NSString *)fname inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling
{
@@ -101,7 +115,7 @@
[childView _setController:self];
[childView setAllowsScrolling:allowsScrolling];
- WebFrame *newFrame = [[WebFrame alloc] initWithName:fname webFrameView:childView controller:self];
+ WebFrame *newFrame = [[WebFrame alloc] initWithName:fname webFrameView:childView webView:self];
[childView release];
@@ -284,7 +298,7 @@
// Try other controllers in the same set
if (_private->controllerSetName != nil) {
NSEnumerator *enumerator = [WebControllerSets controllersInSetNamed:_private->controllerSetName];
- WebController *controller;
+ WebView *controller;
while ((controller = [enumerator nextObject]) != nil && frame == nil) {
frame = [controller _findFrameInThisWindowNamed:name];
}
@@ -293,17 +307,17 @@
return frame;
}
-- (WebController *)_openNewWindowWithRequest:(WebRequest *)request
+- (WebView *)_openNewWindowWithRequest:(WebRequest *)request
{
id wd = [self windowOperationsDelegate];
- WebController *newWindowController = nil;
- if ([wd respondsToSelector:@selector(controller:createWindowWithRequest:)])
- newWindowController = [wd controller:self createWindowWithRequest:request];
+ WebView *newWindowController = nil;
+ if ([wd respondsToSelector:@selector(webView:createWindowWithRequest:)])
+ newWindowController = [wd webView:self createWindowWithRequest:request];
else {
- newWindowController = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] controller:self createWindowWithRequest: request];
+ newWindowController = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] webView:self createWindowWithRequest: request];
}
- [[newWindowController _windowOperationsDelegateForwarder] controllerShowWindow: self];
+ [[newWindowController _windowOperationsDelegateForwarder] webViewShowWindow: self];
return newWindowController;
}
@@ -311,7 +325,7 @@
- (NSMenu *)_menuForElement:(NSDictionary *)element
{
NSArray *defaultMenuItems = [_private->defaultContextMenuDelegate
- controller:self contextMenuItemsForElement:element defaultMenuItems:nil];
+ webView:self contextMenuItemsForElement:element defaultMenuItems:nil];
NSArray *menuItems = defaultMenuItems;
NSMenu *menu = nil;
unsigned i;
@@ -319,8 +333,8 @@
if (_private->contextMenuDelegate) {
id cd = _private->contextMenuDelegate;
- if ([cd respondsToSelector:@selector(controller:contextMenuItemsForElement:defaultMenuItems:)])
- menuItems = [cd controller:self contextMenuItemsForElement:element defaultMenuItems:defaultMenuItems];
+ if ([cd respondsToSelector:@selector(webView:contextMenuItemsForElement:defaultMenuItems:)])
+ menuItems = [cd webView:self contextMenuItemsForElement:element defaultMenuItems:defaultMenuItems];
}
if (menuItems && [menuItems count] > 0) {
@@ -341,7 +355,7 @@
// for that case.
if (dictionary && _private->lastElementWasNonNil) {
- [[self _windowOperationsDelegateForwarder] controller:self mouseDidMoveOverElement:dictionary modifierFlags:modifierFlags];
+ [[self _windowOperationsDelegateForwarder] webView:self mouseDidMoveOverElement:dictionary modifierFlags:modifierFlags];
}
_private->lastElementWasNonNil = dictionary != nil;
}
@@ -473,7 +487,7 @@
int i, count;
WebFrame *result, *aFrame;
- if ([frame view] == aView)
+ if ([frame frameView] == aView)
return frame;
frames = [frame children];
diff --git a/WebKit/WebView.subproj/WebControllerSets.h b/WebKit/WebView.subproj/WebControllerSets.h
index 25da98d..fab573f 100644
--- a/WebKit/WebView.subproj/WebControllerSets.h
+++ b/WebKit/WebView.subproj/WebControllerSets.h
@@ -6,11 +6,11 @@
#import <Foundation/Foundation.h>
- at class WebController;
+ at class WebView;
@interface WebControllerSets : NSObject
-+(void)addController:(WebController *)controller toSetNamed:(NSString *)name;
-+(void)removeController:(WebController *)controller fromSetNamed:(NSString *)name;
++(void)addController:(WebView *)controller toSetNamed:(NSString *)name;
++(void)removeController:(WebView *)controller fromSetNamed:(NSString *)name;
+(NSEnumerator *)controllersInSetNamed:(NSString *)name;
@end
diff --git a/WebKit/WebView.subproj/WebControllerSets.m b/WebKit/WebView.subproj/WebControllerSets.m
index d099bf4..67e1b80 100644
--- a/WebKit/WebView.subproj/WebControllerSets.m
+++ b/WebKit/WebView.subproj/WebControllerSets.m
@@ -18,7 +18,7 @@ CFHash
NSMutableDictionary *sets = nil;
-+(void)addController:(WebController *)controller toSetNamed: (NSString *)name
++(void)addController:(WebView *)controller toSetNamed: (NSString *)name
{
if (sets == nil) {
sets = [[NSMutableDictionary alloc] init];
@@ -36,7 +36,7 @@ NSMutableDictionary *sets = nil;
CFSetSetValue(set, controller);
}
-+(void)removeController:(WebController *)controller fromSetNamed: (NSString *)name
++(void)removeController:(WebView *)controller fromSetNamed: (NSString *)name
{
CFMutableSetRef set = (CFMutableSetRef)[sets objectForKey:name];
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index dc2eca0..33b21cf 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -7,7 +7,6 @@
#import <Cocoa/Cocoa.h>
- at class WebController;
@class WebDataSourcePrivate;
@class WebError;
@class WebFrame;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index a80641d..e5a4fbe 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -15,6 +15,7 @@
@class WebRequest;
@class WebResponse;
@class WebSubresourceClient;
+ at class WebView;
@protocol WebDocumentRepresentation;
@@ -25,7 +26,7 @@
id <WebDocumentRepresentation> representation;
- WebController *controller;
+ WebView *controller;
// A reference to actual request used to create the data source.
// This should only be used by the resourceLoadDelegate's
@@ -118,10 +119,10 @@
- (void)_startLoading;
- (void)_stopLoading;
- (NSURL *)_URL;
-- (WebController *)_controller;
+- (WebView *)_controller;
- (Class)_representationClass;
- (void)_setRepresentation:(id<WebDocumentRepresentation>)representation;
-- (void)_setController:(WebController *)controller;
+- (void)_setController:(WebView *)controller;
- (void)_startLoading: (NSDictionary *)pageCache;
- (void)_stopLoadingInternal;
- (BOOL)_isStopping;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 21ab091..449d25e 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -78,7 +78,7 @@
@implementation WebDataSource (WebPrivate)
-- (WebController *)_controller
+- (WebView *)_controller
{
return _private->controller;
}
@@ -121,7 +121,7 @@
[self _setLoading:_private->mainClient || [_private->subresourceClients count]];
}
-- (void)_setController: (WebController *)controller
+- (void)_setController: (WebView *)controller
{
if (_private->loading) {
[controller retain];
@@ -179,7 +179,7 @@
[self _setLoading:YES];
- [[_private->controller _locationChangeDelegateForwarder] controller: _private->controller locationChangeStartedForDataSource:self];
+ [[_private->controller _locationChangeDelegateForwarder] webView: _private->controller locationChangeStartedForDataSource:self];
if (pageCache){
_private->loadingFromPageCache = YES;
@@ -188,7 +188,7 @@
_private->loadingFromPageCache = NO;
_private->mainClient = [[WebMainResourceClient alloc] initWithDataSource:self];
id identifier;
- identifier = [[_private->controller resourceLoadDelegate] controller:_private->controller identifierForInitialRequest:_private->originalRequest fromDataSource:self];
+ identifier = [[_private->controller resourceLoadDelegate] webView:_private->controller identifierForInitialRequest:_private->originalRequest fromDataSource:self];
[_private->mainClient setIdentifier: identifier];
[[self webFrame] _addExtraFieldsToRequest:_private->request alwaysFromRequest: NO];
if (![_private->mainClient loadWithRequest:_private->request]) {
@@ -305,7 +305,7 @@
// Must update the entries in the back-forward list too.
[_private->ourBackForwardItems makeObjectsPerformSelector:@selector(setTitle:) withObject:_private->pageTitle];
- [[_private->controller _locationChangeDelegateForwarder] controller: _private->controller receivedPageTitle:_private->pageTitle forDataSource:self];
+ [[_private->controller _locationChangeDelegateForwarder] webView: _private->controller receivedPageTitle:_private->pageTitle forDataSource:self];
}
}
@@ -331,7 +331,7 @@
// Only send serverRedirectedForDataSource: if URL changed.
if (![[oldRequest URL] isEqual: [request URL]]) {
LOG(Redirect, "Server redirect to: %@", [request URL]);
- [[_private->controller _locationChangeDelegateForwarder] controller: _private->controller serverRedirectedForDataSource:self];
+ [[_private->controller _locationChangeDelegateForwarder] webView: _private->controller serverRedirectedForDataSource:self];
}
[oldRequest release];
@@ -420,8 +420,8 @@
id dview;
for (i = 0; i < [subFrames count]; i++){
subFrame = [subFrames objectAtIndex: i];
- dview = [[subFrame view] documentView];
- if ([[subFrame view] isDocumentHTML])
+ dview = [[subFrame frameView] documentView];
+ if ([[subFrame frameView] isDocumentHTML])
[dview _adjustFrames];
[dview setNeedsDisplay: YES];
[[subFrame dataSource] _layoutChildren];
@@ -443,7 +443,7 @@
[WebTextRepresentation class], @"application/x-javascript",
nil];
- NSEnumerator *enumerator = [[WebController _supportedImageMIMETypes] objectEnumerator];
+ NSEnumerator *enumerator = [[WebView _supportedImageMIMETypes] objectEnumerator];
NSString *mime;
while ((mime = [enumerator nextObject]) != nil) {
[repTypes setObject:[WebImageRepresentation class] forKey:mime];
@@ -537,7 +537,7 @@
[self _commitIfReady];
[[self representation] receivedData:data withDataSource:self];
- [[[[self webFrame] view] documentView] dataSourceUpdated:self];
+ [[[[self webFrame] frameView] documentView] dataSourceUpdated:self];
}
- (void)_finishedLoading
@@ -567,7 +567,7 @@
[iconDB _setIconURL:[iconURL absoluteString] forURL:[[[self _originalRequest] URL] absoluteString]];
NSImage *icon = [iconDB iconForURL:[[self _URL] absoluteString] withSize:WebIconSmallSize];
- [[_private->controller _locationChangeDelegateForwarder] controller: _private->controller receivedPageIcon:icon forDataSource:self];
+ [[_private->controller _locationChangeDelegateForwarder] webView: _private->controller receivedPageIcon:icon forDataSource:self];
}
- (void)iconLoader:(WebIconLoader *)iconLoader receivedPageIcon:(NSImage *)icon;
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 9113073..3d78758 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -94,7 +94,7 @@ static WebDefaultContextMenuDelegate *sharedDelegate = nil;
return [menuItem autorelease];
}
-- (NSArray *)controller: (WebController *)wv contextMenuItemsForElement: (NSDictionary *)theElement defaultMenuItems: (NSArray *)defaultMenuItems
+- (NSArray *)webView: (WebView *)wv contextMenuItemsForElement: (NSDictionary *)theElement defaultMenuItems: (NSArray *)defaultMenuItems
{
NSMutableArray *menuItems = [NSMutableArray array];
NSURL *linkURL, *imageURL;
@@ -128,7 +128,7 @@ static WebDefaultContextMenuDelegate *sharedDelegate = nil;
} else {
WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
- if(webFrame != [[webFrame controller] mainFrame]){
+ if(webFrame != [[webFrame webView] mainFrame]){
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagOpenFrameInNewWindow]];
}
}
@@ -140,7 +140,7 @@ static WebDefaultContextMenuDelegate *sharedDelegate = nil;
- (void)openNewWindowWithURL:(NSURL *)URL
{
WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
- WebController *controller = [webFrame controller];
+ WebView *controller = [webFrame webView];
WebRequest *request = [WebRequest requestWithURL:URL];
NSString *referrer = [[webFrame _bridge] referrer];
@@ -154,7 +154,7 @@ static WebDefaultContextMenuDelegate *sharedDelegate = nil;
- (void)downloadURL:(NSURL *)URL
{
WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
- WebController *controller = [webFrame controller];
+ WebView *controller = [webFrame webView];
[controller _downloadURL:URL];
}
diff --git a/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
index 7ec17a1..7b37b65 100644
--- a/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
@@ -22,22 +22,22 @@ static WebDefaultLocationChangeDelegate *sharedDelegate = nil;
return sharedDelegate;
}
-- (void)controller: (WebController *)wv locationChangeStartedForDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv locationChangeStartedForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv serverRedirectedForDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv serverRedirectedForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv locationChangeCommittedForDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv locationChangeCommittedForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv locationChangedWithinPageForDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv locationChangedWithinPageForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
-- (void)controller: (WebController *)wv clientRedirectCancelledForFrame:(WebFrame *)frame { }
+- (void)webView: (WebView *)wv clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
+- (void)webView: (WebView *)wv clientRedirectCancelledForFrame:(WebFrame *)frame { }
@end
diff --git a/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.m b/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.m
index 7ec17a1..7b37b65 100644
--- a/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.m
@@ -22,22 +22,22 @@ static WebDefaultLocationChangeDelegate *sharedDelegate = nil;
return sharedDelegate;
}
-- (void)controller: (WebController *)wv locationChangeStartedForDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv locationChangeStartedForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv serverRedirectedForDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv serverRedirectedForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv locationChangeCommittedForDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv locationChangeCommittedForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv locationChangedWithinPageForDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv locationChangedWithinPageForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)wv clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
-- (void)controller: (WebController *)wv clientRedirectCancelledForFrame:(WebFrame *)frame { }
+- (void)webView: (WebView *)wv clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
+- (void)webView: (WebView *)wv clientRedirectCancelledForFrame:(WebFrame *)frame { }
@end
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 246e3c5..b1cc132 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -27,13 +27,13 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
return sharedDelegate;
}
-- (void)controller: (WebController *)wv unableToImplementPolicyWithError:(WebError *)error inFrame:(WebFrame *)frame
+- (void)webView: (WebView *)wv unableToImplementPolicyWithError:(WebError *)error inFrame:(WebFrame *)frame
{
ERROR("called unableToImplementPolicyWithError:%@ inFrame:%@", error, frame);
}
-- (void)controller: (WebController *)wv decideContentPolicyForMIMEType:(NSString *)type
+- (void)webView: (WebView *)wv decideContentPolicyForMIMEType:(NSString *)type
andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(WebPolicyDecisionListener *)listener;
@@ -44,19 +44,19 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
if (isDirectory) {
[listener ignore];
- } else if([WebContentTypes canShowMIMEType:type]) {
+ } else if([WebView canShowMIMEType:type]) {
[listener use];
} else{
[listener ignore];
}
- } else if ([WebContentTypes canShowMIMEType:type]) {
+ } else if ([WebView canShowMIMEType:type]) {
[listener use];
} else {
[listener ignore];
}
}
-- (void)controller: (WebController *)wv decideNavigationPolicyForAction:(NSDictionary *)actionInformation
+- (void)webView: (WebView *)wv decideNavigationPolicyForAction:(NSDictionary *)actionInformation
andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(WebPolicyDecisionListener *)listener
@@ -73,7 +73,7 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
}
}
-- (void)controller: (WebController *)wv decideNewWindowPolicyForAction:(NSDictionary *)actionInformation
+- (void)webView: (WebView *)wv decideNewWindowPolicyForAction:(NSDictionary *)actionInformation
andRequest:(WebRequest *)request
newFrameName:(NSString *)frameName
decisionListener:(WebPolicyDecisionListener *)listener
diff --git a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
index 3b43256..a163c35 100644
--- a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
@@ -3,14 +3,15 @@
Copyright 2003, Apple, Inc. All rights reserved.
*/
+#import <WebFoundation/WebError.h>
#import <WebFoundation/WebRequest.h>
#import <WebFoundation/WebResource.h>
#import <WebFoundation/WebResponse.h>
-#import <WebFoundation/WebError.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
#import <WebKit/WebPluginError.h>
+#import <WebKit/WebController.h>
@implementation WebDefaultResourceLoadDelegate
@@ -27,33 +28,33 @@ static WebDefaultResourceLoadDelegate *sharedDelegate = nil;
return sharedDelegate;
}
-- controller: (WebController *)wv identifierForInitialRequest: (WebRequest *)request fromDataSource: (WebDataSource *)dataSource
+- webView: (WebView *)wv identifierForInitialRequest: (WebRequest *)request fromDataSource: (WebDataSource *)dataSource
{
return [[[NSObject alloc] init] autorelease];
}
--(WebRequest *)controller: (WebController *)wv resource:identifier willSendRequest: (WebRequest *)newRequest fromDataSource:(WebDataSource *)dataSource
+-(WebRequest *)webView: (WebView *)wv resource:identifier willSendRequest: (WebRequest *)newRequest fromDataSource:(WebDataSource *)dataSource
{
return newRequest;
}
--(void)controller: (WebController *)wv resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource
+-(void)webView: (WebView *)wv resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource
{
}
--(void)controller: (WebController *)wv resource:identifier didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource
+-(void)webView: (WebView *)wv resource:identifier didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource
{
}
--(void)controller: (WebController *)wv resource:identifier didFinishLoadingFromDataSource:(WebDataSource *)dataSource
+-(void)webView: (WebView *)wv resource:identifier didFinishLoadingFromDataSource:(WebDataSource *)dataSource
{
}
--(void)controller: (WebController *)wv resource:identifier didFailLoadingWithError:(WebError *)error fromDataSource:(WebDataSource *)dataSource
+-(void)webView: (WebView *)wv resource:identifier didFailLoadingWithError:(WebError *)error fromDataSource:(WebDataSource *)dataSource
{
}
-- (void)controller: (WebController *)wv pluginFailedWithError:(WebPluginError *)error dataSource:(WebDataSource *)dataSource
+- (void)webView: (WebView *)wv pluginFailedWithError:(WebPluginError *)error dataSource:(WebDataSource *)dataSource
{
}
diff --git a/WebKit/WebView.subproj/WebDefaultUIDelegate.m b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
index d7492ed..ec9aa54 100644
--- a/WebKit/WebView.subproj/WebDefaultUIDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
@@ -29,104 +29,104 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
}
-- (WebController *)controller: (WebController *)wv createWindowWithRequest:(WebRequest *)request;
+- (WebView *)webView: (WebView *)wv createWindowWithRequest:(WebRequest *)request;
{
return nil;
}
-- (void)controllerShowWindow: (WebController *)wv;
+- (void)webViewShowWindow: (WebView *)wv;
{
}
-- (void)controllerShowWindowBehindFrontmost: (WebController *)wv;
+- (void)webViewShowWindowBehindFrontmost: (WebView *)wv;
{
}
-- (void)controllerCloseWindow: (WebController *)wv;
+- (void)webViewCloseWindow: (WebView *)wv;
{
}
-- (void)controllerFocusWindow: (WebController *)wv;
+- (void)webViewFocusWindow: (WebView *)wv;
{
}
-- (void)controllerUnfocusWindow: (WebController *)wv;
+- (void)webViewUnfocusWindow: (WebView *)wv;
{
}
-- (NSResponder *)controllerFirstResponderInWindow: (WebController *)wv;
+- (NSResponder *)webViewFirstResponderInWindow: (WebView *)wv;
{
return nil;
}
-- (void)controller: (WebController *)wv makeFirstResponderInWindow:(NSResponder *)responder;
+- (void)webView: (WebView *)wv makeFirstResponderInWindow:(NSResponder *)responder;
{
}
-- (void)controller: (WebController *)wv setStatusText:(NSString *)text;
+- (void)webView: (WebView *)wv setStatusText:(NSString *)text;
{
}
-- (NSString *)controllerStatusText: (WebController *)wv;
+- (NSString *)webViewStatusText: (WebView *)wv;
{
return nil;
}
-- (void)controller: (WebController *)wv mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
+- (void)webView: (WebView *)wv mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
{
}
-- (BOOL)controllerAreToolbarsVisible: (WebController *)wv;
+- (BOOL)webViewAreToolbarsVisible: (WebView *)wv;
{
return NO;
}
-- (void)controller: (WebController *)wv setToolbarsVisible:(BOOL)visible;
+- (void)webView: (WebView *)wv setToolbarsVisible:(BOOL)visible;
{
}
-- (BOOL)controllerIsStatusBarVisible: (WebController *)wv;
+- (BOOL)webViewIsStatusBarVisible: (WebView *)wv;
{
return NO;
}
-- (void)controller: (WebController *)wv setStatusBarVisible:(BOOL)visible;
+- (void)webView: (WebView *)wv setStatusBarVisible:(BOOL)visible;
{
}
-- (BOOL)controllerIsResizable: (WebController *)wv;
+- (BOOL)webViewIsResizable: (WebView *)wv;
{
return NO;
}
-- (void)controller: (WebController *)wv setResizable:(BOOL)resizable;
+- (void)webView: (WebView *)wv setResizable:(BOOL)resizable;
{
}
-- (void)controller: (WebController *)wv setFrame:(NSRect)frame;
+- (void)webView: (WebView *)wv setFrame:(NSRect)frame;
{
}
-- (NSRect)controllerFrame: (WebController *)wv;
+- (NSRect)webViewFrame: (WebView *)wv;
{
return NSMakeRect (0,0,0,0);
}
-- (void)controller: (WebController *)wv runJavaScriptAlertPanelWithMessage:(NSString *)message;
+- (void)webView: (WebView *)wv runJavaScriptAlertPanelWithMessage:(NSString *)message;
{
}
-- (BOOL)controller: (WebController *)wv runJavaScriptConfirmPanelWithMessage:(NSString *)message
+- (BOOL)webView: (WebView *)wv runJavaScriptConfirmPanelWithMessage:(NSString *)message
{
return NO;
}
-- (NSString *)controller: (WebController *)wv runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText
+- (NSString *)webView: (WebView *)wv runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText
{
return nil;
}
-- (void)controller: (WebController *)wv runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener
+- (void)webView: (WebView *)wv runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener
{
}
diff --git a/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m b/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
index d7492ed..ec9aa54 100644
--- a/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
@@ -29,104 +29,104 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
}
-- (WebController *)controller: (WebController *)wv createWindowWithRequest:(WebRequest *)request;
+- (WebView *)webView: (WebView *)wv createWindowWithRequest:(WebRequest *)request;
{
return nil;
}
-- (void)controllerShowWindow: (WebController *)wv;
+- (void)webViewShowWindow: (WebView *)wv;
{
}
-- (void)controllerShowWindowBehindFrontmost: (WebController *)wv;
+- (void)webViewShowWindowBehindFrontmost: (WebView *)wv;
{
}
-- (void)controllerCloseWindow: (WebController *)wv;
+- (void)webViewCloseWindow: (WebView *)wv;
{
}
-- (void)controllerFocusWindow: (WebController *)wv;
+- (void)webViewFocusWindow: (WebView *)wv;
{
}
-- (void)controllerUnfocusWindow: (WebController *)wv;
+- (void)webViewUnfocusWindow: (WebView *)wv;
{
}
-- (NSResponder *)controllerFirstResponderInWindow: (WebController *)wv;
+- (NSResponder *)webViewFirstResponderInWindow: (WebView *)wv;
{
return nil;
}
-- (void)controller: (WebController *)wv makeFirstResponderInWindow:(NSResponder *)responder;
+- (void)webView: (WebView *)wv makeFirstResponderInWindow:(NSResponder *)responder;
{
}
-- (void)controller: (WebController *)wv setStatusText:(NSString *)text;
+- (void)webView: (WebView *)wv setStatusText:(NSString *)text;
{
}
-- (NSString *)controllerStatusText: (WebController *)wv;
+- (NSString *)webViewStatusText: (WebView *)wv;
{
return nil;
}
-- (void)controller: (WebController *)wv mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
+- (void)webView: (WebView *)wv mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
{
}
-- (BOOL)controllerAreToolbarsVisible: (WebController *)wv;
+- (BOOL)webViewAreToolbarsVisible: (WebView *)wv;
{
return NO;
}
-- (void)controller: (WebController *)wv setToolbarsVisible:(BOOL)visible;
+- (void)webView: (WebView *)wv setToolbarsVisible:(BOOL)visible;
{
}
-- (BOOL)controllerIsStatusBarVisible: (WebController *)wv;
+- (BOOL)webViewIsStatusBarVisible: (WebView *)wv;
{
return NO;
}
-- (void)controller: (WebController *)wv setStatusBarVisible:(BOOL)visible;
+- (void)webView: (WebView *)wv setStatusBarVisible:(BOOL)visible;
{
}
-- (BOOL)controllerIsResizable: (WebController *)wv;
+- (BOOL)webViewIsResizable: (WebView *)wv;
{
return NO;
}
-- (void)controller: (WebController *)wv setResizable:(BOOL)resizable;
+- (void)webView: (WebView *)wv setResizable:(BOOL)resizable;
{
}
-- (void)controller: (WebController *)wv setFrame:(NSRect)frame;
+- (void)webView: (WebView *)wv setFrame:(NSRect)frame;
{
}
-- (NSRect)controllerFrame: (WebController *)wv;
+- (NSRect)webViewFrame: (WebView *)wv;
{
return NSMakeRect (0,0,0,0);
}
-- (void)controller: (WebController *)wv runJavaScriptAlertPanelWithMessage:(NSString *)message;
+- (void)webView: (WebView *)wv runJavaScriptAlertPanelWithMessage:(NSString *)message;
{
}
-- (BOOL)controller: (WebController *)wv runJavaScriptConfirmPanelWithMessage:(NSString *)message
+- (BOOL)webView: (WebView *)wv runJavaScriptConfirmPanelWithMessage:(NSString *)message
{
return NO;
}
-- (NSString *)controller: (WebController *)wv runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText
+- (NSString *)webView: (WebView *)wv runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText
{
return nil;
}
-- (void)controller: (WebController *)wv runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener
+- (void)webView: (WebView *)wv runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener
{
}
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 5237726..76422df 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
- at class WebController;
+ at class WebView;
@class WebDataSource;
@class WebError;
@class WebFramePrivate;
@@ -34,7 +34,7 @@
@param controller The controller that manages the frame.
@result Returns an initialized WebFrame.
*/
-- (id)initWithName: (NSString *)name webFrameView: (WebFrameView *)view controller: (WebController *)controller;
+- (id)initWithName: (NSString *)name webFrameView: (WebFrameView *)view webView: (WebView *)webView;
/*!
@method name
@@ -43,16 +43,16 @@
- (NSString *)name;
/*!
- @method controller
- @result Returns the controller of this frame.
+ @method webView
+ @result Returns the WebView for the document that includes this frame.
*/
-- (WebController *)controller;
+- (WebView *)webView;
/*!
- @method webFrameView
+ @method frameView
@result The WebFrameView for this frame.
*/
-- (WebFrameView *)view;
+- (WebFrameView *)frameView;
/*!
@method loadRequest:
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index fa68ca6..777c022 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -30,10 +30,10 @@
- init
{
- return [self initWithName: nil webFrameView: nil controller: nil];
+ return [self initWithName: nil webFrameView: nil webView: nil];
}
-- initWithName: (NSString *)n webFrameView: (WebFrameView *)v controller: (WebController *)c
+- initWithName: (NSString *)n webFrameView: (WebFrameView *)v webView: (WebView *)c
{
[super init];
@@ -50,7 +50,7 @@
if (v) {
[_private setWebFrameView: v];
- [v _setController: [self controller]];
+ [v _setController: [self webView]];
}
++WebFrameCount;
@@ -72,12 +72,12 @@
return [_private name];
}
-- (WebFrameView *)view
+- (WebFrameView *)frameView
{
return [_private webFrameView];
}
-- (WebController *)controller
+- (WebView *)webView
{
return [_private controller];
}
@@ -161,7 +161,7 @@
}
if ([name isEqualToString:@"_top"]) {
- return [[self controller] mainFrame];
+ return [[self webView] mainFrame];
}
if ([name isEqualToString:@"_parent"]) {
@@ -178,7 +178,7 @@
if(!frame){
// Search in this controller then in other controllers.
- frame = [[self controller] _findFrameNamed:name];
+ frame = [[self webView] _findFrameNamed:name];
}
return frame;
@@ -200,6 +200,4 @@
[[WebDataSource _repTypes] setObject:representationClass forKey:MIMEType];
}
-
-
@end
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index 4a6b973..6c63648 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -7,26 +7,26 @@
#import <Foundation/Foundation.h>
- at class WebController;
+ at class WebView;
@class WebDataSource;
@class WebError;
@class WebFrame;
/*!
@category WebLocationChangeDelegate
- @discussion A controller's WebLocationChangeDelegate track changes its frame's location.
+ @discussion A WebView's WebLocationChangeDelegate track changes its frame's location.
*/
@interface NSObject (WebLocationChangeDelegate)
/*!
@method locationChangeStartedForDataSource:
@abstract Notify that a location change has started on a given data source
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param dataSource The data source for which the location change has started
@discussion You can find out the URL and other parameters of the location change
from the data source object.
*/
-- (void)controller: (WebController *)wv locationChangeStartedForDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView locationChangeStartedForDataSource:(WebDataSource *)dataSource;
/*!
@method serverRedirectedTo:forDataSource:
@@ -34,12 +34,12 @@
@param dataSource The data source for which the redirect occurred
@discussion You can find the new URL from the data source object.
*/
-- (void)controller: (WebController *)wv serverRedirectedForDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView serverRedirectedForDataSource:(WebDataSource *)dataSource;
/*!
@method locationChangeCommittedForDataSource:
@abstract Notify that a location change has been committed on a given data source
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param dataSource The data source for which the location change has started
@discussion When a location change starts, it is considered
"provisional" until at least one byte of the new page is
@@ -47,7 +47,7 @@
page fails to load completely.
*/
-- (void)controller: (WebController *)wv locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
/*!
@method receivedPageTitle:forDataSource:
@@ -56,56 +56,56 @@
@param dataSource The data source for which the title changed
@discussion The title may update during loading; clients should be prepared for this.
*/
-- (void)controller: (WebController *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource;
/*!
@method receivedPageIcon:forDataSource:
@abstract Notify that a page icon image is available or has changed
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param image The icon image
@param dataSource The data source for which a page icon is ready
@discussion It's possible the image will change, starting out as a
default or stored image and changing on a refresh.
*/
-- (void)controller: (WebController *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource;
/*!
@method locationChangeDone:forDataSource:
@abstract Notify that a location change is done (possibly with an error) for a data source
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param error The error, if one occurred, or nil if none
@param dataSource The data source that finished changing location
@discussion This callback will only be received when all
subresources are done loading.
*/
-- (void)controller: (WebController *)wv locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
/*!
@method willCloseLocationForDataSource:
@abstract Notify that a location will be closed.
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param dataSource The data source that where the location change originally happened
@discussion This callback happens right before WebKit is done with the data source
and the document representation that it contains.
*/
-- (void)controller: (WebController *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView willCloseLocationForDataSource:(WebDataSource *)dataSource;
/*!
@method locationChangedWithinPageForDataSource:
@abstract Notify that a further location change within the page
has occurred for an already loaded data source
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param dataSource The data source that had a location change
@discussion This is normally used for clicks on anchors within a page
that is already displayed. You can find the new URL from the data source object.
*/
-- (void)controller: (WebController *)wv locationChangedWithinPageForDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView locationChangedWithinPageForDataSource:(WebDataSource *)dataSource;
/*!
@method clientWillRedirectTo:delay:fireDate:forFrame:
@abstract Notify that the frame has received a client-side redirect that may trigger soon
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param URL The URL to be redirected to
@param seconds Seconds in which the redirect will happen
@param date The fire date
@@ -114,17 +114,17 @@
going while a client redirect is pending. A client redirect might
be cancelled before it fires - see clientRedirectCancelledForFrame.
*/
-- (void)controller: (WebController *)wv clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
+- (void)webView: (WebView *)webView clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
/*!
@method clientRedirectCancelledForFrame:
@abstract Notify that a pending client redirect has been cancelled.
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param frame The frame for which the pending redirect was cancelled
@discussion A client redirect can be cancelled if the frame
changes locations before the timeout.
*/
-- (void)controller: (WebController *)wv clientRedirectCancelledForFrame:(WebFrame *)frame;
+- (void)webView: (WebView *)webView clientRedirectCancelledForFrame:(WebFrame *)frame;
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 61c844a..e5cbfd0 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -10,12 +10,14 @@
#import <WebKit/WebControllerPolicyDelegatePrivate.h>
@class WebBridge;
+ at class WebFormState;
@class WebFrameBridge;
- at class WebHistoryItem;
@class WebFrameView;
+ at class WebHistoryItem;
@class WebRequest;
- at class WebFormState;
@class WebPolicyDecisionListener;
+ at class WebView;
+
@protocol WebDOMElement;
typedef enum {
@@ -55,7 +57,7 @@ typedef enum {
WebDataSource *dataSource;
WebDataSource *provisionalDataSource;
WebBridge *bridge;
- WebController *controller;
+ WebView *controller;
WebFrameState state;
NSTimer *scheduledLayoutTimer;
WebFrameLoadType loadType;
@@ -80,8 +82,8 @@ typedef enum {
- (void)setName:(NSString *)name;
- (NSString *)name;
-- (void)setController:(WebController *)c;
-- (WebController *)controller;
+- (void)setController:(WebView *)c;
+- (WebView *)controller;
- (void)setWebFrameView:(WebFrameView *)v;
- (WebFrameView *)webFrameView;
- (void)setDataSource:(WebDataSource *)d;
@@ -101,13 +103,13 @@ typedef enum {
@end
@interface WebFrame (WebPrivate)
-- (void)setController: (WebController *)controller;
+- (void)setController: (WebView *)controller;
- (void)_setName:(NSString *)name;
- (WebFrame *)_descendantFrameNamed:(NSString *)name;
- (void)_controllerWillBeDeallocated;
- (void)_detachFromParent;
- (void)_closeOldDataSources;
-- (void)_setController: (WebController *)controller;
+- (void)_setController: (WebView *)controller;
- (void)_setDataSource: (WebDataSource *)d;
- (void)_transitionToCommitted: (NSDictionary *)pageCache;
- (void)_transitionToLayoutAcceptable;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 87ee1e8..e64192e 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -201,8 +201,8 @@ Repeat load of the same URL (by any other means of navigation other than the rel
dataSource = d;
}
-- (WebController *)controller { return controller; }
-- (void)setController: (WebController *)c
+- (WebView *)controller { return controller; }
+- (void)setController: (WebView *)c
{
controller = c; // not retained (yet)
}
@@ -249,7 +249,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
@implementation WebFrame (WebPrivate)
-- (void)setController: (WebController *)controller
+- (void)setController: (WebView *)controller
{
// To set controller to nil, we have to use _controllerWillBeDeallocated, not this.
ASSERT(controller);
@@ -260,8 +260,8 @@ Repeat load of the same URL (by any other means of navigation other than the rel
// helper method used in various nav cases below
- (WebHistoryItem *)_addBackForwardItemClippedAtTarget:(BOOL)doClip
{
- WebHistoryItem *bfItem = [[[self controller] mainFrame] _createItemTreeWithTargetFrame:self clippedAtTarget:doClip];
- [[[self controller] backForwardList] addEntry:bfItem];
+ WebHistoryItem *bfItem = [[[self webView] mainFrame] _createItemTreeWithTargetFrame:self clippedAtTarget:doClip];
+ [[[self webView] backForwardList] addEntry:bfItem];
return bfItem;
}
@@ -389,7 +389,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
}
}
if (_private->dataSource) {
- [[[self controller] _locationChangeDelegateForwarder] controller: _private->controller willCloseLocationForDataSource:_private->dataSource];
+ [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller willCloseLocationForDataSource:_private->dataSource];
}
}
@@ -420,7 +420,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
[bridge release];
}
-- (void)_setController: (WebController *)controller
+- (void)_setController: (WebView *)controller
{
[_private setController:controller];
}
@@ -442,7 +442,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
[_private->dataSource _setWebFrame:nil];
[_private setDataSource:ds];
- [ds _setController:[self controller]];
+ [ds _setController:[self webView]];
[ds _setWebFrame:self];
}
@@ -472,10 +472,10 @@ Repeat load of the same URL (by any other means of navigation other than the rel
_private->scheduledLayoutTimer = nil;
if (_private->state == WebFrameStateLayoutAcceptable) {
- NSView <WebDocumentView> *documentView = [[self view] documentView];
+ NSView <WebDocumentView> *documentView = [[self frameView] documentView];
- if ([self controller])
- LOG(Timing, "%@: performing timed layout, %f seconds since start of document load", [self name], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+ if ([self webView])
+ LOG(Timing, "%@: performing timed layout, %f seconds since start of document load", [self name], CFAbsoluteTimeGetCurrent() - [[[[self webView] mainFrame] dataSource] _loadingStartedTime]);
[documentView setNeedsLayout: YES];
@@ -501,8 +501,8 @@ Repeat load of the same URL (by any other means of navigation other than the rel
[documentView setNeedsDisplay: YES];
}
else {
- if ([self controller])
- LOG(Timing, "%@: NOT performing timed layout (not needed), %f seconds since start of document load", [self name], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+ if ([self webView])
+ LOG(Timing, "%@: NOT performing timed layout (not needed), %f seconds since start of document load", [self name], CFAbsoluteTimeGetCurrent() - [[[[self webView] mainFrame] dataSource] _loadingStartedTime]);
}
}
@@ -557,7 +557,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
// FIXME: We could save work and not do this for a top-level view that is not a WebHTMLView.
WebFrameView *v = _private->webFrameView;
[_private->bridge createKHTMLViewWithNSView:documentView marginWidth:[v _marginWidth] marginHeight:[v _marginHeight]];
- [_private->bridge installInFrame:[v frameScrollView]];
+ [_private->bridge installInFrame:[v scrollView]];
// Call setDataSource on the document view after it has been placed in the view hierarchy.
// This what we for the top-level view, so should do this for views in subframes as well.
@@ -566,7 +566,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
- (void)_transitionToCommitted: (NSDictionary *)pageCache
{
- ASSERT([self controller] != nil);
+ ASSERT([self webView] != nil);
switch ([self _state]) {
case WebFrameStateProvisional:
@@ -602,7 +602,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
case WebFrameLoadTypeForward:
case WebFrameLoadTypeBack:
case WebFrameLoadTypeIndexedBackForward:
- if ([[self controller] backForwardList]) {
+ if ([[self webView] backForwardList]) {
// Must grab the current scroll position before disturbing it
[self _saveScrollPositionToItem:[_private previousItem]];
@@ -610,7 +610,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
if (pageCache){
NSView <WebDocumentView> *cachedView = [pageCache objectForKey: @"WebKitDocumentView"];
ASSERT (cachedView != nil);
- [[self view] _setDocumentView: cachedView];
+ [[self frameView] _setDocumentView: cachedView];
}
else
[self _makeDocumentView];
@@ -678,13 +678,13 @@ Repeat load of the same URL (by any other means of navigation other than the rel
// Tell the client we've committed this URL.
- ASSERT([[self view] documentView] != nil);
- [[[self controller] _locationChangeDelegateForwarder] controller: _private->controller locationChangeCommittedForDataSource:ds];
+ ASSERT([[self frameView] documentView] != nil);
+ [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller locationChangeCommittedForDataSource:ds];
// If we have a title let the controller know about it.
if (ptitle) {
[entry setTitle:ptitle];
- [[[self controller] _locationChangeDelegateForwarder] controller: _private->controller receivedPageTitle:ptitle forDataSource:ds];
+ [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller receivedPageTitle:ptitle forDataSource:ds];
}
break;
}
@@ -715,7 +715,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
// This method implements the rule for purging the page cache.
unsigned sizeLimit = [WebBackForwardList pageCacheSize];
unsigned pagesCached = 0;
- WebBackForwardList *backForwardList = [[self controller] backForwardList];
+ WebBackForwardList *backForwardList = [[self webView] backForwardList];
NSArray *backList = [backForwardList backListWithSizeLimit: 999999];
WebHistoryItem *oldestItem = nil;
@@ -750,10 +750,10 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (void)_setState: (WebFrameState)newState
{
LOG(Loading, "%@: transition from %s to %s", [self name], stateNames[_private->state], stateNames[newState]);
- if ([self controller])
- LOG(Timing, "%@: transition from %s to %s, %f seconds since start of document load", [self name], stateNames[_private->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+ if ([self webView])
+ LOG(Timing, "%@: transition from %s to %s, %f seconds since start of document load", [self name], stateNames[_private->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self webView] mainFrame] dataSource] _loadingStartedTime]);
- if (newState == WebFrameStateComplete && self == [[self controller] mainFrame]){
+ if (newState == WebFrameStateComplete && self == [[self webView] mainFrame]){
LOG(DocumentLoad, "completed %@ (%f seconds)", [[[self dataSource] request] URL], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
}
@@ -769,7 +769,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
// FIXME: This is OK as long as no one resizes the window,
// but in the case where someone does, it means garbage outside
// the occupied part of the scroll view.
- [[[self view] frameScrollView] setDrawsBackground:NO];
+ [[[self frameView] scrollView] setDrawsBackground:NO];
// Cache the page, if possible.
// Don't write to the cache if in the middle of a redirect, since we will want to
@@ -794,7 +794,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[item setHasPageCache: YES];
[[self dataSource] _setStoredInPageCache: YES];
[[item pageCache] setObject: [self dataSource] forKey: @"WebKitDataSource"];
- [[item pageCache] setObject: [[self view] documentView] forKey: @"WebKitDocumentView"];
+ [[item pageCache] setObject: [[self frameView] documentView] forKey: @"WebKitDocumentView"];
[_private->bridge saveDocumentToPageCache];
[self _purgePageCache];
}
@@ -802,7 +802,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
}
if (_private->state == WebFrameStateComplete) {
- NSScrollView *sv = [[self view] frameScrollView];
+ NSScrollView *sv = [[self frameView] scrollView];
[sv setDrawsBackground:YES];
// FIXME: This overrides the setCopiesOnScroll setting done by
// WebCore based on whether the page's contents are dynamic or not.
@@ -821,8 +821,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
// Force a layout to update view size and thereby
// update scrollbars.
[_private->bridge reapplyStyles];
- [[[self view] documentView] setNeedsLayout: YES];
- [[[self view] documentView] layout];
+ [[[self frameView] documentView] setNeedsLayout: YES];
+ [[[self frameView] documentView] layout];
[self _restoreScrollPosition];
NSArray *responses = [[self dataSource] _responses];
@@ -845,7 +845,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (void)_isLoadComplete
{
- ASSERT([self controller] != nil);
+ ASSERT([self webView] != nil);
switch ([self _state]) {
case WebFrameStateProvisional:
@@ -862,7 +862,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
if (![pd isLoading]) {
LOG(Loading, "%@: checking complete in WebFrameStateProvisional, load done", [self name]);
- [[[self controller] _locationChangeDelegateForwarder] controller: _private->controller locationChangeDone:[pd _mainDocumentError] forDataSource:pd];
+ [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller locationChangeDone:[pd _mainDocumentError] forDataSource:pd];
// We know the provisional data source didn't cut the muster, release it.
[self _setProvisionalDataSource:nil];
@@ -881,7 +881,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
//LOG(Loading, "%@: checking complete, current state WEBFRAMESTATE_COMMITTED", [self name]);
if (![ds isLoading]) {
- WebFrameView *thisView = [self view];
+ WebFrameView *thisView = [self frameView];
NSView <WebDocumentView> *thisDocumentView = [thisView documentView];
ASSERT(thisDocumentView != nil);
@@ -903,14 +903,14 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
// be a reasonably inexpensive operation.
WebDataSource *parentDS = [[self parent] dataSource];
if ([[parentDS _bridge] isFrameSet]){
- WebFrameView *parentWebFrameView = [[self parent] view];
+ WebFrameView *parentWebFrameView = [[self parent] frameView];
if ([parentWebFrameView isDocumentHTML])
[(WebHTMLView *)[parentWebFrameView documentView] _adjustFrames];
}
// Tell the just loaded document to layout. This may be necessary
// for non-html content that needs a layout message.
- if (!([[self view] isDocumentHTML])) {
+ if (!([[self frameView] isDocumentHTML])) {
[thisDocumentView setNeedsLayout:YES];
[thisDocumentView layout];
[thisDocumentView setNeedsDisplay:YES];
@@ -919,7 +919,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
// If the user had a scroll point scroll to it. This will override
// the anchor point. After much discussion it was decided by folks
// that the user scroll point should override the anchor point.
- if ([[self controller] backForwardList]) {
+ if ([[self webView] backForwardList]) {
switch ([self _loadType]) {
case WebFrameLoadTypeForward:
case WebFrameLoadTypeBack:
@@ -941,7 +941,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
}
}
- [[[self controller] _locationChangeDelegateForwarder] controller: _private->controller locationChangeDone:[ds _mainDocumentError] forDataSource:ds];
+ [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller locationChangeDone:[ds _mainDocumentError] forDataSource:ds];
//if ([ds isDocumentHTML])
// [[ds representation] part]->closeURL();
@@ -995,10 +995,10 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
// Called every time a resource is completely loaded, or an error is received.
- (void)_checkLoadComplete
{
- ASSERT([self controller] != nil);
+ ASSERT([self webView] != nil);
// Now walk the frame tree to see if any frame that may have initiated a load is done.
- [WebFrame _recursiveCheckCompleteFromFrame: [[self controller] mainFrame]];
+ [WebFrame _recursiveCheckCompleteFromFrame: [[self webView] mainFrame]];
}
- (WebBridge *)_bridge
@@ -1011,8 +1011,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
WebError *error = [WebError errorWithCode:code
inDomain:WebErrorDomainWebKit
failingURL:[URL absoluteString]];
- WebController *c = [self controller];
- [[c _policyDelegateForwarder] controller:c unableToImplementPolicyWithError:error inFrame:self];
+ WebView *c = [self webView];
+ [[c _policyDelegateForwarder] webView:c unableToImplementPolicyWithError:error inFrame:self];
}
- (void)_clearProvisionalDataSource
@@ -1074,7 +1074,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[_private setCurrentItem:item];
[self _restoreScrollPosition];
- [[[self controller] _locationChangeDelegateForwarder] controller: _private->controller locationChangedWithinPageForDataSource:_private->dataSource];
+ [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller locationChangedWithinPageForDataSource:_private->dataSource];
} else {
// Remember this item so we can traverse any child items as child frames load
[_private setProvisionalItem:item];
@@ -1200,7 +1200,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (void)_goToItem: (WebHistoryItem *)item withLoadType: (WebFrameLoadType)type
{
ASSERT(!_private->parent);
- WebBackForwardList *backForwardList = [[self controller] backForwardList];
+ WebBackForwardList *backForwardList = [[self webView] backForwardList];
WebHistoryItem *currItem = [backForwardList currentEntry];
// Set the BF cursor before commit, which lets the user quickly click back/forward again.
// - plus, it only makes sense for the top level of the operation through the frametree,
@@ -1328,8 +1328,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
_private->listener = [listener retain];
_private->policyFormState = [formState retain];
- WebController *c = [self controller];
- [[c _policyDelegateForwarder] controller:c decideNewWindowPolicyForAction:action
+ WebView *c = [self webView];
+ [[c _policyDelegateForwarder] webView:c decideNewWindowPolicyForAction:action
andRequest:request
newFrameName:frameName
decisionListener:listener];
@@ -1355,7 +1355,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
break;
case WebPolicyDownload:
// FIXME: should download full request
- [[self controller] _downloadURL:[request URL]];
+ [[self webView] _downloadURL:[request URL]];
break;
case WebPolicyUse:
shouldContinue = YES;
@@ -1400,8 +1400,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
_private->listener = [listener retain];
_private->policyFormState = [formState retain];
- WebController *c = [self controller];
- [[c _policyDelegateForwarder] controller:c decideNavigationPolicyForAction:action
+ WebView *c = [self webView];
+ [[c _policyDelegateForwarder] webView:c decideNavigationPolicyForAction:action
andRequest:request
inFrame:self
decisionListener:listener];
@@ -1426,7 +1426,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
break;
case WebPolicyDownload:
// FIXME: should download full request
- [[self controller] _downloadURL:[request URL]];
+ [[self webView] _downloadURL:[request URL]];
break;
case WebPolicyUse:
if (![WebResource canInitWithRequest:request]) {
@@ -1478,19 +1478,19 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[self _checkLoadComplete];
}
- [[[self controller] _locationChangeDelegateForwarder] controller: _private->controller locationChangedWithinPageForDataSource:dataSrc];
+ [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller locationChangedWithinPageForDataSource:dataSrc];
}
- (void)_addExtraFieldsToRequest:(WebRequest *)request alwaysFromRequest: (BOOL)f
{
- [request setUserAgent:[[self controller] userAgentForURL:[request URL]]];
+ [request setUserAgent:[[self webView] userAgentForURL:[request URL]]];
// Don't set the cookie policy URL if it's already been set.
if ([request cookiePolicyBaseURL] == nil){
- if (self == [[self controller] mainFrame] || f) {
+ if (self == [[self webView] mainFrame] || f) {
[request setCookiePolicyBaseURL:[request URL]];
} else {
- [request setCookiePolicyBaseURL:[[[[self controller] mainFrame] dataSource] _URL]];
+ [request setCookiePolicyBaseURL:[[[[self webView] mainFrame] dataSource] _URL]];
}
}
}
@@ -1503,16 +1503,16 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
return;
}
- WebController *controller = nil;
- WebController *currentController = [self controller];
+ WebView *controller = nil;
+ WebView *currentController = [self webView];
id wd = [currentController windowOperationsDelegate];
- if ([wd respondsToSelector:@selector(controller:createWindowWithRequest:)])
- controller = [wd controller:currentController createWindowWithRequest:nil];
+ if ([wd respondsToSelector:@selector(webView:createWindowWithRequest:)])
+ controller = [wd webView:currentController createWindowWithRequest:nil];
else
- controller = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] controller:currentController createWindowWithRequest:nil];
+ controller = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] webView:currentController createWindowWithRequest:nil];
[controller _setTopLevelFrameName:frameName];
- [[controller _windowOperationsDelegateForwarder] controllerShowWindow:controller];
+ [[controller _windowOperationsDelegateForwarder] webViewShowWindow:controller];
WebFrame *frame = [controller mainFrame];
[frame _loadRequest:request triggeringAction:nil loadType:WebFrameLoadTypeStandard formState:formState];
@@ -1683,7 +1683,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
{
LOG(Redirect, "Client redirect to: %@", URL);
- [[[self controller] _locationChangeDelegateForwarder] controller: _private->controller clientWillRedirectTo:URL delay:seconds fireDate:date forFrame:self];
+ [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller clientWillRedirectTo:URL delay:seconds fireDate:date forFrame:self];
// If a "quick" redirect comes in an, we set a special mode so we treat the next
// load as part of the same navigation.
@@ -1698,14 +1698,14 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (void)_clientRedirectCancelled
{
- [[[self controller] _locationChangeDelegateForwarder] controller: _private->controller clientRedirectCancelledForFrame:self];
+ [[[self webView] _locationChangeDelegateForwarder] webView: _private->controller clientRedirectCancelledForFrame:self];
_private->quickRedirectComing = NO;
}
- (void)_saveScrollPositionToItem:(WebHistoryItem *)item
{
if (item) {
- NSView *clipView = [[[self view] documentView] superview];
+ NSView *clipView = [[[self frameView] documentView] superview];
// we might already be detached when this is called from detachFromParent, in which
// case we don't want to override real data earlier gathered with (0,0)
if (clipView) {
@@ -1717,17 +1717,17 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (void)_restoreScrollPosition
{
ASSERT([_private currentItem]);
- [[[self view] documentView] scrollPoint:[[_private currentItem] scrollPoint]];
+ [[[self frameView] documentView] scrollPoint:[[_private currentItem] scrollPoint]];
}
- (void)_scrollToTop
{
- [[[self view] documentView] scrollPoint: NSZeroPoint];
+ [[[self frameView] documentView] scrollPoint: NSZeroPoint];
}
- (void)_textSizeMultiplierChanged
{
- [_private->bridge setTextSizeMultiplier:[[self controller] textSizeMultiplier]];
+ [_private->bridge setTextSizeMultiplier:[[self webView] textSizeMultiplier]];
[[self children] makeObjectsPerformSelector:@selector(_textSizeMultiplierChanged)];
}
@@ -1808,9 +1808,9 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
|| loadType == WebFrameLoadTypeBack
|| loadType == WebFrameLoadTypeIndexedBackForward)
&& [_private currentItem]
- && self == [[self controller] mainFrame])
+ && self == [[self webView] mainFrame])
{
- [[[self controller] backForwardList] goToEntry:[_private currentItem]];
+ [[[self webView] backForwardList] goToEntry:[_private currentItem]];
}
}
@@ -1864,7 +1864,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[self _setState: WebFrameStateProvisional];
- if (self == [[self controller] mainFrame])
+ if (self == [[self webView] mainFrame])
LOG(DocumentLoad, "loading %@", [[[self provisionalDataSource] request] URL]);
WebFrameLoadType loadType = [self _loadType];
@@ -1879,7 +1879,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
}
} else {
if (formState) {
- [[[self controller] _formDelegate] frame:self willSubmitForm:[formState form] withValues:[formState values]];
+ [[[self webView] _formDelegate] frame:self willSubmitForm:[formState form] withValues:[formState values]];
}
[_private->provisionalDataSource _startLoading];
}
@@ -1887,13 +1887,13 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (void)_loadDataSource:(WebDataSource *)newDataSource withLoadType:(WebFrameLoadType)loadType formState:(WebFormState *)formState
{
- ASSERT([self controller] != nil);
+ ASSERT([self webView] != nil);
// Unfortunately the view must be non-nil, this is ultimately due
// to KDE parser requiring a KHTMLView. Once we settle on a final
// KDE drop we should fix this dependency.
- ASSERT([self view] != nil);
+ ASSERT([self frameView] != nil);
[self stopLoading];
@@ -1902,7 +1902,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
if ([self parent]) {
[newDataSource _setOverrideEncoding:[[[self parent] dataSource] _overrideEncoding]];
}
- [newDataSource _setController:[self controller]];
+ [newDataSource _setController:[self webView]];
[newDataSource _setJustOpenedForTargetedLink:_private->justOpenedForTargetedLink];
_private->justOpenedForTargetedLink = NO;
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index cedc46f..d7d2fe8 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -30,9 +30,9 @@
- (id)initWithFrame: (NSRect) frame;
/*!
- @method controller
- @abstract Returns the WebController associated with this WebFrameView
- @result The WebFrameView's controller
+ @method webFrame
+ @abstract Returns the WebFrame associated with this WebFrameView
+ @result The WebFrameView's frame.
*/
- (WebFrame *)webFrame;
@@ -41,7 +41,7 @@
@abstract Returns the WebFrameView's scroll view
@result The scrolling view used by the WebFrameView to display its document view
*/
-- (NSScrollView *)frameScrollView;
+- (NSScrollView *)scrollView;
/*!
@method documentView
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 0355bd9..3d6080b 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -85,22 +85,22 @@ enum {
- (void)setAllowsScrolling: (BOOL)flag
{
- [(WebDynamicScrollBarsView *)[self frameScrollView] setAllowsScrolling: flag];
+ [(WebDynamicScrollBarsView *)[self scrollView] setAllowsScrolling: flag];
}
- (BOOL)allowsScrolling
{
- return [(WebDynamicScrollBarsView *)[self frameScrollView] allowsScrolling];
+ return [(WebDynamicScrollBarsView *)[self scrollView] allowsScrolling];
}
-- (NSScrollView *)frameScrollView
+- (NSScrollView *)scrollView
{
return _private->frameScrollView;
}
- documentView
{
- return [[self frameScrollView] documentView];
+ return [[self scrollView] documentView];
}
- (BOOL)isDocumentHTML
@@ -164,7 +164,7 @@ enum {
NSRectFill(rect);
} else {
#ifndef NDEBUG
- if ([_private->frameScrollView drawsBackground]) {
+ if ([[self scrollView] drawsBackground]) {
[[NSColor cyanColor] set];
NSRectFill(rect);
}
@@ -175,7 +175,7 @@ enum {
- (void)setFrameSize:(NSSize)size
{
if (!NSEqualSizes(size, [self frame].size)) {
- [_private->frameScrollView setDrawsBackground:YES];
+ [[self scrollView] setDrawsBackground:YES];
}
[super setFrameSize:size];
}
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index ec3de33..52be44d 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -5,12 +5,12 @@
#import <WebKit/WebView.h>
@class WebDynamicScrollBarsView;
- at class WebController;
+ at class WebView;
@interface WebFrameViewPrivate : NSObject
{
@public
- WebController *controller;
+ WebView *controller;
WebDynamicScrollBarsView *frameScrollView;
// These margin values are used to temporarily hold
@@ -25,10 +25,10 @@
@end
@interface WebFrameView (WebPrivate)
-- (WebController *)_controller;
+- (WebView *)_controller;
- (void)_setDocumentView:(NSView <WebDocumentView> *)view;
- (NSView <WebDocumentView> *)_makeDocumentViewForDataSource:(WebDataSource *)dataSource;
-- (void)_setController:(WebController *)controller;
+- (void)_setController:(WebView *)controller;
- (int)_marginWidth;
- (int)_marginHeight;
- (void)_setMarginWidth:(int)w;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index ec3de33..52be44d 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -5,12 +5,12 @@
#import <WebKit/WebView.h>
@class WebDynamicScrollBarsView;
- at class WebController;
+ at class WebView;
@interface WebFrameViewPrivate : NSObject
{
@public
- WebController *controller;
+ WebView *controller;
WebDynamicScrollBarsView *frameScrollView;
// These margin values are used to temporarily hold
@@ -25,10 +25,10 @@
@end
@interface WebFrameView (WebPrivate)
-- (WebController *)_controller;
+- (WebView *)_controller;
- (void)_setDocumentView:(NSView <WebDocumentView> *)view;
- (NSView <WebDocumentView> *)_makeDocumentViewForDataSource:(WebDataSource *)dataSource;
-- (void)_setController:(WebController *)controller;
+- (void)_setController:(WebView *)controller;
- (int)_marginWidth;
- (int)_marginHeight;
- (void)_setMarginWidth:(int)w;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 295b7e8..affacf0 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -41,7 +41,7 @@
@implementation WebFrameView (WebPrivate)
// Note that the controller is not retained.
-- (WebController *)_controller
+- (WebView *)_controller
{
return _private->controller;
}
@@ -69,7 +69,7 @@
- (void)_setDocumentView:(NSView *)view
{
- WebDynamicScrollBarsView *sv = (WebDynamicScrollBarsView *)[self frameScrollView];
+ WebDynamicScrollBarsView *sv = (WebDynamicScrollBarsView *)[self scrollView];
[sv setSuppressLayout: YES];
@@ -92,7 +92,7 @@
return documentView;
}
-- (void)_setController: (WebController *)controller
+- (void)_setController: (WebView *)controller
{
// Not retained; the controller owns the view, indirectly through the frame tree.
_private->controller = controller;
@@ -100,7 +100,7 @@
- (NSClipView *)_contentView
{
- return [[self frameScrollView] contentView];
+ return [[self scrollView] contentView];
}
- (void)_scrollVerticallyBy: (float)delta
@@ -122,7 +122,7 @@
// verticalLineScroll is quite small, to make scrolling from the scroll bar
// arrows relatively smooth. But this seemed too small for scrolling with
// the arrow keys, so we bump up the number here. Cheating? Perhaps.
- return [[self frameScrollView] verticalLineScroll] * 4;
+ return [[self scrollView] verticalLineScroll] * 4;
}
- (float)_horizontalKeyboardScrollAmount
@@ -130,7 +130,7 @@
// verticalLineScroll is quite small, to make scrolling from the scroll bar
// arrows relatively smooth. But this seemed too small for scrolling with
// the arrow keys, so we bump up the number here. Cheating? Perhaps.
- return [[self frameScrollView] horizontalLineScroll] * 4;
+ return [[self scrollView] horizontalLineScroll] * 4;
}
- (void)_pageVertically:(BOOL)up
@@ -220,7 +220,7 @@
- (void)_scrollToBottomLeft
{
- [[self _contentView] scrollPoint: NSMakePoint(0, [[[self frameScrollView] documentView] bounds].size.height)];
+ [[self _contentView] scrollPoint: NSMakePoint(0, [[[self scrollView] documentView] bounds].size.height)];
}
- (void)scrollLineUp:(id)sender
@@ -257,7 +257,7 @@
[WebTextView class], @"application/x-javascript",
nil];
- NSEnumerator *enumerator = [[WebController _supportedImageMIMETypes] objectEnumerator];
+ NSEnumerator *enumerator = [[WebView _supportedImageMIMETypes] objectEnumerator];
NSString *mime;
while ((mime = [enumerator nextObject]) != nil) {
[viewTypes setObject:[WebImageView class] forKey:mime];
diff --git a/WebKit/WebView.subproj/WebHTMLView.h b/WebKit/WebView.subproj/WebHTMLView.h
index 0f74a9c..529865e 100644
--- a/WebKit/WebView.subproj/WebHTMLView.h
+++ b/WebKit/WebView.subproj/WebHTMLView.h
@@ -10,7 +10,6 @@
@class WebDataSource;
- at class WebController;
@class WebHTMLViewPrivate;
/*!
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 8bbbfa9..e98b6df 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -9,7 +9,7 @@
#import <WebKit/WebHTMLView.h>
@class WebBridge;
- at class WebController;
+ at class WebView;
@class WebFrame;
@class WebPluginController;
@@ -42,7 +42,7 @@
@interface WebHTMLView (WebPrivate)
- (void)_reset;
-- (WebController *)_controller;
+- (WebView *)_controller;
- (WebFrame *)_frame;
- (WebBridge *)_bridge;
- (void)_adjustFrames;
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 80cc24d..8a99e4a 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -134,7 +134,7 @@ static BOOL forceRealHitTest = NO;
[WebImageRenderer stopAnimationsInView:self];
}
-- (WebController *)_controller
+- (WebView *)_controller
{
return [[self _web_parentWebFrameView] _controller];
}
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index 3dd1801..46ed078 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -80,7 +80,7 @@
[super viewDidMoveToWindow];
}
-- (WebController *)controller
+- (WebView *)controller
{
return [[self _web_parentWebFrameView] _controller];
}
@@ -127,7 +127,7 @@
- (NSMenu *)menuForEvent:(NSEvent *)theEvent
{
WebFrameView *webFrameView = [self _web_parentWebFrameView];
- WebController *controller = [webFrameView _controller];
+ WebView *controller = [webFrameView _controller];
WebFrame *frame = [webFrameView webFrame];
ASSERT(frame);
diff --git a/WebKit/WebView.subproj/WebLoader.h b/WebKit/WebView.subproj/WebLoader.h
index 4181ed1..f908d4a 100644
--- a/WebKit/WebView.subproj/WebLoader.h
+++ b/WebKit/WebView.subproj/WebLoader.h
@@ -5,7 +5,7 @@
#import <Foundation/Foundation.h>
- at class WebController;
+ at class WebView;
@class WebDataSource;
@class WebError;
@class WebResource;
@@ -21,7 +21,7 @@
WebResource *resource;
WebRequest *request;
@private
- WebController *controller;
+ WebView *controller;
WebResponse *response;
id identifier;
id resourceLoadDelegate;
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 17f8cbe..4197224 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -139,17 +139,17 @@
if (identifier == nil) {
// The identifier is released after the last callback, rather than in dealloc
// to avoid potential cycles.
- if ([resourceLoadDelegate respondsToSelector: @selector(controller:identifierForInitialRequest:fromDataSource:)])
- identifier = [[resourceLoadDelegate controller: controller identifierForInitialRequest:newRequest fromDataSource:dataSource] retain];
+ if ([resourceLoadDelegate respondsToSelector: @selector(webView:identifierForInitialRequest:fromDataSource:)])
+ identifier = [[resourceLoadDelegate webView: controller identifierForInitialRequest:newRequest fromDataSource:dataSource] retain];
else
- identifier = [[[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] controller:controller identifierForInitialRequest:newRequest fromDataSource:dataSource] retain];
+ identifier = [[[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] webView:controller identifierForInitialRequest:newRequest fromDataSource:dataSource] retain];
}
if (resourceLoadDelegate) {
- if ([resourceLoadDelegate respondsToSelector: @selector(controller:resource:willSendRequest:fromDataSource:)])
- newRequest = [resourceLoadDelegate controller:controller resource:identifier willSendRequest:newRequest fromDataSource:dataSource];
+ if ([resourceLoadDelegate respondsToSelector: @selector(webView:resource:willSendRequest:fromDataSource:)])
+ newRequest = [resourceLoadDelegate webView:controller resource:identifier willSendRequest:newRequest fromDataSource:dataSource];
else
- newRequest = [[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] controller:controller resource:identifier willSendRequest:newRequest fromDataSource:dataSource];
+ newRequest = [[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] webView:controller resource:identifier willSendRequest:newRequest fromDataSource:dataSource];
}
// Store a copy of the request.
@@ -185,7 +185,7 @@
response = r;
[dataSource _addResponse: r];
- [[controller _resourceLoadDelegateForwarder] controller:controller resource:identifier didReceiveResponse:r fromDataSource:dataSource];
+ [[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didReceiveResponse:r fromDataSource:dataSource];
}
- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
@@ -193,7 +193,7 @@
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
- [[controller _resourceLoadDelegateForwarder] controller:controller resource:identifier didReceiveContentLength:[data length] fromDataSource:dataSource];
+ [[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didReceiveContentLength:[data length] fromDataSource:dataSource];
}
- (void)resourceDidFinishLoading:(WebResource *)h
@@ -201,7 +201,7 @@
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
- [[controller _resourceLoadDelegateForwarder] controller:controller resource:identifier didFinishLoadingFromDataSource:dataSource];
+ [[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didFinishLoadingFromDataSource:dataSource];
ASSERT(currentURL);
[[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController:controller];
@@ -214,7 +214,7 @@
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
- [[controller _resourceLoadDelegateForwarder] controller:controller resource:identifier didFailLoadingWithError:result fromDataSource:dataSource];
+ [[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didFailLoadingWithError:result fromDataSource:dataSource];
// currentURL may be nil if the request was aborted
if (currentURL)
@@ -234,7 +234,7 @@
[[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:currentURL inController:controller];
if (error) {
- [[controller _resourceLoadDelegateForwarder] controller:controller resource:identifier didFailLoadingWithError:error fromDataSource:dataSource];
+ [[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didFailLoadingWithError:error fromDataSource:dataSource];
}
[self _releaseResources];
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
index 4a6b973..6c63648 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
@@ -7,26 +7,26 @@
#import <Foundation/Foundation.h>
- at class WebController;
+ at class WebView;
@class WebDataSource;
@class WebError;
@class WebFrame;
/*!
@category WebLocationChangeDelegate
- @discussion A controller's WebLocationChangeDelegate track changes its frame's location.
+ @discussion A WebView's WebLocationChangeDelegate track changes its frame's location.
*/
@interface NSObject (WebLocationChangeDelegate)
/*!
@method locationChangeStartedForDataSource:
@abstract Notify that a location change has started on a given data source
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param dataSource The data source for which the location change has started
@discussion You can find out the URL and other parameters of the location change
from the data source object.
*/
-- (void)controller: (WebController *)wv locationChangeStartedForDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView locationChangeStartedForDataSource:(WebDataSource *)dataSource;
/*!
@method serverRedirectedTo:forDataSource:
@@ -34,12 +34,12 @@
@param dataSource The data source for which the redirect occurred
@discussion You can find the new URL from the data source object.
*/
-- (void)controller: (WebController *)wv serverRedirectedForDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView serverRedirectedForDataSource:(WebDataSource *)dataSource;
/*!
@method locationChangeCommittedForDataSource:
@abstract Notify that a location change has been committed on a given data source
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param dataSource The data source for which the location change has started
@discussion When a location change starts, it is considered
"provisional" until at least one byte of the new page is
@@ -47,7 +47,7 @@
page fails to load completely.
*/
-- (void)controller: (WebController *)wv locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
/*!
@method receivedPageTitle:forDataSource:
@@ -56,56 +56,56 @@
@param dataSource The data source for which the title changed
@discussion The title may update during loading; clients should be prepared for this.
*/
-- (void)controller: (WebController *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource;
/*!
@method receivedPageIcon:forDataSource:
@abstract Notify that a page icon image is available or has changed
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param image The icon image
@param dataSource The data source for which a page icon is ready
@discussion It's possible the image will change, starting out as a
default or stored image and changing on a refresh.
*/
-- (void)controller: (WebController *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource;
/*!
@method locationChangeDone:forDataSource:
@abstract Notify that a location change is done (possibly with an error) for a data source
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param error The error, if one occurred, or nil if none
@param dataSource The data source that finished changing location
@discussion This callback will only be received when all
subresources are done loading.
*/
-- (void)controller: (WebController *)wv locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
/*!
@method willCloseLocationForDataSource:
@abstract Notify that a location will be closed.
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param dataSource The data source that where the location change originally happened
@discussion This callback happens right before WebKit is done with the data source
and the document representation that it contains.
*/
-- (void)controller: (WebController *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView willCloseLocationForDataSource:(WebDataSource *)dataSource;
/*!
@method locationChangedWithinPageForDataSource:
@abstract Notify that a further location change within the page
has occurred for an already loaded data source
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param dataSource The data source that had a location change
@discussion This is normally used for clicks on anchors within a page
that is already displayed. You can find the new URL from the data source object.
*/
-- (void)controller: (WebController *)wv locationChangedWithinPageForDataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView locationChangedWithinPageForDataSource:(WebDataSource *)dataSource;
/*!
@method clientWillRedirectTo:delay:fireDate:forFrame:
@abstract Notify that the frame has received a client-side redirect that may trigger soon
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param URL The URL to be redirected to
@param seconds Seconds in which the redirect will happen
@param date The fire date
@@ -114,17 +114,17 @@
going while a client redirect is pending. A client redirect might
be cancelled before it fires - see clientRedirectCancelledForFrame.
*/
-- (void)controller: (WebController *)wv clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
+- (void)webView: (WebView *)webView clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
/*!
@method clientRedirectCancelledForFrame:
@abstract Notify that a pending client redirect has been cancelled.
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param frame The frame for which the pending redirect was cancelled
@discussion A client redirect can be cancelled if the frame
changes locations before the timeout.
*/
-- (void)controller: (WebController *)wv clientRedirectCancelledForFrame:(WebFrame *)frame;
+- (void)webView: (WebView *)webView clientRedirectCancelledForFrame:(WebFrame *)frame;
@end
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 971dea9..c2976dd 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -144,7 +144,7 @@
switch (contentPolicy) {
case WebPolicyUse:
- if (![WebContentTypes canShowMIMEType:[r contentType]]) {
+ if (![WebView canShowMIMEType:[r contentType]]) {
[[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotShowMIMEType forURL:[req URL]];
[self stopLoadingForPolicyChange];
return;
@@ -192,9 +192,9 @@
_initWithTarget:self action:@selector(continueAfterContentPolicy:)];
policyResponse = [r retain];
- WebController *c = [dataSource _controller];
+ WebView *c = [dataSource _controller];
[c setDefersCallbacks:YES];
- [[c _policyDelegateForwarder] controller:c decideContentPolicyForMIMEType:[r contentType]
+ [[c _policyDelegateForwarder] webView:c decideContentPolicyForMIMEType:[r contentType]
andRequest:[dataSource request]
inFrame:[dataSource webFrame]
decisionListener:listener];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 971dea9..c2976dd 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -144,7 +144,7 @@
switch (contentPolicy) {
case WebPolicyUse:
- if (![WebContentTypes canShowMIMEType:[r contentType]]) {
+ if (![WebView canShowMIMEType:[r contentType]]) {
[[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotShowMIMEType forURL:[req URL]];
[self stopLoadingForPolicyChange];
return;
@@ -192,9 +192,9 @@
_initWithTarget:self action:@selector(continueAfterContentPolicy:)];
policyResponse = [r retain];
- WebController *c = [dataSource _controller];
+ WebView *c = [dataSource _controller];
[c setDefersCallbacks:YES];
- [[c _policyDelegateForwarder] controller:c decideContentPolicyForMIMEType:[r contentType]
+ [[c _policyDelegateForwarder] webView:c decideContentPolicyForMIMEType:[r contentType]
andRequest:[dataSource request]
inFrame:[dataSource webFrame]
decisionListener:listener];
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 46674eb..2c0404e 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -1,5 +1,5 @@
/*
- WebControllerPolicyDelegate.h
+ WebPolicyDelegate.h
Copyright 2002, Apple, Inc. All rights reserved.
Public header file.
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
- at class WebController;
+ at class WebView;
@class WebError;
@class WebFrame;
@class WebPolicyPrivate;
@@ -116,7 +116,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
@discussion This method will be called before loading starts, and
on every redirect.
*/
-- (void)controller:(WebController *)c decideNavigationPolicyForAction:(NSDictionary *)actionInformation
+- (void)webView:(WebView *)webView decideNavigationPolicyForAction:(NSDictionary *)actionInformation
andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(id<WebPolicyDecisionListener>)listener;
@@ -137,7 +137,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
will be called with a WebNavigationType of WebNavigationTypeOther
in its action. This is to avoid possible confusion about the modifiers.
*/
-- (void)controller:(WebController *)c decideNewWindowPolicyForAction:(NSDictionary *)actionInformation
+- (void)webView:(WebView *)webView decideNewWindowPolicyForAction:(NSDictionary *)actionInformation
andRequest:(WebRequest *)request
newFrameName:(NSString *)frameName
decisionListener:(id<WebPolicyDecisionListener>)listener;
@@ -150,7 +150,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
@param frame The frame which is loading the URL.
@param listener The object to call when the decision is made
*/
-- (void)controller:(WebController *)c decideContentPolicyForMIMEType:(NSString *)type
+- (void)webView:(WebView *)webView decideContentPolicyForMIMEType:(NSString *)type
andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(id<WebPolicyDecisionListener>)listener;
@@ -163,6 +163,6 @@ extern NSString *WebActionOriginalURLKey; // NSURL
@param URL The URL of the resource for which a particular action was requested but failed.
@param frame The frame in which the policy could not be implemented.
*/
-- (void)controller:(WebController *)c unableToImplementPolicyWithError:(WebError *)error inFrame:(WebFrame *)frame;
+- (void)webView:(WebView *)webView unableToImplementPolicyWithError:(WebError *)error inFrame:(WebFrame *)frame;
@end
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index a8c2c0b..7340ab3 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -4,7 +4,7 @@
Public header file.
*/
- at class WebController;
+ at class WebView;
@class WebDataSource;
@class WebPluginError;
@class WebResponse;
@@ -25,7 +25,7 @@
/*!
@method identifierForInitialRequest:fromDataSource:
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param request The request about to be sent.
@param dataSource The datasource that initiated the load.
@discussion An implementor of WebResourceLoadDelegate should provide an identifier
@@ -36,13 +36,13 @@
@result An identifier that will be passed back to the implementor for each callback.
The identifier will be retained.
*/
-- controller: (WebController *)wv identifierForInitialRequest: (WebRequest *)request fromDataSource: (WebDataSource *)dataSource;
+- webView: (WebView *)webView identifierForInitialRequest: (WebRequest *)request fromDataSource: (WebDataSource *)dataSource;
/*!
@method resource:willSendRequest:fromDataSource:
@discussion This message is sent before a load is initiated. The request may be modified
as necessary by the receiver.
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param identifier An identifier that can be used to track the progress of a resource load across
multiple call backs.
@param request The request about to be sent.
@@ -50,59 +50,59 @@
@result Returns the request, which may be mutated by the implementor, although typically
will be request.
*/
--(WebRequest *)controller: (WebController *)wv resource:identifier willSendRequest: (WebRequest *)request fromDataSource:(WebDataSource *)dataSource;
+-(WebRequest *)webView: (WebView *)webView resource:identifier willSendRequest: (WebRequest *)request fromDataSource:(WebDataSource *)dataSource;
/*!
@method resource:didReceiveResponse:fromDataSource:
@discussion This message is sent after a response has been received for this load.
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param identifier An identifier that can be used to track the progress of a resource load across
multiple call backs.
@param response The response for the request.
@param dataSource The dataSource that initiated the load.
*/
--(void)controller: (WebController *)wv resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource;
+-(void)webView: (WebView *)webView resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource;
/*!
@method resource:didReceiveContentLength:fromDataSource:
@discussion Multiple of these messages may be sent as data arrives.
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param identifier An identifier that can be used to track the progress of a resource load across
multiple call backs.
@param length The amount of new data received. This is not the total amount, just the new amount received.
@param dataSource The dataSource that initiated the load.
*/
--(void)controller: (WebController *)wv resource:identifier didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource;
+-(void)webView: (WebView *)webView resource:identifier didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource;
/*!
@method resource:didFinishLoadingFromDataSource:
@discussion This message is sent after a load has successfully completed.
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param identifier An identifier that can be used to track the progress of a resource load across
multiple call backs.
@param dataSource The dataSource that initiated the load.
*/
--(void)controller: (WebController *)wv resource:identifier didFinishLoadingFromDataSource:(WebDataSource *)dataSource;
+-(void)webView: (WebView *)webView resource:identifier didFinishLoadingFromDataSource:(WebDataSource *)dataSource;
/*!
@method resource:didFailLoadingWithError:fromDataSource:
@discussion This message is sent after a load has failed to load due to an error.
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param identifier An identifier that can be used to track the progress of a resource load across
multiple call backs.
@param error The error associated with this load.
@param dataSource The dataSource that initiated the load.
*/
--(void)controller: (WebController *)wv resource:identifier didFailLoadingWithError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
+-(void)webView: (WebView *)webView resource:identifier didFailLoadingWithError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
/*!
@method pluginFailedWithError:dataSource:
@discussion Called when a plug-in is not found, fails to load or is not available for some reason.
- @param controller The WebController sending the message.
+ @param webView The WebView sending the message.
@param error The plug-in error.
@param dataSource The dataSource that contains the plug-in.
*/
-- (void)controller: (WebController *)wv pluginFailedWithError:(WebPluginError *)error dataSource:(WebDataSource *)dataSource;
+- (void)webView: (WebView *)webView pluginFailedWithError:(WebPluginError *)error dataSource:(WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index 361bc84..473e019 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -158,7 +158,7 @@
[super menuForEvent:theEvent];
WebFrameView *webFrameView = [self _web_parentWebFrameView];
- WebController *controller = [webFrameView _controller];
+ WebView *controller = [webFrameView _controller];
WebFrame *frame = [webFrameView webFrame];
ASSERT(frame);
diff --git a/WebKit/WebView.subproj/WebUIDelegate.h b/WebKit/WebView.subproj/WebUIDelegate.h
index 41aa4f1..badc1e0 100644
--- a/WebKit/WebView.subproj/WebUIDelegate.h
+++ b/WebKit/WebView.subproj/WebUIDelegate.h
@@ -31,7 +31,7 @@
@end
- at class WebController;
+ at class WebView;
/*!
@category WebWindowOperationsDelegate
@@ -48,9 +48,9 @@
@discussion The newly created window is hidden, and the window operations delegate on the
new controllers will get a showWindow call.
@param request The request to load.
- @result The WebController for the WebView in the new window.
+ @result The WebView for the new window.
*/
-- (WebController *)controller:(WebController *)controller createWindowWithRequest:(WebRequest *)request;
+- (WebView *)webView:(WebView *)webView createWindowWithRequest:(WebRequest *)request;
/*!
@method showWindow
@@ -59,7 +59,7 @@
@discussion This will only be called just after createWindowWithRequest:
is used to create a new window.
*/
-- (void)controllerShowWindow:(WebController *)controller;
+- (void)webViewShowWindow:(WebView *)webView;
/*!
@method closeWindow
@@ -69,7 +69,7 @@
controller. Other clients may choose to ignore this method
entirely.
*/
-- (void)controllerCloseWindow:(WebController *)controller;
+- (void)webViewCloseWindow:(WebView *)webView;
/*!
@method focusWindow
@@ -77,7 +77,7 @@
@discussion Clients showing multiple views in one window may want to
also do something to focus the one corresponding to this controller.
*/
-- (void)controllerFocusWindow:(WebController *)controller;
+- (void)webViewFocusWindow:(WebView *)webView;
/*!
@method unfocusWindow
@@ -85,7 +85,7 @@
@discussion Clients showing multiple views in one window may want to
also do something to unfocus the one corresponding to this controller.
*/
-- (void)controllerUnfocusWindow:(WebController *)controller;
+- (void)webViewUnfocusWindow:(WebView *)webView;
/*!
@method firstResponderInWindow
@@ -96,7 +96,7 @@
on the real NSWindow would. It's OK to return either nil or the
real first responder if some control not in the window has focus.
*/
-- (NSResponder *)controllerFirstResponderInWindow:(WebController *)controller;
+- (NSResponder *)webViewFirstResponderInWindow:(WebView *)webView;
/*!
@method makeFirstResponderInWindow:
@@ -108,7 +108,7 @@
hierarchy, it may be desirable to save the first responder
elsewhere, or possibly ignore this call.
*/
-- (void)controller: (WebController *)wv makeFirstResponderInWindow:(NSResponder *)responder;
+- (void)webView: (WebView *)webView makeFirstResponderInWindow:(NSResponder *)responder;
/*!
@@ -116,14 +116,14 @@
@abstract Set the window's status display, if any, to the specified string.
@param text The status text to set
*/
-- (void)controller: (WebController *)wv setStatusText:(NSString *)text;
+- (void)webView: (WebView *)webView setStatusText:(NSString *)text;
/*!
@method statusText
@abstract Get the currently displayed status text.
@result The status text
*/
-- (NSString *)controllerStatusText:(WebController *)controller ;
+- (NSString *)webViewStatusText:(WebView *)webView ;
/*!
@method mouseDidMoveOverElement:modifierFlags:
@@ -132,7 +132,7 @@
@param elementInformation Dictionary that describes the element that the mouse is over, or nil.
@param modifierFlags The modifier flags as in NSEvent.
*/
-- (void)controller: (WebController *)wv mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
+- (void)webView: (WebView *)webView mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
/*!
@method areToolbarsVisible
@@ -144,7 +144,7 @@
this method if at least one is on.
@result YES if at least one toolbar is visible, otherwise NO.
*/
-- (BOOL)controllerAreToolbarsVisible: (WebController *)webView;
+- (BOOL)webViewAreToolbarsVisible: (WebView *)webView;
/*!
@method setToolbarsVisible:
@@ -154,14 +154,14 @@
(except for a possible status bar). Setting it to NO should turn
off all toolbars (with the same exception).
*/
-- (void)controller: (WebController *)wv setToolbarsVisible:(BOOL)visible;
+- (void)webView: (WebView *)webView setToolbarsVisible:(BOOL)visible;
/*!
@method isStatusBarVisible
@abstract Determine whether the status bar is visible.
@result YES if the status bar is visible, otherwise NO.
*/
-- (BOOL)controllerIsStatusBarVisible: (WebController *)webView;
+- (BOOL)webViewIsStatusBarVisible: (WebView *)webView;
/*!
@method setStatusBarVisible:
@@ -170,7 +170,7 @@
@discussion Setting this to YES should show the status bar,
setting it to NO should hide it.
*/
-- (void)controller: (WebController *)wv setStatusBarVisible:(BOOL)visible;
+- (void)webView: (WebView *)webView setStatusBarVisible:(BOOL)visible;
/*!
@method isResizable
@@ -180,7 +180,7 @@
have have their own separate resize controls and this may need to
be handled specially.
*/
-- (BOOL)controllerIsResizable: (WebController *)webView;
+- (BOOL)webViewIsResizable: (WebView *)webView;
/*!
@method setResizable:
@@ -190,7 +190,7 @@
have have their own separate resize controls and this may need to
be handled specially.
*/
-- (void)controller: (WebController *)wv setResizable:(BOOL)resizable;
+- (void)webView: (WebView *)webView setResizable:(BOOL)resizable;
/*!
@method setFrame:
@@ -200,14 +200,14 @@
this method is provided so implementors of this protocol can do special
things on programmatic move/resize, like avoiding autosaving of the size.
*/
-- (void)controller: (WebController *)wv setFrame:(NSRect)frame;
+- (void)webView: (WebView *)webView setFrame:(NSRect)frame;
/*!
@method frame
@abstract REturn the window's frame rect
@discussion
*/
-- (NSRect)controllerFrame: (WebController *)webView;
+- (NSRect)webViewFrame: (WebView *)webView;
/*!
@method runJavaScriptAlertPanelWithMessage:
@@ -216,7 +216,7 @@
@discussion Clients should visually indicate that this panel comes
from JavaScript. The panel should have a single OK button.
*/
-- (void)controller: (WebController *)wv runJavaScriptAlertPanelWithMessage:(NSString *)message;
+- (void)webView: (WebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message;
/*!
@method runJavaScriptAlertPanelWithMessage:
@@ -227,7 +227,7 @@
from JavaScript. The panel should have two buttons, e.g. "OK" and
"Cancel".
*/
-- (BOOL)controller: (WebController *)wv runJavaScriptConfirmPanelWithMessage:(NSString *)message;
+- (BOOL)webView: (WebView *)webView runJavaScriptConfirmPanelWithMessage:(NSString *)message;
/*!
@method runJavaScriptTextInputPanelWithPrompt:defaultText:
@@ -239,7 +239,7 @@
from JavaScript. The panel should have two buttons, e.g. "OK" and
"Cancel", and an area to type text.
*/
-- (NSString *)controller: (WebController *)wv runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText;
+- (NSString *)webView: (WebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText;
/*!
@message runOpenPanelForFileButtonWithResultListener:
@@ -248,6 +248,6 @@
@discussion This method is passed a callback object instead of giving a return
value so that it can be handled with a sheet.
*/
-- (void)controller: (WebController *)wv runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener;
+- (void)webView: (WebView *)webView runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener;
@end
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index a8bb8fd..7a50723 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -1,5 +1,5 @@
/*
- WebController.h
+ WebView.h
Copyright 2001, 2002, Apple Computer, Inc.
Public header file.
@@ -9,8 +9,7 @@
@class WebBackForwardList;
@class WebHistoryItem;
- at class WebController;
- at class WebControllerPrivate;
+ at class WebViewPrivate;
@class WebDataSource;
@class WebDownload;
@class WebError;
@@ -19,32 +18,6 @@
@class WebPreferences;
@class WebFrameView;
- at interface WebContentTypes : NSObject
-/*!
- @method canShowMIMEType:
- @abstract Checks if the WebKit can show content of a certain MIME type.
- @param MIMEType The MIME type to check.
- @result YES if the WebKit can show content with MIMEtype.
-*/
-+ (BOOL)canShowMIMEType:(NSString *)MIMEType;
-
-/*!
- @method canShowFile:
- @abstract Checks if the WebKit can show the content of the file at the specified path.
- @param path The path of the file to check
- @result YES if the WebKit can show the content of the file at the specified path.
-*/
-+ (BOOL)canShowFile:(NSString *)path;
-
-/*!
- @method suggestedFileExtensionForMIMEType:
- @param MIMEType The MIME type to check.
- @result The extension based on the MIME type
-*/
-+ (NSString *)suggestedFileExtensionForMIMEType: (NSString *)MIMEType;
-
-
- at end
// These strings are keys into the element dictionary provided in
// the WebContextMenuDelegate's contextMenuItemsForElement and the WebControllerPolicyDelegate's clickPolicyForElement.
@@ -61,50 +34,59 @@ extern NSString *WebElementLinkTitleKey; // NSString of the title of the anchor
extern NSString *WebElementLinkLabelKey; // NSString of the text within the anchor
/*!
- @class WebController
- WebController manages the interaction between WebFrameViews and WebDataSources. Modification
- of the policies and behavior of the WebKit is largely managed by WebControllers and their
+ @class WebView
+ WebView manages the interaction between WebFrameViews and WebDataSources. Modification
+ of the policies and behavior of the WebKit is largely managed by WebViews and their
delegates.
<p>
Typical usage:
</p>
<pre>
- WebController *webController;
+ WebView *WebView;
WebFrame *mainFrame;
- webController = [[WebController alloc] initWithView: webFrameView];
- mainFrame = [webController mainFrame];
+ webView = [[WebController alloc] initWithFrame: NSMakeRect (0,0,640,480)];
+ mainFrame = [webView mainFrame];
[mainFrame loadRequest:request];
</pre>
- WebControllers have the following delegates: WebWindowOperationsDelegate,
+ WebViews have the following delegates: WebWindowOperationsDelegate,
WebResourceLoadDelegate, WebContextMenuDelegate, WebLocationChangeDelegate,
- and WebControllerPolicyDelegate.
+ and WebPolicyDelegate.
- WebKit depends on the WebController's WebWindowOperationsDelegate for all window
+ WebKit depends on the WebView's WebWindowOperationsDelegate for all window
related management, including opening new windows and controlling the user interface
elements in those windows.
WebResourceLoadDelegate is used to monitor the progress of resources as they are
loaded. This delegate may be used to present users with a progress monitor.
- WebController's WebContextMenuDelegate can customize the context menus that appear
+ WebView's WebContextMenuDelegate can customize the context menus that appear
over content managed by the WebKit.
The WebLocationChangeDelegate receives messages when the URL in a WebFrame is
changed.
- WebController's WebControllerPolicyDelegate can make determinations about how
+ WebView's WebPolicyDelegate can make determinations about how
content should be handled, based on the resource's URL and MIME type.
*/
- at interface WebController : NSView
+ at interface WebView : NSView
{
@private
- WebControllerPrivate *_private;
+ WebViewPrivate *_private;
}
/*!
+ @method canShowMIMEType:
+ @abstract Checks if the WebKit can show content of a certain MIME type.
+ @param MIMEType The MIME type to check.
+ @result YES if the WebKit can show content with MIMEtype.
+*/
++ (BOOL)canShowMIMEType:(NSString *)MIMEType;
+
+
+/*!
@method initWithView:
@abstract This method is a convenience equivalent to initWithView:view frameName:nil groupName:nil
@param view The view to use.
@@ -113,15 +95,15 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
/*!
@method initWithView:frameName:setName:
- @abstract The designated initializer for WebController.
- @discussion Initialize a WebController with the supplied parameters. This method will
+ @abstract The designated initializer for WebView.
+ @discussion Initialize a WebView with the supplied parameters. This method will
create a main WebFrame with the view. Passing a top level frame name is useful if you
handle a targetted frame navigation that would normally open a window in some other
- way that still ends up creating a new WebController.
+ way that still ends up creating a new WebView.
@param view The main view to be associated with the controller. May be nil.
@param frameName The name to use for the top level frame. May be nil.
@param groupName The name of the controller set to which this controller will be added. May be nil.
- @result Returns an initialized WebController.
+ @result Returns an initialized WebView.
*/
- initWithView: (WebFrameView *)view frameName: (NSString *)frameName groupName: (NSString *)name ;
@@ -197,15 +179,15 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
/*!
@method setPolicyDelegate:
- @abstract Set the controller's WebControllerPolicyDelegate delegate.
- @param delegate The WebControllerPolicyDelegate to set as the delegate.
+ @abstract Set the controller's WebPolicyDelegate delegate.
+ @param delegate The WebPolicyDelegate to set as the delegate.
*/
- (void)setPolicyDelegate: (id)delegate;
/*!
@method policyDelegate
- @abstract Return the controller's WebControllerPolicyDelegate.
- @result The controller's WebControllerPolicyDelegate.
+ @abstract Return the controller's WebPolicyDelegate.
+ @result The controller's WebPolicyDelegate.
*/
- (id)policyDelegate;
@@ -357,7 +339,7 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
@end
- at interface WebController (WebIBActions)
+ at interface WebView (WebIBActions)
- (IBAction)stopLoading:(id)sender;
- (IBAction)goBack:(id)sender;
- (IBAction)goForward:(id)sender;
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index b92f6e0..d63ba4b 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -1,5 +1,5 @@
/*
- WebController.m
+ WebView.m
Copyright 2001, 2002 Apple, Inc. All rights reserved.
*/
@@ -55,7 +55,8 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
- at implementation WebContentTypes
+
+ at implementation WebView
+ (BOOL)canShowMIMEType:(NSString *)MIMEType
{
@@ -70,27 +71,10 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
return NO;
}
-+ (BOOL)canShowFile:(NSString *)path
-{
- NSString *MIMEType;
-
- MIMEType = [WebController _MIMETypeForFile:path];
- return [[self class] canShowMIMEType:MIMEType];
-}
-
-+ (NSString *)suggestedFileExtensionForMIMEType: (NSString *)type
-{
- return [[WebFileTypeMappings sharedMappings] preferredExtensionForMIMEType:type];
-}
-
- at end
-
- at implementation WebController
-
- (void)_commonInitialization: (WebFrameView *)wv frameName:(NSString *)frameName groupName:(NSString *)groupName
{
- _private = [[WebControllerPrivate alloc] init];
- _private->mainFrame = [[WebFrame alloc] initWithName: frameName webFrameView: wv controller: self];
+ _private = [[WebViewPrivate alloc] init];
+ _private->mainFrame = [[WebFrame alloc] initWithName: frameName webFrameView: wv webView: self];
_private->controllerSetName = [groupName retain];
if (_private->controllerSetName != nil) {
[WebControllerSets addController:self toSetNamed:_private->controllerSetName];
@@ -114,7 +98,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
- initWithFrame: (NSRect)f
{
[super initWithFrame: f];
- WebFrameView *wv = [[WebFrameView alloc] initWithFrame: f];
+ WebFrameView *wv = [[WebFrameView alloc] initWithFrame: NSMakeRect(0,0,f.size.width,f.size.height)];
[wv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[self addSubview: wv];
[self _commonInitialization: wv frameName:nil groupName:nil];
@@ -327,7 +311,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
- (BOOL)supportsTextEncoding
{
- id documentView = [[[self mainFrame] view] documentView];
+ id documentView = [[[self mainFrame] frameView] documentView];
return [documentView conformsToProtocol:@protocol(WebDocumentText)]
&& [documentView supportsTextEncoding];
}
@@ -421,7 +405,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
// FIXME: Some day we will start reporting the actual CPU here instead of hardcoding PPC.
NSString *language = [NSUserDefaults _web_preferredLanguageCode];
- id sourceVersion = [[NSBundle bundleForClass:[WebController class]]
+ id sourceVersion = [[NSBundle bundleForClass:[WebView class]]
objectForInfoDictionaryKey:(id)kCFBundleVersionKey];
NSString *applicationName = _private->applicationNameForUserAgent;
@@ -462,7 +446,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
@end
- at implementation WebController (WebIBActions)
+ at implementation WebView (WebIBActions)
- (IBAction)takeStringURLFrom: sender
{
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index d1dd150..8c5c050 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -1,6 +1,6 @@
/*
- WebController.m
- Copyright 2001, Apple, Inc. All rights reserved.
+ WebViewPrivate.m
+ Copyright 2001, Apple, Inc. All rights reserved.
*/
#import <WebKit/WebController.h>
@@ -17,7 +17,7 @@ enum { NumUserAgentStringTypes = WinIE + 1 };
#define NUM_LOCATION_CHANGE_DELEGATE_SELECTORS 10
- at interface WebControllerPrivate : NSObject
+ at interface WebViewPrivate : NSObject
{
@public
WebFrame *mainFrame;
@@ -52,7 +52,22 @@ enum { NumUserAgentStringTypes = WinIE + 1 };
}
@end
- at interface WebController (WebPrivate)
+ at interface WebView (WebPrivate)
+
+/*!
+ @method canShowFile:
+ @abstract Checks if the WebKit can show the content of the file at the specified path.
+ @param path The path of the file to check
+ @result YES if the WebKit can show the content of the file at the specified path.
+*/
++ (BOOL)canShowFile:(NSString *)path;
+
+/*!
+ @method suggestedFileExtensionForMIMEType:
+ @param MIMEType The MIME type to check.
+ @result The extension based on the MIME type
+*/
++ (NSString *)suggestedFileExtensionForMIMEType: (NSString *)MIMEType;
/*!
@method frameForDataSource:
@@ -92,7 +107,7 @@ enum { NumUserAgentStringTypes = WinIE + 1 };
- (WebFrame *)_findFrameInThisWindowNamed: (NSString *)name;
- (WebFrame *)_findFrameNamed: (NSString *)name;
-- (WebController *)_openNewWindowWithRequest:(WebRequest *)request;
+- (WebView *)_openNewWindowWithRequest:(WebRequest *)request;
- (NSMenu *)_menuForElement:(NSDictionary *)element;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index c4b904d..f364157 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -1,6 +1,6 @@
/*
WebControllerPrivate.m
- Copyright (c) 2001, 2002, Apple, Inc. All rights reserved.
+ Copyright (c) 2001, 2002, Apple, Inc. All rights reserved.
*/
#import <WebKit/WebBackForwardList.h>
@@ -34,7 +34,7 @@
#import <WebCore/WebCoreSettings.h>
- at implementation WebControllerPrivate
+ at implementation WebViewPrivate
- init
{
@@ -54,7 +54,7 @@
int i, count;
[[aFrame dataSource] _setController: nil];
- [[aFrame view] _setController: nil];
+ [[aFrame frameView] _setController: nil];
[aFrame _setController: nil];
// Walk the frame tree, niling the controller.
@@ -92,7 +92,21 @@
@end
- at implementation WebController (WebPrivate)
+ at implementation WebView (WebPrivate)
+
++ (BOOL)canShowFile:(NSString *)path
+{
+ NSString *MIMEType;
+
+ MIMEType = [WebView _MIMETypeForFile:path];
+ return [[self class] canShowMIMEType:MIMEType];
+}
+
++ (NSString *)suggestedFileExtensionForMIMEType: (NSString *)type
+{
+ return [[WebFileTypeMappings sharedMappings] preferredExtensionForMIMEType:type];
+}
+
- (WebFrame *)_createFrameNamed:(NSString *)fname inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling
{
@@ -101,7 +115,7 @@
[childView _setController:self];
[childView setAllowsScrolling:allowsScrolling];
- WebFrame *newFrame = [[WebFrame alloc] initWithName:fname webFrameView:childView controller:self];
+ WebFrame *newFrame = [[WebFrame alloc] initWithName:fname webFrameView:childView webView:self];
[childView release];
@@ -284,7 +298,7 @@
// Try other controllers in the same set
if (_private->controllerSetName != nil) {
NSEnumerator *enumerator = [WebControllerSets controllersInSetNamed:_private->controllerSetName];
- WebController *controller;
+ WebView *controller;
while ((controller = [enumerator nextObject]) != nil && frame == nil) {
frame = [controller _findFrameInThisWindowNamed:name];
}
@@ -293,17 +307,17 @@
return frame;
}
-- (WebController *)_openNewWindowWithRequest:(WebRequest *)request
+- (WebView *)_openNewWindowWithRequest:(WebRequest *)request
{
id wd = [self windowOperationsDelegate];
- WebController *newWindowController = nil;
- if ([wd respondsToSelector:@selector(controller:createWindowWithRequest:)])
- newWindowController = [wd controller:self createWindowWithRequest:request];
+ WebView *newWindowController = nil;
+ if ([wd respondsToSelector:@selector(webView:createWindowWithRequest:)])
+ newWindowController = [wd webView:self createWindowWithRequest:request];
else {
- newWindowController = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] controller:self createWindowWithRequest: request];
+ newWindowController = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] webView:self createWindowWithRequest: request];
}
- [[newWindowController _windowOperationsDelegateForwarder] controllerShowWindow: self];
+ [[newWindowController _windowOperationsDelegateForwarder] webViewShowWindow: self];
return newWindowController;
}
@@ -311,7 +325,7 @@
- (NSMenu *)_menuForElement:(NSDictionary *)element
{
NSArray *defaultMenuItems = [_private->defaultContextMenuDelegate
- controller:self contextMenuItemsForElement:element defaultMenuItems:nil];
+ webView:self contextMenuItemsForElement:element defaultMenuItems:nil];
NSArray *menuItems = defaultMenuItems;
NSMenu *menu = nil;
unsigned i;
@@ -319,8 +333,8 @@
if (_private->contextMenuDelegate) {
id cd = _private->contextMenuDelegate;
- if ([cd respondsToSelector:@selector(controller:contextMenuItemsForElement:defaultMenuItems:)])
- menuItems = [cd controller:self contextMenuItemsForElement:element defaultMenuItems:defaultMenuItems];
+ if ([cd respondsToSelector:@selector(webView:contextMenuItemsForElement:defaultMenuItems:)])
+ menuItems = [cd webView:self contextMenuItemsForElement:element defaultMenuItems:defaultMenuItems];
}
if (menuItems && [menuItems count] > 0) {
@@ -341,7 +355,7 @@
// for that case.
if (dictionary && _private->lastElementWasNonNil) {
- [[self _windowOperationsDelegateForwarder] controller:self mouseDidMoveOverElement:dictionary modifierFlags:modifierFlags];
+ [[self _windowOperationsDelegateForwarder] webView:self mouseDidMoveOverElement:dictionary modifierFlags:modifierFlags];
}
_private->lastElementWasNonNil = dictionary != nil;
}
@@ -473,7 +487,7 @@
int i, count;
WebFrame *result, *aFrame;
- if ([frame view] == aView)
+ if ([frame frameView] == aView)
return frame;
frames = [frame children];
diff --git a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
index 41aa4f1..badc1e0 100644
--- a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
+++ b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
@@ -31,7 +31,7 @@
@end
- at class WebController;
+ at class WebView;
/*!
@category WebWindowOperationsDelegate
@@ -48,9 +48,9 @@
@discussion The newly created window is hidden, and the window operations delegate on the
new controllers will get a showWindow call.
@param request The request to load.
- @result The WebController for the WebView in the new window.
+ @result The WebView for the new window.
*/
-- (WebController *)controller:(WebController *)controller createWindowWithRequest:(WebRequest *)request;
+- (WebView *)webView:(WebView *)webView createWindowWithRequest:(WebRequest *)request;
/*!
@method showWindow
@@ -59,7 +59,7 @@
@discussion This will only be called just after createWindowWithRequest:
is used to create a new window.
*/
-- (void)controllerShowWindow:(WebController *)controller;
+- (void)webViewShowWindow:(WebView *)webView;
/*!
@method closeWindow
@@ -69,7 +69,7 @@
controller. Other clients may choose to ignore this method
entirely.
*/
-- (void)controllerCloseWindow:(WebController *)controller;
+- (void)webViewCloseWindow:(WebView *)webView;
/*!
@method focusWindow
@@ -77,7 +77,7 @@
@discussion Clients showing multiple views in one window may want to
also do something to focus the one corresponding to this controller.
*/
-- (void)controllerFocusWindow:(WebController *)controller;
+- (void)webViewFocusWindow:(WebView *)webView;
/*!
@method unfocusWindow
@@ -85,7 +85,7 @@
@discussion Clients showing multiple views in one window may want to
also do something to unfocus the one corresponding to this controller.
*/
-- (void)controllerUnfocusWindow:(WebController *)controller;
+- (void)webViewUnfocusWindow:(WebView *)webView;
/*!
@method firstResponderInWindow
@@ -96,7 +96,7 @@
on the real NSWindow would. It's OK to return either nil or the
real first responder if some control not in the window has focus.
*/
-- (NSResponder *)controllerFirstResponderInWindow:(WebController *)controller;
+- (NSResponder *)webViewFirstResponderInWindow:(WebView *)webView;
/*!
@method makeFirstResponderInWindow:
@@ -108,7 +108,7 @@
hierarchy, it may be desirable to save the first responder
elsewhere, or possibly ignore this call.
*/
-- (void)controller: (WebController *)wv makeFirstResponderInWindow:(NSResponder *)responder;
+- (void)webView: (WebView *)webView makeFirstResponderInWindow:(NSResponder *)responder;
/*!
@@ -116,14 +116,14 @@
@abstract Set the window's status display, if any, to the specified string.
@param text The status text to set
*/
-- (void)controller: (WebController *)wv setStatusText:(NSString *)text;
+- (void)webView: (WebView *)webView setStatusText:(NSString *)text;
/*!
@method statusText
@abstract Get the currently displayed status text.
@result The status text
*/
-- (NSString *)controllerStatusText:(WebController *)controller ;
+- (NSString *)webViewStatusText:(WebView *)webView ;
/*!
@method mouseDidMoveOverElement:modifierFlags:
@@ -132,7 +132,7 @@
@param elementInformation Dictionary that describes the element that the mouse is over, or nil.
@param modifierFlags The modifier flags as in NSEvent.
*/
-- (void)controller: (WebController *)wv mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
+- (void)webView: (WebView *)webView mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
/*!
@method areToolbarsVisible
@@ -144,7 +144,7 @@
this method if at least one is on.
@result YES if at least one toolbar is visible, otherwise NO.
*/
-- (BOOL)controllerAreToolbarsVisible: (WebController *)webView;
+- (BOOL)webViewAreToolbarsVisible: (WebView *)webView;
/*!
@method setToolbarsVisible:
@@ -154,14 +154,14 @@
(except for a possible status bar). Setting it to NO should turn
off all toolbars (with the same exception).
*/
-- (void)controller: (WebController *)wv setToolbarsVisible:(BOOL)visible;
+- (void)webView: (WebView *)webView setToolbarsVisible:(BOOL)visible;
/*!
@method isStatusBarVisible
@abstract Determine whether the status bar is visible.
@result YES if the status bar is visible, otherwise NO.
*/
-- (BOOL)controllerIsStatusBarVisible: (WebController *)webView;
+- (BOOL)webViewIsStatusBarVisible: (WebView *)webView;
/*!
@method setStatusBarVisible:
@@ -170,7 +170,7 @@
@discussion Setting this to YES should show the status bar,
setting it to NO should hide it.
*/
-- (void)controller: (WebController *)wv setStatusBarVisible:(BOOL)visible;
+- (void)webView: (WebView *)webView setStatusBarVisible:(BOOL)visible;
/*!
@method isResizable
@@ -180,7 +180,7 @@
have have their own separate resize controls and this may need to
be handled specially.
*/
-- (BOOL)controllerIsResizable: (WebController *)webView;
+- (BOOL)webViewIsResizable: (WebView *)webView;
/*!
@method setResizable:
@@ -190,7 +190,7 @@
have have their own separate resize controls and this may need to
be handled specially.
*/
-- (void)controller: (WebController *)wv setResizable:(BOOL)resizable;
+- (void)webView: (WebView *)webView setResizable:(BOOL)resizable;
/*!
@method setFrame:
@@ -200,14 +200,14 @@
this method is provided so implementors of this protocol can do special
things on programmatic move/resize, like avoiding autosaving of the size.
*/
-- (void)controller: (WebController *)wv setFrame:(NSRect)frame;
+- (void)webView: (WebView *)webView setFrame:(NSRect)frame;
/*!
@method frame
@abstract REturn the window's frame rect
@discussion
*/
-- (NSRect)controllerFrame: (WebController *)webView;
+- (NSRect)webViewFrame: (WebView *)webView;
/*!
@method runJavaScriptAlertPanelWithMessage:
@@ -216,7 +216,7 @@
@discussion Clients should visually indicate that this panel comes
from JavaScript. The panel should have a single OK button.
*/
-- (void)controller: (WebController *)wv runJavaScriptAlertPanelWithMessage:(NSString *)message;
+- (void)webView: (WebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message;
/*!
@method runJavaScriptAlertPanelWithMessage:
@@ -227,7 +227,7 @@
from JavaScript. The panel should have two buttons, e.g. "OK" and
"Cancel".
*/
-- (BOOL)controller: (WebController *)wv runJavaScriptConfirmPanelWithMessage:(NSString *)message;
+- (BOOL)webView: (WebView *)webView runJavaScriptConfirmPanelWithMessage:(NSString *)message;
/*!
@method runJavaScriptTextInputPanelWithPrompt:defaultText:
@@ -239,7 +239,7 @@
from JavaScript. The panel should have two buttons, e.g. "OK" and
"Cancel", and an area to type text.
*/
-- (NSString *)controller: (WebController *)wv runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText;
+- (NSString *)webView: (WebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText;
/*!
@message runOpenPanelForFileButtonWithResultListener:
@@ -248,6 +248,6 @@
@discussion This method is passed a callback object instead of giving a return
value so that it can be handled with a sheet.
*/
-- (void)controller: (WebController *)wv runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener;
+- (void)webView: (WebView *)webView runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener;
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list