[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:29:38 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 4c0d4c45bbe25b2d944994110403545c3aec8749
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 14 03:09:31 2003 +0000
WebKit:
First stage of the WebController -> WebView, WebView -> WebFrameView.
This change does the WebView -> WebFrameView part of the change. Also
changes WebController's inheritance. It now inherits from NSView. Also
added some simple action methods to WebController (soon to be WebView)
to facilitate IB hookup.
Reviewed by Maciej.
* Carbon.subproj/CarbonWindowAdapter.m:
* Carbon.subproj/HIWebView.h:
* Carbon.subproj/HIWebView.m:
(if):
(switch):
* Carbon.subproj/HIWebViewPriv.h:
* Misc.subproj/WebKitStatistics.m:
(+[WebKitStatistics viewCount]):
* Misc.subproj/WebKitStatisticsPrivate.h:
* Misc.subproj/WebNSViewExtras.h:
* Misc.subproj/WebNSViewExtras.m:
(-[NSView _web_parentWebFrameView]):
* Panels.subproj/WebStandardPanels.m:
(-[WebStandardPanels frontmostWindowLoadingURL:]):
* Plugins.subproj/WebNetscapePluginDocumentView.m:
(-[WebNetscapePluginDocumentView layout]):
* Plugins.subproj/WebNetscapePluginEmbeddedView.m:
(-[WebNetscapePluginEmbeddedView dataSource]):
* Plugins.subproj/WebNetscapePluginRepresentation.m:
(-[WebNetscapePluginRepresentation receivedData:withDataSource:]):
* Plugins.subproj/WebNullPluginView.m:
(-[WebNullPluginView viewDidMoveToWindow]):
* Plugins.subproj/WebPluginDatabase.m:
(-[WebPluginDatabase init]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge areScrollbarsVisible]):
(-[WebBridge setScrollbarsVisible:]):
(-[WebBridge window]):
(-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]):
(-[WebBridge nextKeyViewOutsideWebFrameViews]):
(-[WebBridge previousKeyViewOutsideWebFrameViews]):
(-[WebBridge setNeedsReapplyStyles]):
(-[WebBridge setNeedsLayout]):
(-[WebBridge pluginViewWithPackage:attributes:baseURL:]):
(-[WebBridge frameRequiredForMIMEType:]):
(-[WebBridge handleMouseDragged:]):
(-[WebBridge mayStartDragWithMouseDragged:]):
* WebKit.exp:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebController.h:
* WebView.subproj/WebController.m:
(+[WebContentTypes canShowMIMEType:]):
(-[WebController _commonInitialization:frameName:groupName:]):
(-[WebController init]):
(-[WebController initWithFrame:]):
(-[WebController initWithView:]):
(-[WebController supportsTextEncoding]):
(-[WebController takeStringURLFrom:]):
(-[WebController goBack:]):
(-[WebController goForward:]):
(-[WebController stopLoading:]):
* WebView.subproj/WebControllerPrivate.h:
* WebView.subproj/WebControllerPrivate.m:
(-[WebControllerPrivate _clearControllerReferences:]):
(-[WebController _createFrameNamed:inParent:allowsScrolling:]):
(-[WebController _frameForView:fromFrame:]):
(-[WebController _frameForView:]):
* WebView.subproj/WebDataSource.m:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _layoutChildren]):
(-[WebDataSource _receivedData:]):
* WebView.subproj/WebDebugDOMNode.h:
* WebView.subproj/WebDebugDOMNode.m:
(-[WebDebugDOMNode initWithWebFrameView:]):
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultContextMenuDelegate controller:contextMenuItemsForElement:defaultMenuItems:]):
* WebView.subproj/WebDefaultLocationChangeDelegate.m:
(-[WebDefaultLocationChangeDelegate controller:locationChangeStartedForDataSource:]):
(-[WebDefaultLocationChangeDelegate controller:serverRedirectedForDataSource:]):
(-[WebDefaultLocationChangeDelegate controller:locationChangeCommittedForDataSource:]):
(-[WebDefaultLocationChangeDelegate controller:receivedPageTitle:forDataSource:]):
(-[WebDefaultLocationChangeDelegate controller:receivedPageIcon:forDataSource:]):
(-[WebDefaultLocationChangeDelegate controller:locationChangeDone:forDataSource:]):
(-[WebDefaultLocationChangeDelegate controller:willCloseLocationForDataSource:]):
(-[WebDefaultLocationChangeDelegate controller:locationChangedWithinPageForDataSource:]):
(-[WebDefaultLocationChangeDelegate controller:clientWillRedirectTo:delay:fireDate:forFrame:]):
(-[WebDefaultLocationChangeDelegate controller:clientRedirectCancelledForFrame:]):
* WebView.subproj/WebDefaultPolicyDelegate.m:
(-[WebDefaultPolicyDelegate controller:unableToImplementPolicyWithError:inFrame:]):
(-[WebDefaultPolicyDelegate controller:decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
(-[WebDefaultPolicyDelegate controller:decideNewWindowPolicyForAction:andRequest:newFrameName:decisionListener:]):
* WebView.subproj/WebDefaultResourceLoadDelegate.m:
(-[WebDefaultResourceLoadDelegate controller:identifierForInitialRequest:fromDataSource:]):
(-[WebDefaultResourceLoadDelegate controller:resource:willSendRequest:fromDataSource:]):
(-[WebDefaultResourceLoadDelegate controller:resource:didReceiveResponse:fromDataSource:]):
(-[WebDefaultResourceLoadDelegate controller:resource:didReceiveContentLength:fromDataSource:]):
(-[WebDefaultResourceLoadDelegate controller:resource:didFinishLoadingFromDataSource:]):
(-[WebDefaultResourceLoadDelegate controller:resource:didFailLoadingWithError:fromDataSource:]):
(-[WebDefaultResourceLoadDelegate controller:pluginFailedWithError:dataSource:]):
* WebView.subproj/WebDefaultWindowOperationsDelegate.m:
(-[WebDefaultWindowOperationsDelegate controller:runJavaScriptConfirmPanelWithMessage:]):
(-[WebDefaultWindowOperationsDelegate controller:runJavaScriptTextInputPanelWithPrompt:defaultText:]):
(-[WebDefaultWindowOperationsDelegate controller:runOpenPanelForFileButtonWithResultListener:]):
* WebView.subproj/WebDocument.h:
* WebView.subproj/WebDynamicScrollBarsView.m:
* WebView.subproj/WebFrame.h:
* WebView.subproj/WebFrame.m:
(-[WebFrame init]):
(-[WebFrame initWithName:webFrameView:controller:]):
(-[WebFrame view]):
(+[WebFrame registerViewClass:representationClass:forMIMEType:]):
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
(if):
(switch):
* WebView.subproj/WebHTMLView.h:
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView dragImage:at:offset:event:pasteboard:source:slideBack:]):
(-[WebHTMLView draggedImage:endedAt:operation:]):
(-[WebHTMLView becomeFirstResponder]):
* WebView.subproj/WebHTMLViewPrivate.m:
(-[WebHTMLView _controller]):
(-[WebHTMLView _frame]):
(-[WebHTMLView _elementAtPoint:]):
* WebView.subproj/WebImageView.m:
(-[WebImageView controller]):
(-[WebImageView menuForEvent:]):
(-[WebImageView mouseDragged:]):
(-[WebImageView draggedImage:endedAt:operation:]):
* WebView.subproj/WebLocationChangeDelegate.h:
* WebView.subproj/WebRenderNode.h:
* WebView.subproj/WebRenderNode.m:
(-[WebRenderNode initWithName:position:rect:view:children:]):
(-[WebRenderNode initWithWebFrameView:]):
* WebView.subproj/WebResourceLoadDelegate.h:
* WebView.subproj/WebTextView.m:
(-[WebTextView menuForEvent:]):
* WebView.subproj/WebView.h:
* WebView.subproj/WebView.m:
(-[WebFrameView initWithFrame:]):
(-[WebFrameView dealloc]):
* WebView.subproj/WebViewPrivate.h:
* WebView.subproj/WebViewPrivate.m:
* WebView.subproj/WebWindowOperationsDelegate.h:
WebCore:
First stage of the WebController -> WebView, WebView -> WebFrameView.
This change does the WebView -> WebFrameView part of the change. Also
changes WebController's inheritance. It now inherits from NSView.
Reviewed by Maciej.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::nextKeyView):
* kwq/KWQScrollView.mm:
* kwq/KWQWidget.mm:
(QWidget::getOuterView):
* kwq/WebCoreBridge.h:
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge nextKeyViewInsideWebFrameViews]):
(-[WebCoreBridge previousKeyViewInsideWebFrameViews]):
WebBrowser:
First stage of the WebController -> WebView, WebView -> WebFrameView.
This change does the WebView -> WebFrameView part of the change. Also
changes WebController's inheritance. It now inherits from NSView.
Reviewed by Maciej.
* BrowserDocument.h:
* BrowserDocument.m:
(-[BrowserDocument mainWebFrameView]):
(-[BrowserDocument bugReportSheetDidEnd:returnCode:contextInfo:]):
(-[BrowserDocument printShowingPrintPanel:]):
(-[BrowserDocument setURLString:]):
(-[BrowserDocument text]):
* BrowserWebController.h:
* BrowserWebController.m:
(-[BrowserWebController initWithDocument:request:frameName:]):
(-[BrowserWebController mainWebFrameView]):
(-[BrowserWebController goToRequest:allowJavaScript:waitInQueue:]):
(-[BrowserWebController goToURL:withFallbackURLs:]):
(-[BrowserWebController setShouldStartEmpty]):
* BrowserWebViewExtras.h:
* BrowserWebViewExtras.m:
(-[WebFrameView largestScrollableWebView]):
* BrowserWindowController.h:
* BrowserWindowController.m:
(-[BrowserWindowController mainWebFrameView]):
(-[BrowserWindowController updateKeyboardLoop]):
(-[BrowserWindowController setUpTabForController:]):
(-[BrowserWindowController windowWillHandleKeyEvent:]):
(-[BrowserWindowController bestWindowSizeForCurrentPageWithDefaultSize:]):
(-[BrowserWindowController frameLoadStarted:]):
(-[BrowserWindowController frameLoadCommitted:]):
(-[BrowserWindowController didSelectTabViewItem]):
(-[BrowserWindowController targetForSearch]):
(-[BrowserWindowController canReloadTab:]):
(-[BrowserWindowController canReloadAllTabs]):
* ContextMenuHandler.m:
(-[ContextMenuHandler controller:contextMenuItemsForElement:defaultMenuItems:]):
(-[ContextMenuHandler _window]):
(-[ContextMenuHandler search:]):
(-[ContextMenuHandler goToAddress:]):
* Debug/DOMTree.m:
(-[DOMTreeDataSource initWithWebFrameView:]):
(-[DOMTree createTreeFromController:]):
* Debug/RenderTree.m:
(-[RenderTreeDataSource initWithWebFrameView:]):
(-[RenderTree createTreeFromController:]):
* Debug/SnippetController.m:
(-[SnippetController load]):
* Debug/ViewTree.m:
(-[ViewTreeDataSource initWithWebFrameView:]):
(-[ViewTree createTreeFromController:]):
* FormCompletionController.m:
(+[AutoFillController autoFillInController:]):
Tests:
First stage of the WebController -> WebView, WebView -> WebFrameView.
This change does the WebView -> WebFrameView part of the change. Also
changes WebController's inheritance. It now inherits from NSView.
Reviewed by Maciej.
* DumpBackForward/main.m:
(main):
(-[CheapWindowOpsDelegate controller:createWindowWithRequest:]):
* DumpRenderTree/main.m:
(main):
* IBViewer/DocumentController.h:
* IBViewer/DocumentController.m:
(-[DocumentController controller:locationChangeStartedForDataSource:]):
(-[DocumentController controller:locationChangeDone:forDataSource:]):
* IBViewer/English.lproj/Document.nib:
* PDFBundle/PDFView.m:
(-[PDFView dataSource]):
(-[PDFView layout]):
(+[PDFPluginViewFactory pluginViewWithArguments:]):
* PDFViewer/ApplicationController.m:
(-[ApplicationController awakeFromNib]):
* PDFViewer/DocumentController.m:
(-[DocumentController loadURL:]):
* PDFViewer/PDFRepresentation.m:
(-[PDFView layout]):
* SimpleViewer/ApplicationController.m:
* SimpleViewer/DocumentController.h:
* SimpleViewer/DocumentController.m:
(-[DocumentController dealloc]):
(-[DocumentController loadURL:]):
* SnippetEditor/ApplicationController.m:
* SnippetEditor/SnippetController.m:
(-[SnippetController _resetViews]):
(-[SnippetController loadComplete]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3829 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 991449d..b6651a7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,21 @@
+2003-03-13 Richard Williamson <rjw at apple.com>
+
+ First stage of the WebController -> WebView, WebView -> WebFrameView.
+ This change does the WebView -> WebFrameView part of the change. Also
+ changes WebController's inheritance. It now inherits from NSView.
+
+ Reviewed by Maciej.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::nextKeyView):
+ * kwq/KWQScrollView.mm:
+ * kwq/KWQWidget.mm:
+ (QWidget::getOuterView):
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge nextKeyViewInsideWebFrameViews]):
+ (-[WebCoreBridge previousKeyViewInsideWebFrameViews]):
+
2003-03-13 Darin Adler <darin at apple.com>
- remove mistaken inlining to fix build with newer versions of gcc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 991449d..b6651a7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2003-03-13 Richard Williamson <rjw at apple.com>
+
+ First stage of the WebController -> WebView, WebView -> WebFrameView.
+ This change does the WebView -> WebFrameView part of the change. Also
+ changes WebController's inheritance. It now inherits from NSView.
+
+ Reviewed by Maciej.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::nextKeyView):
+ * kwq/KWQScrollView.mm:
+ * kwq/KWQWidget.mm:
+ (QWidget::getOuterView):
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge nextKeyViewInsideWebFrameViews]):
+ (-[WebCoreBridge previousKeyViewInsideWebFrameViews]):
+
2003-03-13 Darin Adler <darin at apple.com>
- remove mistaken inlining to fix build with newer versions of gcc
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 72db9f7..1fff3bb 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -701,8 +701,8 @@ NSView *KWQKHTMLPart::nextKeyView(NodeImpl *node, KWQSelectionDirection directio
// Look at views from the top level part up, looking for a next key view that we can use.
next = direction == KWQSelectingNext
- ? [_bridge nextKeyViewOutsideWebViews]
- : [_bridge previousKeyViewOutsideWebViews];
+ ? [_bridge nextKeyViewOutsideWebFrameViews]
+ : [_bridge previousKeyViewOutsideWebFrameViews];
if (next) {
return next;
}
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 5087bc9..315dde0 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -30,7 +30,7 @@
/*
This class implementation does NOT actually emulate the Qt QScrollView.
It does provide an implementation that khtml will use to interact with
- WebKit's WebView documentView and our NSScrollView subclass.
+ WebKit's WebFrameView documentView and our NSScrollView subclass.
QScrollView's view is a NSScrollView (or subclass of NSScrollView)
in most cases. That scrollview is a subview of an
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 894bcc7..4753f85 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -386,8 +386,8 @@ void QWidget::setView(NSView *view)
NSView *QWidget::getOuterView() const
{
// A QScrollView is a widget normally used to represent a frame.
- // If this widget's view is a WebCoreFrameView the we resize its containing view, a WebView.
- // The scroll view contained by the WebView will be autosized.
+ // If this widget's view is a WebCoreFrameView the we resize its containing view, a WebFrameView.
+ // The scroll view contained by the WebFrameView will be autosized.
NSView *view = data->view;
ASSERT(view);
if ([view conformsToProtocol:@protocol(WebCoreFrameView)]) {
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index ec8e1c0..c088c89 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -150,8 +150,8 @@ enum FrameBorderStyle {
- (NSView *)nextKeyView;
- (NSView *)previousKeyView;
-- (NSView *)nextKeyViewInsideWebViews;
-- (NSView *)previousKeyViewInsideWebViews;
+- (NSView *)nextKeyViewInsideWebFrameViews;
+- (NSView *)previousKeyViewInsideWebFrameViews;
- (NSObject *)copyDOMTree:(id <WebCoreDOMTreeCopier>)copier;
- (NSObject *)copyRenderTree:(id <WebCoreRenderTreeCopier>)copier;
@@ -255,8 +255,8 @@ enum FrameBorderStyle {
- (void)unfocusWindow;
-- (NSView *)nextKeyViewOutsideWebViews;
-- (NSView *)previousKeyViewOutsideWebViews;
+- (NSView *)nextKeyViewOutsideWebFrameViews;
+- (NSView *)previousKeyViewOutsideWebFrameViews;
- (BOOL)defersLoading;
- (void)setDefersLoading:(BOOL)loading;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 7d85c62..688a279 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -682,12 +682,12 @@ static HTMLFormElementImpl *formElementFromDOMElement(id <WebDOMElement>element)
return _part->nextKeyView(0, KWQSelectingPrevious);
}
-- (NSView *)nextKeyViewInsideWebViews
+- (NSView *)nextKeyViewInsideWebFrameViews
{
return _part->nextKeyViewInFrameHierarchy(0, KWQSelectingNext);
}
-- (NSView *)previousKeyViewInsideWebViews
+- (NSView *)previousKeyViewInsideWebFrameViews
{
return _part->nextKeyViewInFrameHierarchy(0, KWQSelectingPrevious);
}
diff --git a/WebKit/Carbon.subproj/CarbonWindowAdapter.m b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
index f8d252b..27d0218 100644
--- a/WebKit/Carbon.subproj/CarbonWindowAdapter.m
+++ b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
@@ -98,7 +98,7 @@ extern const OSType NSAppKitPropertyCreator;
extern const OSType NSViewCarbonControlViewPropertyTag;
extern const OSType NSCarbonWindowPropertyTag;
- at interface NSWindow(HIWebView)
+ at interface NSWindow(HIWebFrameView)
- _initContent:(const NSRect *)contentRect styleMask:(unsigned int)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag contentView:aView;
- (void)_oldPlaceWindow:(NSRect)frameRect;
- (void)_windowMovedToRect:(NSRect)actualFrame;
@@ -108,7 +108,7 @@ extern const OSType NSCarbonWindowPropertyTag;
- (void)_setVisible:(BOOL)flag;
@end
- at interface NSApplication(HIWebView)
+ at interface NSApplication(HIWebFrameView)
- (void)setIsActive:(BOOL)aFlag;
- (id)_setMouseActivationInProgress:(BOOL)flag;
@end
diff --git a/WebKit/Carbon.subproj/HIWebView.h b/WebKit/Carbon.subproj/HIWebView.h
index 694a4cd..677fd6d 100644
--- a/WebKit/Carbon.subproj/HIWebView.h
+++ b/WebKit/Carbon.subproj/HIWebView.h
@@ -1,5 +1,5 @@
-#ifndef __HIWEBVIEW__
-#define __HIWEBVIEW__
+#ifndef __HIWebFrameView__
+#define __HIWebFrameView__
#ifndef __HIWEBCONTROLLER__
#include <WebKit/WebController.h>
@@ -18,7 +18,7 @@ extern "C" {
#endif
/*
- * HIWebViewCreate()
+ * HIWebFrameViewCreate()
*
* Summary:
* Creates a new web view.
@@ -37,11 +37,11 @@ extern "C" {
* Non-Carbon CFM: not available
*/
extern OSStatus
-HIWebViewCreate(HIViewRef * outControl);
+HIWebFrameViewCreate(HIViewRef * outControl);
/*
- * HIWebViewGetController()
+ * HIWebFrameViewGetController()
*
* Summary:
* Returns the web controller for a given web view, or NULL if not
@@ -61,7 +61,7 @@ HIWebViewCreate(HIViewRef * outControl);
* Non-Carbon CFM: not available
*/
extern WebController*
-HIWebViewGetController(HIViewRef inView);
+HIWebFrameViewGetController(HIViewRef inView);
extern WebController*
WebControllerCreateWithHIView( HIViewRef inView, CFStringRef inName );
@@ -70,5 +70,5 @@ WebControllerCreateWithHIView( HIViewRef inView, CFStringRef inName );
}
#endif
-#endif /* __HIWEBVIEW__ */
+#endif /* __HIWebFrameView__ */
diff --git a/WebKit/Carbon.subproj/HIWebView.m b/WebKit/Carbon.subproj/HIWebView.m
index 4f84eaf..5fcc8d3 100644
--- a/WebKit/Carbon.subproj/HIWebView.m
+++ b/WebKit/Carbon.subproj/HIWebView.m
@@ -1,5 +1,5 @@
/*
- * HIWebView.c
+ * HIWebFrameView.c
* Synergy
*
* Created by Ed Voas on Tue Feb 11 2003.
@@ -19,15 +19,15 @@
extern Boolean GetEventPlatformEventRecord( EventRef inEvent, void * eventRec );
-struct HIWebView
+struct HIWebFrameView
{
HIViewRef fViewRef;
- WebView* fWebView;
+ WebFrameView* fWebFrameView;
NSView* fFirstResponder;
CarbonWindowAdapter * fKitWindow;
};
-typedef struct HIWebView HIWebView;
+typedef struct HIWebFrameView HIWebFrameView;
@interface NSGraphicsContext (Secret)
- (void)setCGContext:(CGContextRef)cgContext;
@@ -133,101 +133,101 @@ static const EventTypeSpec kEvents[] = {
};
#define kHIViewBaseClassID CFSTR( "com.apple.hiview" )
-#define kHIWebViewClassID CFSTR( "com.apple.hiwebview" )
+#define kHIWebFrameViewClassID CFSTR( "com.apple.HIWebFrameView" )
-static HIWebView* HIWebViewConstructor( HIViewRef inView );
-static void HIWebViewDestructor( HIWebView* view );
-static void HIWebViewRegisterClass( void );
+static HIWebFrameView* HIWebFrameViewConstructor( HIViewRef inView );
+static void HIWebFrameViewDestructor( HIWebFrameView* view );
+static void HIWebFrameViewRegisterClass( void );
-static OSStatus HIWebViewEventHandler(
+static OSStatus HIWebFrameViewEventHandler(
EventHandlerCallRef inCallRef,
EventRef inEvent,
void * inUserData );
static UInt32 GetBehaviors();
static ControlKind GetKind();
-static void Draw( HIWebView* inView, RgnHandle limitRgn, CGContextRef inContext );
-static ControlPartCode HitTest( HIWebView* view, const HIPoint* where );
-static OSStatus GetRegion( HIWebView* view, ControlPartCode inPart, RgnHandle outRgn );
+static void Draw( HIWebFrameView* inView, RgnHandle limitRgn, CGContextRef inContext );
+static ControlPartCode HitTest( HIWebFrameView* view, const HIPoint* where );
+static OSStatus GetRegion( HIWebFrameView* view, ControlPartCode inPart, RgnHandle outRgn );
static void BoundsChanged(
- HIWebView* inView,
+ HIWebFrameView* inView,
UInt32 inOptions,
const HIRect* inOriginalBounds,
const HIRect* inCurrentBounds );
static void OwningWindowChanged(
- HIWebView* view,
+ HIWebFrameView* view,
WindowRef oldWindow,
WindowRef newWindow );
-static void ActiveStateChanged( HIWebView* view );
+static void ActiveStateChanged( HIWebFrameView* view );
-static OSStatus Click( HIWebView* inView, EventRef inEvent );
-static OSStatus ContextMenuClick( HIWebView* inView, EventRef inEvent );
-static OSStatus MouseUp( HIWebView* inView, EventRef inEvent );
-static OSStatus MouseMoved( HIWebView* inView, EventRef inEvent );
-static OSStatus MouseDragged( HIWebView* inView, EventRef inEvent );
-static OSStatus MouseWheelMoved( HIWebView* inView, EventRef inEvent );
+static OSStatus Click( HIWebFrameView* inView, EventRef inEvent );
+static OSStatus ContextMenuClick( HIWebFrameView* inView, EventRef inEvent );
+static OSStatus MouseUp( HIWebFrameView* inView, EventRef inEvent );
+static OSStatus MouseMoved( HIWebFrameView* inView, EventRef inEvent );
+static OSStatus MouseDragged( HIWebFrameView* inView, EventRef inEvent );
+static OSStatus MouseWheelMoved( HIWebFrameView* inView, EventRef inEvent );
-static OSStatus ProcessCommand( HIWebView* inView, const HICommand* inCommand );
-static OSStatus UpdateCommandStatus( HIWebView* inView, const HICommand* inCommand );
+static OSStatus ProcessCommand( HIWebFrameView* inView, const HICommand* inCommand );
+static OSStatus UpdateCommandStatus( HIWebFrameView* inView, const HICommand* inCommand );
static OSStatus SetFocusPart(
- HIWebView* view,
+ HIWebFrameView* view,
ControlPartCode desiredFocus,
RgnHandle invalidRgn,
Boolean focusEverything,
ControlPartCode* actualFocus );
-static NSView* AdvanceFocus( HIWebView* view, bool forward );
-static void RelinquishFocus( HIWebView* view, bool inAutodisplay );
+static NSView* AdvanceFocus( HIWebFrameView* view, bool forward );
+static void RelinquishFocus( HIWebFrameView* view, bool inAutodisplay );
-static WindowRef GetWindowRef( HIWebView* inView );
-static void SyncFrame( HIWebView* inView );
+static WindowRef GetWindowRef( HIWebFrameView* inView );
+static void SyncFrame( HIWebFrameView* inView );
static OSStatus WindowCloseHandler( EventHandlerCallRef inCallRef, EventRef inEvent, void* inUserData );
//----------------------------------------------------------------------------------
-// HIWebViewCreate
+// HIWebFrameViewCreate
//----------------------------------------------------------------------------------
//
OSStatus
-HIWebViewCreate( HIViewRef* outControl )
+HIWebFrameViewCreate( HIViewRef* outControl )
{
OSStatus err;
- HIWebViewRegisterClass();
+ HIWebFrameViewRegisterClass();
- err = HIObjectCreate( kHIWebViewClassID, NULL, (HIObjectRef*)outControl );
+ err = HIObjectCreate( kHIWebFrameViewClassID, NULL, (HIObjectRef*)outControl );
return err;
}
//----------------------------------------------------------------------------------
-// HIWebViewGetNSView
+// HIWebFrameViewGetNSView
//----------------------------------------------------------------------------------
//
NSView*
-HIWebViewGetNSView( HIViewRef inView )
+HIWebFrameViewGetNSView( HIViewRef inView )
{
- HIWebView* view = (HIWebView*)HIObjectDynamicCast( (HIObjectRef)inView, kHIWebViewClassID );
+ HIWebFrameView* view = (HIWebFrameView*)HIObjectDynamicCast( (HIObjectRef)inView, kHIWebFrameViewClassID );
NSView* result = NULL;
if ( view )
- result = view->fWebView;
+ result = view->fWebFrameView;
return result;
}
//----------------------------------------------------------------------------------
-// HIWebViewGetController
+// HIWebFrameViewGetController
//----------------------------------------------------------------------------------
//
WebController*
-HIWebViewGetController( HIViewRef inControl )
+HIWebFrameViewGetController( HIViewRef inControl )
{
- HIWebView* view = (HIWebView*)HIObjectDynamicCast( (HIObjectRef)inControl, kHIWebViewClassID );
+ HIWebFrameView* view = (HIWebFrameView*)HIObjectDynamicCast( (HIObjectRef)inControl, kHIWebFrameViewClassID );
WebController* result = NULL;
if ( view )
- result = [[view->fWebView webFrame] controller];
+ result = [[view->fWebFrameView webFrame] controller];
return result;
}
@@ -235,23 +235,23 @@ HIWebViewGetController( HIViewRef inControl )
extern WebController*
WebControllerCreateWithHIView( HIViewRef inView, CFStringRef inName )
{
- NSView* view = HIWebViewGetNSView( inView );
+ NSView* view = HIWebFrameViewGetNSView( inView );
WebController* result = NULL;
if ( view )
- result = [[WebController alloc] initWithView: (WebView*)view frameName:nil setName:(NSString*)inName];
+ result = [[WebController alloc] initWithView: (WebFrameView*)view frameName:nil groupName:(NSString*)inName];
return result;
}
//----------------------------------------------------------------------------------
-// HIWebViewConstructor
+// HIWebFrameViewConstructor
//----------------------------------------------------------------------------------
//
-static HIWebView*
-HIWebViewConstructor( HIViewRef inView )
+static HIWebFrameView*
+HIWebFrameViewConstructor( HIViewRef inView )
{
- HIWebView* view = (HIWebView*)malloc( sizeof( HIWebView ) );
+ HIWebFrameView* view = (HIWebFrameView*)malloc( sizeof( HIWebFrameView ) );
if ( view )
{
@@ -259,8 +259,8 @@ HIWebViewConstructor( HIViewRef inView )
view->fViewRef = inView;
- view->fWebView = [[WebView alloc] initWithFrame: frame];
- [HIViewAdapter bindHIViewToNSView:inView nsView:view->fWebView];
+ view->fWebFrameView = [[WebFrameView alloc] initWithFrame: frame];
+ [HIViewAdapter bindHIViewToNSView:inView nsView:view->fWebFrameView];
view->fFirstResponder = NULL;
view->fKitWindow = NULL;
@@ -270,30 +270,30 @@ HIWebViewConstructor( HIViewRef inView )
}
//----------------------------------------------------------------------------------
-// HIWebViewDestructor
+// HIWebFrameViewDestructor
//----------------------------------------------------------------------------------
//
static void
-HIWebViewDestructor( HIWebView* inView )
+HIWebFrameViewDestructor( HIWebFrameView* inView )
{
- [HIViewAdapter unbindNSView:inView->fWebView];
- [inView->fWebView release];
+ [HIViewAdapter unbindNSView:inView->fWebFrameView];
+ [inView->fWebFrameView release];
free( inView );
}
//----------------------------------------------------------------------------------
-// HIWebViewRegisterClass
+// HIWebFrameViewRegisterClass
//----------------------------------------------------------------------------------
//
static void
-HIWebViewRegisterClass()
+HIWebFrameViewRegisterClass()
{
static bool sRegistered;
if ( !sRegistered )
{
- HIObjectRegisterSubclass( kHIWebViewClassID, kHIViewBaseClassID, 0, HIWebViewEventHandler,
+ HIObjectRegisterSubclass( kHIWebFrameViewClassID, kHIViewBaseClassID, 0, HIWebFrameViewEventHandler,
GetEventTypeCount( kEvents ), kEvents, 0, NULL );
sRegistered = true;
}
@@ -314,7 +314,7 @@ GetBehaviors()
//----------------------------------------------------------------------------------
//
static void
-Draw( HIWebView* inView, RgnHandle limitRgn, CGContextRef inContext )
+Draw( HIWebFrameView* inView, RgnHandle limitRgn, CGContextRef inContext )
{
HIRect bounds;
CGContextRef temp;
@@ -336,7 +336,7 @@ Draw( HIWebView* inView, RgnHandle limitRgn, CGContextRef inContext )
hiRect.size.width = drawRect.right - drawRect.left;
hiRect.size.height = drawRect.bottom - drawRect.top;
- [inView->fWebView displayIfNeededInRect: *(NSRect*)&hiRect];
+ [inView->fWebFrameView displayIfNeededInRect: *(NSRect*)&hiRect];
[[inView->fKitWindow _threadContext] setCGContext: temp];
@@ -348,7 +348,7 @@ Draw( HIWebView* inView, RgnHandle limitRgn, CGContextRef inContext )
//----------------------------------------------------------------------------------
//
static ControlPartCode
-HitTest( HIWebView* view, const HIPoint* where )
+HitTest( HIWebFrameView* view, const HIPoint* where )
{
HIRect bounds;
@@ -366,7 +366,7 @@ HitTest( HIWebView* view, const HIPoint* where )
//
static OSStatus
GetRegion(
- HIWebView* inView,
+ HIWebFrameView* inView,
ControlPartCode inPart,
RgnHandle outRgn )
{
@@ -374,7 +374,7 @@ GetRegion(
if ( inPart == -3 ) // kControlOpaqueMetaPart:
{
- if ( [inView->fWebView isOpaque] )
+ if ( [inView->fWebFrameView isOpaque] )
{
HIRect bounds;
Rect temp;
@@ -399,7 +399,7 @@ GetRegion(
//----------------------------------------------------------------------------------
//
static WindowRef
-GetWindowRef( HIWebView* inView )
+GetWindowRef( HIWebFrameView* inView )
{
return GetControlOwner( inView->fViewRef );
}
@@ -409,7 +409,7 @@ GetWindowRef( HIWebView* inView )
//----------------------------------------------------------------------------------
//
static OSStatus
-Click( HIWebView* inView, EventRef inEvent )
+Click( HIWebFrameView* inView, EventRef inEvent )
{
CGSEventRecord eventRec;
NSEvent* kitEvent;
@@ -468,7 +468,7 @@ CantAllocNewEvent:
//----------------------------------------------------------------------------------
//
static OSStatus
-MouseUp( HIWebView* inView, EventRef inEvent )
+MouseUp( HIWebFrameView* inView, EventRef inEvent )
{
CGSEventRecord eventRec;
NSEvent* kitEvent;
@@ -494,7 +494,7 @@ MouseUp( HIWebView* inView, EventRef inEvent )
//----------------------------------------------------------------------------------
//
static OSStatus
-MouseMoved( HIWebView* inView, EventRef inEvent )
+MouseMoved( HIWebFrameView* inView, EventRef inEvent )
{
CGSEventRecord eventRec;
NSEvent* kitEvent;
@@ -519,7 +519,7 @@ MouseMoved( HIWebView* inView, EventRef inEvent )
//----------------------------------------------------------------------------------
//
static OSStatus
-MouseDragged( HIWebView* inView, EventRef inEvent )
+MouseDragged( HIWebFrameView* inView, EventRef inEvent )
{
CGSEventRecord eventRec;
NSEvent* kitEvent;
@@ -544,7 +544,7 @@ MouseDragged( HIWebView* inView, EventRef inEvent )
//----------------------------------------------------------------------------------
//
static OSStatus
-MouseWheelMoved( HIWebView* inView, EventRef inEvent )
+MouseWheelMoved( HIWebFrameView* inView, EventRef inEvent )
{
CGSEventRecord eventRec;
NSEvent* kitEvent;
@@ -569,7 +569,7 @@ MouseWheelMoved( HIWebView* inView, EventRef inEvent )
//----------------------------------------------------------------------------------
//
static OSStatus
-ContextMenuClick( HIWebView* inView, EventRef inEvent )
+ContextMenuClick( HIWebFrameView* inView, EventRef inEvent )
{
CGSEventRecord eventRec;
NSEvent* kitEvent;
@@ -616,12 +616,12 @@ GetKind()
//
static void
BoundsChanged(
- HIWebView* inView,
+ HIWebFrameView* inView,
UInt32 inOptions,
const HIRect* inOriginalBounds,
const HIRect* inCurrentBounds )
{
- if ( inView->fWebView )
+ if ( inView->fWebFrameView )
{
SyncFrame( inView );
}
@@ -633,7 +633,7 @@ BoundsChanged(
//
static void
OwningWindowChanged(
- HIWebView* view,
+ HIWebFrameView* view,
WindowRef oldWindow,
WindowRef newWindow )
{
@@ -650,7 +650,7 @@ OwningWindowChanged(
InstallWindowEventHandler( newWindow, WindowCloseHandler, GetEventTypeCount( kWindowEvents ), kWindowEvents, newWindow, NULL );
}
- [[view->fKitWindow contentView] addSubview:view->fWebView];
+ [[view->fKitWindow contentView] addSubview:view->fWebFrameView];
SyncFrame( view );
}
}
@@ -682,7 +682,7 @@ WindowCloseHandler( EventHandlerCallRef inCallRef, EventRef inEvent, void* inUse
//----------------------------------------------------------------------------------
//
static void
-SyncFrame( HIWebView* inView )
+SyncFrame( HIWebFrameView* inView )
{
HIViewRef parent = HIViewGetSuperview( inView->fViewRef );
@@ -698,8 +698,8 @@ SyncFrame( HIWebView* inView )
origin.x = frame.origin.x;
origin.y = parentBounds.size.height - CGRectGetMaxY( frame );
- [inView->fWebView setFrameOrigin: origin];
- [inView->fWebView setFrameSize: *(NSSize*)&frame.size];
+ [inView->fWebFrameView setFrameOrigin: origin];
+ [inView->fWebFrameView setFrameSize: *(NSSize*)&frame.size];
}
}
@@ -709,7 +709,7 @@ SyncFrame( HIWebView* inView )
//
static OSStatus
SetFocusPart(
- HIWebView* view,
+ HIWebFrameView* view,
ControlPartCode desiredFocus,
RgnHandle invalidRgn,
Boolean focusEverything,
@@ -757,7 +757,7 @@ SetFocusPart(
//----------------------------------------------------------------------------------
//
static NSView*
-AdvanceFocus( HIWebView* view, bool forward )
+AdvanceFocus( HIWebFrameView* view, bool forward )
{
NSResponder* oldFirstResponder;
NSView* currentKeyView;
@@ -783,7 +783,7 @@ AdvanceFocus( HIWebView* view, bool forward )
// Some view in this window already has the keyboard focus. It better at least be a subview of this one.
NSView* oldFirstResponderView = (NSView *)oldFirstResponder;
- check( [oldFirstResponderView isDescendantOf:view->fWebView] );
+ check( [oldFirstResponderView isDescendantOf:view->fWebFrameView] );
if ( oldFirstResponderView != view->fFirstResponder
&& ![oldFirstResponderView isDescendantOf:view->fFirstResponder] )
@@ -799,7 +799,7 @@ AdvanceFocus( HIWebView* view, bool forward )
NSView *viewBeingTested;
currentKeyView = oldFirstResponderView;
viewBeingTested = currentKeyView;
- while ( viewBeingTested != view->fWebView )
+ while ( viewBeingTested != view->fWebFrameView )
{
if ( [viewBeingTested isKindOfClass:[NSTextField class]] )
{
@@ -831,7 +831,7 @@ AdvanceFocus( HIWebView* view, bool forward )
// Stuff like this would break. M.P. Notice - 12/2/00
tentativeNewKeyView = forward ? [currentKeyView nextValidKeyView] : [currentKeyView previousValidKeyView];
- if ( tentativeNewKeyView && [tentativeNewKeyView isDescendantOf:view->fWebView] )
+ if ( tentativeNewKeyView && [tentativeNewKeyView isDescendantOf:view->fWebFrameView] )
{
// The user has tabbed to another subview of this control view. Change the keyboard focus.
//NSLog(@"Tabbed to the next or previous key view.");
@@ -857,11 +857,11 @@ AdvanceFocus( HIWebView* view, bool forward )
NSView *tentativeNewKeyView;
check(oldFirstResponder==fKitWindow);
- if ( [view->fWebView acceptsFirstResponder] )
- tentativeNewKeyView = view->fWebView;
+ if ( [view->fWebFrameView acceptsFirstResponder] )
+ tentativeNewKeyView = view->fWebFrameView;
else
- tentativeNewKeyView = [view->fWebView nextValidKeyView];
- if ( tentativeNewKeyView && [tentativeNewKeyView isDescendantOf:view->fWebView] )
+ tentativeNewKeyView = [view->fWebFrameView nextValidKeyView];
+ if ( tentativeNewKeyView && [tentativeNewKeyView isDescendantOf:view->fWebFrameView] )
{
// This control view has at least one subview that can take the keyboard focus.
if ( !forward )
@@ -873,7 +873,7 @@ AdvanceFocus( HIWebView* view, bool forward )
NSView *firstTentativeNewKeyView = tentativeNewKeyView;
NSView *nextTentativeNewKeyView = [tentativeNewKeyView nextValidKeyView];
while ( nextTentativeNewKeyView
- && [nextTentativeNewKeyView isDescendantOf:view->fWebView]
+ && [nextTentativeNewKeyView isDescendantOf:view->fWebFrameView]
&& nextTentativeNewKeyView!=firstTentativeNewKeyView)
{
tentativeNewKeyView = nextTentativeNewKeyView;
@@ -905,7 +905,7 @@ AdvanceFocus( HIWebView* view, bool forward )
//----------------------------------------------------------------------------------
//
static void
-RelinquishFocus( HIWebView* view, bool inAutodisplay )
+RelinquishFocus( HIWebFrameView* view, bool inAutodisplay )
{
NSResponder* firstResponder;
@@ -916,7 +916,7 @@ RelinquishFocus( HIWebView* view, bool inAutodisplay )
if ( [firstResponder isKindOfClass:[NSView class]] )
{
// Some subview of this control view really is the first responder right now.
- check( [(NSView *)firstResponder isDescendantOf:view->fWebView] );
+ check( [(NSView *)firstResponder isDescendantOf:view->fWebFrameView] );
// Make the window the first responder, so that no view is the key view.
[view->fKitWindow makeFirstResponder:view->fKitWindow];
@@ -930,7 +930,7 @@ RelinquishFocus( HIWebView* view, bool inAutodisplay )
// is doing when invoked indirectly from -makeFirstResponder up above. M.P. Notice - 12/4/00
if ( !inAutodisplay )
- [[view->fWebView opaqueAncestor] _clearDirtyRectsForTree];
+ [[view->fWebFrameView opaqueAncestor] _clearDirtyRectsForTree];
}
else
{
@@ -950,11 +950,11 @@ RelinquishFocus( HIWebView* view, bool inAutodisplay )
//----------------------------------------------------------------------------------
//
static void
-ActiveStateChanged( HIWebView* view )
+ActiveStateChanged( HIWebFrameView* view )
{
- if ( [view->fWebView respondsToSelector:@selector(setEnabled)] )
+ if ( [view->fWebFrameView respondsToSelector:@selector(setEnabled)] )
{
- [(NSControl*)view->fWebView setEnabled: IsControlEnabled( view->fViewRef )];
+ [(NSControl*)view->fWebFrameView setEnabled: IsControlEnabled( view->fViewRef )];
HIViewSetNeedsDisplay( view->fViewRef, true );
}
}
@@ -965,7 +965,7 @@ ActiveStateChanged( HIWebView* view )
//----------------------------------------------------------------------------------
//
static OSStatus
-ProcessCommand( HIWebView* inView, const HICommand* inCommand )
+ProcessCommand( HIWebFrameView* inView, const HICommand* inCommand )
{
OSStatus result = eventNotHandledErr;
NSResponder* resp;
@@ -976,8 +976,8 @@ ProcessCommand( HIWebView* inView, const HICommand* inCommand )
{
NSView* respView = (NSView*)resp;
- if ( respView == inView->fWebView
- || [respView isDescendantOf: inView->fWebView] )
+ if ( respView == inView->fWebFrameView
+ || [respView isDescendantOf: inView->fWebFrameView] )
{
switch ( inCommand->commandID )
{
@@ -1007,7 +1007,7 @@ ProcessCommand( HIWebView* inView, const HICommand* inCommand )
//----------------------------------------------------------------------------------
//
static OSStatus
-UpdateCommandStatus( HIWebView* inView, const HICommand* inCommand )
+UpdateCommandStatus( HIWebFrameView* inView, const HICommand* inCommand )
{
OSStatus result = eventNotHandledErr;
MenuItemProxy* proxy = NULL;
@@ -1019,8 +1019,8 @@ UpdateCommandStatus( HIWebView* inView, const HICommand* inCommand )
{
NSView* respView = (NSView*)resp;
- if ( respView == inView->fWebView
- || [respView isDescendantOf: inView->fWebView] )
+ if ( respView == inView->fWebFrameView
+ || [respView isDescendantOf: inView->fWebFrameView] )
{
if ( inCommand->attributes & kHICommandFromMenu )
{
@@ -1076,13 +1076,13 @@ _NSSelectorForHICommand( const HICommand* inCommand )
//-----------------------------------------------------------------------------------
-// HIWebViewEventHandler
+// HIWebFrameViewEventHandler
//-----------------------------------------------------------------------------------
// Our object's virtual event handler method. I'm not sure if we need this these days.
// We used to do various things with it, but those days are long gone...
//
static OSStatus
-HIWebViewEventHandler(
+HIWebFrameViewEventHandler(
EventHandlerCallRef inCallRef,
EventRef inEvent,
void * inUserData )
@@ -1095,7 +1095,7 @@ HIWebViewEventHandler(
UInt32 features;
RgnHandle region = NULL;
ControlPartCode part;
- HIWebView* view = (HIWebView*)inUserData;
+ HIWebFrameView* view = (HIWebFrameView*)inUserData;
switch ( GetEventClass( inEvent ) )
{
@@ -1116,7 +1116,7 @@ HIWebViewEventHandler(
// replace the instance parameter data with said instance
// as type void.
- view = HIWebViewConstructor( (HIViewRef)object );
+ view = HIWebFrameViewConstructor( (HIViewRef)object );
if ( view )
{
@@ -1127,7 +1127,7 @@ HIWebViewEventHandler(
break;
case kEventHIObjectDestruct:
- HIWebViewDestructor( view );
+ HIWebFrameViewDestructor( view );
// result is unimportant
break;
}
diff --git a/WebKit/Carbon.subproj/HIWebViewPriv.h b/WebKit/Carbon.subproj/HIWebViewPriv.h
index 7863a19..2697de5 100644
--- a/WebKit/Carbon.subproj/HIWebViewPriv.h
+++ b/WebKit/Carbon.subproj/HIWebViewPriv.h
@@ -18,7 +18,7 @@
extern "C" {
#endif
-extern NSView* HIWebViewGetNSView( HIViewRef inView );
+extern NSView* HIWebFrameViewGetNSView( HIViewRef inView );
#ifdef __cplusplus
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index db4aa1a..bb2fa56 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,148 @@
+2003-03-13 Richard Williamson <rjw at apple.com>
+
+ First stage of the WebController -> WebView, WebView -> WebFrameView.
+ This change does the WebView -> WebFrameView part of the change. Also
+ changes WebController's inheritance. It now inherits from NSView. Also
+ added some simple action methods to WebController (soon to be WebView)
+ to facilitate IB hookup.
+
+ Reviewed by Maciej.
+
+ * Carbon.subproj/CarbonWindowAdapter.m:
+ * Carbon.subproj/HIWebView.h:
+ * Carbon.subproj/HIWebView.m:
+ (if):
+ (switch):
+ * Carbon.subproj/HIWebViewPriv.h:
+ * Misc.subproj/WebKitStatistics.m:
+ (+[WebKitStatistics viewCount]):
+ * Misc.subproj/WebKitStatisticsPrivate.h:
+ * Misc.subproj/WebNSViewExtras.h:
+ * Misc.subproj/WebNSViewExtras.m:
+ (-[NSView _web_parentWebFrameView]):
+ * Panels.subproj/WebStandardPanels.m:
+ (-[WebStandardPanels frontmostWindowLoadingURL:]):
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ (-[WebNetscapePluginDocumentView layout]):
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.m:
+ (-[WebNetscapePluginEmbeddedView dataSource]):
+ * Plugins.subproj/WebNetscapePluginRepresentation.m:
+ (-[WebNetscapePluginRepresentation receivedData:withDataSource:]):
+ * Plugins.subproj/WebNullPluginView.m:
+ (-[WebNullPluginView viewDidMoveToWindow]):
+ * Plugins.subproj/WebPluginDatabase.m:
+ (-[WebPluginDatabase init]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge areScrollbarsVisible]):
+ (-[WebBridge setScrollbarsVisible:]):
+ (-[WebBridge window]):
+ (-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]):
+ (-[WebBridge nextKeyViewOutsideWebFrameViews]):
+ (-[WebBridge previousKeyViewOutsideWebFrameViews]):
+ (-[WebBridge setNeedsReapplyStyles]):
+ (-[WebBridge setNeedsLayout]):
+ (-[WebBridge pluginViewWithPackage:attributes:baseURL:]):
+ (-[WebBridge frameRequiredForMIMEType:]):
+ (-[WebBridge handleMouseDragged:]):
+ (-[WebBridge mayStartDragWithMouseDragged:]):
+ * WebKit.exp:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ (+[WebContentTypes canShowMIMEType:]):
+ (-[WebController _commonInitialization:frameName:groupName:]):
+ (-[WebController init]):
+ (-[WebController initWithFrame:]):
+ (-[WebController initWithView:]):
+ (-[WebController supportsTextEncoding]):
+ (-[WebController takeStringURLFrom:]):
+ (-[WebController goBack:]):
+ (-[WebController goForward:]):
+ (-[WebController stopLoading:]):
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebControllerPrivate _clearControllerReferences:]):
+ (-[WebController _createFrameNamed:inParent:allowsScrolling:]):
+ (-[WebController _frameForView:fromFrame:]):
+ (-[WebController _frameForView:]):
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _layoutChildren]):
+ (-[WebDataSource _receivedData:]):
+ * WebView.subproj/WebDebugDOMNode.h:
+ * WebView.subproj/WebDebugDOMNode.m:
+ (-[WebDebugDOMNode initWithWebFrameView:]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate controller:contextMenuItemsForElement:defaultMenuItems:]):
+ * WebView.subproj/WebDefaultLocationChangeDelegate.m:
+ (-[WebDefaultLocationChangeDelegate controller:locationChangeStartedForDataSource:]):
+ (-[WebDefaultLocationChangeDelegate controller:serverRedirectedForDataSource:]):
+ (-[WebDefaultLocationChangeDelegate controller:locationChangeCommittedForDataSource:]):
+ (-[WebDefaultLocationChangeDelegate controller:receivedPageTitle:forDataSource:]):
+ (-[WebDefaultLocationChangeDelegate controller:receivedPageIcon:forDataSource:]):
+ (-[WebDefaultLocationChangeDelegate controller:locationChangeDone:forDataSource:]):
+ (-[WebDefaultLocationChangeDelegate controller:willCloseLocationForDataSource:]):
+ (-[WebDefaultLocationChangeDelegate controller:locationChangedWithinPageForDataSource:]):
+ (-[WebDefaultLocationChangeDelegate controller:clientWillRedirectTo:delay:fireDate:forFrame:]):
+ (-[WebDefaultLocationChangeDelegate controller:clientRedirectCancelledForFrame:]):
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate controller:unableToImplementPolicyWithError:inFrame:]):
+ (-[WebDefaultPolicyDelegate controller:decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
+ (-[WebDefaultPolicyDelegate controller:decideNewWindowPolicyForAction:andRequest:newFrameName:decisionListener:]):
+ * WebView.subproj/WebDefaultResourceLoadDelegate.m:
+ (-[WebDefaultResourceLoadDelegate controller:identifierForInitialRequest:fromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate controller:resource:willSendRequest:fromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate controller:resource:didReceiveResponse:fromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate controller:resource:didReceiveContentLength:fromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate controller:resource:didFinishLoadingFromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate controller:resource:didFailLoadingWithError:fromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate controller:pluginFailedWithError:dataSource:]):
+ * WebView.subproj/WebDefaultWindowOperationsDelegate.m:
+ (-[WebDefaultWindowOperationsDelegate controller:runJavaScriptConfirmPanelWithMessage:]):
+ (-[WebDefaultWindowOperationsDelegate controller:runJavaScriptTextInputPanelWithPrompt:defaultText:]):
+ (-[WebDefaultWindowOperationsDelegate controller:runOpenPanelForFileButtonWithResultListener:]):
+ * WebView.subproj/WebDocument.h:
+ * WebView.subproj/WebDynamicScrollBarsView.m:
+ * WebView.subproj/WebFrame.h:
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame init]):
+ (-[WebFrame initWithName:webFrameView:controller:]):
+ (-[WebFrame view]):
+ (+[WebFrame registerViewClass:representationClass:forMIMEType:]):
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (if):
+ (switch):
+ * WebView.subproj/WebHTMLView.h:
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView dragImage:at:offset:event:pasteboard:source:slideBack:]):
+ (-[WebHTMLView draggedImage:endedAt:operation:]):
+ (-[WebHTMLView becomeFirstResponder]):
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _controller]):
+ (-[WebHTMLView _frame]):
+ (-[WebHTMLView _elementAtPoint:]):
+ * WebView.subproj/WebImageView.m:
+ (-[WebImageView controller]):
+ (-[WebImageView menuForEvent:]):
+ (-[WebImageView mouseDragged:]):
+ (-[WebImageView draggedImage:endedAt:operation:]):
+ * WebView.subproj/WebLocationChangeDelegate.h:
+ * WebView.subproj/WebRenderNode.h:
+ * WebView.subproj/WebRenderNode.m:
+ (-[WebRenderNode initWithName:position:rect:view:children:]):
+ (-[WebRenderNode initWithWebFrameView:]):
+ * WebView.subproj/WebResourceLoadDelegate.h:
+ * WebView.subproj/WebTextView.m:
+ (-[WebTextView menuForEvent:]):
+ * WebView.subproj/WebView.h:
+ * WebView.subproj/WebView.m:
+ (-[WebFrameView initWithFrame:]):
+ (-[WebFrameView dealloc]):
+ * WebView.subproj/WebViewPrivate.h:
+ * WebView.subproj/WebViewPrivate.m:
+ * WebView.subproj/WebWindowOperationsDelegate.h:
+
2003-03-13 John Sullivan <sullivan at apple.com>
Reviewed by Trey.
diff --git a/WebKit/Misc.subproj/WebKitStatistics.m b/WebKit/Misc.subproj/WebKitStatistics.m
index 94d4aa8..55be43d 100644
--- a/WebKit/Misc.subproj/WebKitStatistics.m
+++ b/WebKit/Misc.subproj/WebKitStatistics.m
@@ -15,7 +15,7 @@ int WebControllerCount;
int WebDataSourceCount;
int WebFrameCount;
int WebHTMLRepresentationCount;
-int WebViewCount;
+int WebFrameViewCount;
@implementation WebKitStatistics
@@ -36,7 +36,7 @@ int WebViewCount;
+ (int)viewCount
{
- return WebViewCount;
+ return WebFrameViewCount;
}
+ (int)bridgeCount
diff --git a/WebKit/Misc.subproj/WebKitStatisticsPrivate.h b/WebKit/Misc.subproj/WebKitStatisticsPrivate.h
index 597359a..c4a0313 100644
--- a/WebKit/Misc.subproj/WebKitStatisticsPrivate.h
+++ b/WebKit/Misc.subproj/WebKitStatisticsPrivate.h
@@ -12,4 +12,4 @@ extern int WebControllerCount;
extern int WebDataSourceCount;
extern int WebFrameCount;
extern int WebHTMLRepresentationCount;
-extern int WebViewCount;
+extern int WebFrameViewCount;
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.h b/WebKit/Misc.subproj/WebNSViewExtras.h
index b602169..41b69ef 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.h
+++ b/WebKit/Misc.subproj/WebNSViewExtras.h
@@ -7,7 +7,7 @@
#define WebDragImageAlpha 0.75
- at class WebView;
+ at class WebFrameView;
@interface NSView (WebExtras)
@@ -18,8 +18,8 @@
// Stops searching and returns nil when limitClass is encountered
- (NSView *)_web_superviewOfClass:(Class)class stoppingAtClass:(Class)limitClass;
-// Returns the first WebView superview. Only works if self is the WebView's document view.
-- (WebView *)_web_parentWebView;
+// Returns the first WebFrameView superview. Only works if self is the WebFrameView's document view.
+- (WebFrameView *)_web_parentWebFrameView;
// returns whether a drag should begin starting with mouseDownEvent; if the time
// passes expiration or the mouse moves less than the hysteresis before the mouseUp event,
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.m b/WebKit/Misc.subproj/WebNSViewExtras.m
index 68a439f..2aa9008 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.m
+++ b/WebKit/Misc.subproj/WebNSViewExtras.m
@@ -49,11 +49,11 @@
return [self _web_superviewOfClass:class stoppingAtClass:nil];
}
-- (WebView *)_web_parentWebView
+- (WebFrameView *)_web_parentWebFrameView
{
- WebView *view = (WebView *)[[[self superview] superview] superview];
+ WebFrameView *view = (WebFrameView *)[[[self superview] superview] superview];
- if ([view isKindOfClass: [WebView class]])
+ if ([view isKindOfClass: [WebFrameView class]])
return view;
return nil;
}
diff --git a/WebKit/Panels.subproj/WebStandardPanels.m b/WebKit/Panels.subproj/WebStandardPanels.m
index cef43ba..2db6b62 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.m
+++ b/WebKit/Panels.subproj/WebStandardPanels.m
@@ -215,7 +215,7 @@ static BOOL WindowInFront(NSWindow *a, NSWindow *b)
if ([object isKindOfClass:[NSWindow class]]) {
window = object;
} else {
- window = [[[object mainFrame] webView] window];
+ window = [[[object mainFrame] view] window];
}
if (window != nil && [window isVisible] && (frontmostWindow == nil || WindowInFront(window, frontmostWindow))) {
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index b5015cf..f096835 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -100,7 +100,7 @@
- (void)layout
{
- NSRect superFrame = [[self _web_superviewOfClass:[WebView class]] frame];
+ NSRect superFrame = [[self _web_superviewOfClass:[WebFrameView class]] frame];
[self setFrame:NSMakeRect(0, 0, superFrame.size.width, superFrame.size.height)];
[self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
index b6df99a..082e563 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
@@ -60,8 +60,8 @@
- (WebDataSource *)dataSource
{
- WebView *webView = (WebView *)[self _web_superviewOfClass:[WebView class]];
- WebFrame *webFrame = [webView webFrame];
+ WebFrameView *webFrameView = (WebFrameView *)[self _web_superviewOfClass:[WebFrameView class]];
+ WebFrame *webFrame = [webFrameView webFrame];
return [webFrame dataSource];
}
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
index e6a1e72..50b8d57 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
@@ -20,7 +20,7 @@
- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)ds
{
if(!instance){
- NSView *view = [[[ds webFrame] webView] documentView];
+ NSView *view = [[[ds webFrame] view] documentView];
if([view isKindOfClass:[WebNetscapePluginDocumentView class]]){
[self setPluginPointer:[(WebNetscapePluginDocumentView *)view pluginPointer]];
[self setResponse:[ds response]];
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 630e305..b9d016a 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -46,7 +46,7 @@ static NSImage *image = nil;
{
if(!didSendError && _window && error){
didSendError = YES;
- WebView *view = (WebView *)[self _web_superviewOfClass:[WebView class]];
+ WebFrameView *view = (WebFrameView *)[self _web_superviewOfClass:[WebFrameView class]];
WebFrame *webFrame = [view webFrame];
WebController *controller = [webFrame controller];
WebDataSource *dataSource = [webFrame dataSource];
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index 3fef73f..47ef7e9 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -174,7 +174,7 @@ static NSArray *pluginLocations(void)
plugins = [pluginArray copy];
// Register plug-in WebDocumentViews and WebDocumentRepresentations
- NSArray *viewTypes = [[WebView _viewTypes] allKeys];
+ NSArray *viewTypes = [[WebFrameView _viewTypes] allKeys];
NSArray *mimes = [self MIMETypes];
NSString *mime;
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index e865372..50cd63f 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -149,13 +149,13 @@
- (BOOL)areScrollbarsVisible
{
ASSERT(frame != nil);
- return [[frame webView] allowsScrolling];
+ return [[frame view] allowsScrolling];
}
- (void)setScrollbarsVisible:(BOOL)visible
{
ASSERT(frame != nil);
- return [[frame webView] setAllowsScrolling:visible];
+ return [[frame view] setAllowsScrolling:visible];
}
- (BOOL)isStatusBarVisible
@@ -185,7 +185,7 @@
- (NSWindow *)window
{
ASSERT(frame != nil);
- return [[frame webView] window];
+ return [[frame view] window];
}
- (void)runJavaScriptAlertPanelWithMessage:(NSString *)message
@@ -380,8 +380,8 @@
[[newFrame _bridge] setRenderPart:childRenderPart];
- [[newFrame webView] _setMarginWidth:width];
- [[newFrame webView] _setMarginHeight:height];
+ [[newFrame view] _setMarginWidth:width];
+ [[newFrame view] _setMarginHeight:height];
[frame _loadURL:[NSURL _web_URLWithString:URL] intoChild:newFrame];
@@ -421,14 +421,14 @@
return [[frame controller] userAgentForURL:[NSURL _web_URLWithString:URL]];
}
-- (NSView *)nextKeyViewOutsideWebViews
+- (NSView *)nextKeyViewOutsideWebFrameViews
{
- return [[[[frame controller] mainFrame] webView] nextKeyView];
+ return [[[[frame controller] mainFrame] view] nextKeyView];
}
-- (NSView *)previousKeyViewOutsideWebViews
+- (NSView *)previousKeyViewOutsideWebFrameViews
{
- return [[[[frame controller] mainFrame] webView] previousKeyView];
+ return [[[[frame controller] mainFrame] view] previousKeyView];
}
- (BOOL)defersLoading
@@ -443,7 +443,7 @@
- (void)setNeedsReapplyStyles
{
- NSView <WebDocumentView> *view = [[frame webView] documentView];
+ NSView <WebDocumentView> *view = [[frame view] documentView];
if ([view isKindOfClass:[WebHTMLView class]]) {
[(WebHTMLView *)view setNeedsToApplyStyles:YES];
[view setNeedsLayout:YES];
@@ -453,7 +453,7 @@
- (void)setNeedsLayout
{
- NSView <WebDocumentView> *view = [[frame webView] documentView];
+ NSView <WebDocumentView> *view = [[frame view] documentView];
[view setNeedsLayout:YES];
[view setNeedsDisplay:YES];
}
@@ -472,7 +472,7 @@
attributes:(NSDictionary *)attributes
baseURL:(NSURL *)baseURL
{
- WebHTMLView *docView = (WebHTMLView *)[[frame webView] documentView];
+ WebHTMLView *docView = (WebHTMLView *)[[frame view] documentView];
ASSERT ([docView isKindOfClass:[WebHTMLView class]]);
@@ -639,7 +639,7 @@ static BOOL loggedObjectCacheSize = NO;
if ([mimeType length] == 0)
return NO;
- Class result = [[WebView _viewTypes] _web_objectForMIMEType: mimeType];
+ Class result = [[WebFrameView _viewTypes] _web_objectForMIMEType: mimeType];
if (!result)
return NO; // Want to display a "plugin not found" dialog/image, so let a plugin get made.
@@ -668,7 +668,7 @@ static BOOL loggedObjectCacheSize = NO;
- (void)handleMouseDragged:(NSEvent *)event
{
- WebHTMLView *docView = (WebHTMLView *)[[frame webView] documentView];
+ WebHTMLView *docView = (WebHTMLView *)[[frame view] documentView];
ASSERT ([docView isKindOfClass:[WebHTMLView class]]);
@@ -677,7 +677,7 @@ static BOOL loggedObjectCacheSize = NO;
- (void)handleAutoscrollForMouseDragged:(NSEvent *)event;
{
- WebHTMLView *docView = (WebHTMLView *)[[frame webView] documentView];
+ WebHTMLView *docView = (WebHTMLView *)[[frame view] documentView];
ASSERT ([docView isKindOfClass:[WebHTMLView class]]);
@@ -686,7 +686,7 @@ static BOOL loggedObjectCacheSize = NO;
- (BOOL)mayStartDragWithMouseDragged:(NSEvent *)event
{
- WebHTMLView *docView = (WebHTMLView *)[[frame webView] documentView];
+ WebHTMLView *docView = (WebHTMLView *)[[frame view] documentView];
ASSERT ([docView isKindOfClass:[WebHTMLView class]]);
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index d856de3..e809b93 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -23,7 +23,7 @@
.objc_class_name_WebStringTruncator
.objc_class_name_WebTextView
.objc_class_name_WebURLsWithTitles
-.objc_class_name_WebView
+.objc_class_name_WebFrameView
_WebActionButtonKey
_WebActionButtonKey
_WebActionElementKey
@@ -60,8 +60,8 @@ _WebURLPboardType
##
_WebControllerCreateWithHIView
-_HIWebViewGetController
-_HIWebViewCreate
+_HIWebFrameViewGetController
+_HIWebFrameViewCreate
_ConvertNSImageToCGImageRef
_InitWebKitForCarbon
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 01b6a6e..15c84bc 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -2756,12 +2756,12 @@
F52CA6BD02DF9D0F018635CA = {
children = (
35081D9202B6D4D80ACA2ACA,
- F5A55DC702BAA2E8018635CC,
35081D9302B6D4D80ACA2ACA,
+ F5A55DC702BAA2E8018635CC,
35081D9402B6D4D80ACA2ACA,
+ 35081D9502B6D4D80ACA2ACA,
35081D9602B6D4D80ACA2ACA,
35081D9702B6D4D80ACA2ACA,
- 35081D9502B6D4D80ACA2ACA,
);
isa = PBXGroup;
name = HTML;
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 7f78f60..a8bb8fd 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -17,7 +17,7 @@
@class WebFrame;
@class WebResource;
@class WebPreferences;
- at class WebView;
+ at class WebFrameView;
@interface WebContentTypes : NSObject
/*!
@@ -62,7 +62,7 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
/*!
@class WebController
- WebController manages the interaction between WebViews and WebDataSources. Modification
+ WebController manages the interaction between WebFrameViews and WebDataSources. Modification
of the policies and behavior of the WebKit is largely managed by WebControllers and their
delegates.
@@ -73,7 +73,7 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
WebController *webController;
WebFrame *mainFrame;
- webController = [[WebController alloc] initWithView: webView];
+ webController = [[WebController alloc] initWithView: webFrameView];
mainFrame = [webController mainFrame];
[mainFrame loadRequest:request];
</pre>
@@ -98,7 +98,7 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
WebController's WebControllerPolicyDelegate can make determinations about how
content should be handled, based on the resource's URL and MIME type.
*/
- at interface WebController : NSObject
+ at interface WebController : NSView
{
@private
WebControllerPrivate *_private;
@@ -106,10 +106,10 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
/*!
@method initWithView:
- @abstract This method is a convenience equivalent to initWithView:view frameName:nil setName:nil
+ @abstract This method is a convenience equivalent to initWithView:view frameName:nil groupName:nil
@param view The view to use.
*/
-- initWithView: (WebView *)view;
+- initWithView: (WebFrameView *)view;
/*!
@method initWithView:frameName:setName:
@@ -120,10 +120,10 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
way that still ends up creating a new WebController.
@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 setName The name of the controller set to which this controller will be added. 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.
*/
-- initWithView: (WebView *)view frameName: (NSString *)frameName setName: (NSString *)name ;
+- initWithView: (WebFrameView *)view frameName: (NSString *)frameName groupName: (NSString *)name ;
/*!
@method setWindowOperationsDelegate:
@@ -355,3 +355,11 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
- (WebPreferences *)preferences;
@end
+
+
+ at interface WebController (WebIBActions)
+- (IBAction)stopLoading:(id)sender;
+- (IBAction)goBack:(id)sender;
+- (IBAction)goForward:(id)sender;
+- (IBAction)takeStringURLFrom:(id)sender;
+ at end
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 7ced2ab..cfb5475 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -59,12 +59,12 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
+ (BOOL)canShowMIMEType:(NSString *)MIMEType
{
- if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType]){
+ if([WebFrameView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType]){
return YES;
}else{
// Have the plug-ins register views and representations
[WebPluginDatabase installedPlugins];
- if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType])
+ if([WebFrameView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType])
return YES;
}
return NO;
@@ -87,36 +87,50 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
@implementation WebController
-- init
-{
- return [self initWithView: nil frameName: nil setName: nil];
-}
-
-- initWithView: (WebView *)view
-{
- return [self initWithView: view frameName: nil setName: nil];
-}
-
-
-- initWithView: (WebView *)view frameName: (NSString *)frameName setName: (NSString *)setName;
+- (void)_commonInitialization: (WebFrameView *)wv frameName:(NSString *)frameName groupName:(NSString *)groupName
{
- [super init];
-
_private = [[WebControllerPrivate alloc] init];
- _private->mainFrame = [[WebFrame alloc] initWithName: frameName webView: view controller: self];
- _private->controllerSetName = [setName retain];
+ _private->mainFrame = [[WebFrame alloc] initWithName: frameName webFrameView: wv controller: self];
+ _private->controllerSetName = [groupName retain];
if (_private->controllerSetName != nil) {
- [WebControllerSets addController:self toSetNamed:_private->controllerSetName];
+ [WebControllerSets addController:self toSetNamed:_private->controllerSetName];
}
[self setUsesBackForwardList: YES];
-
+
++WebControllerCount;
[self _updateWebCoreSettingsFromPreferences: [WebPreferences standardPreferences]];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesChangedNotification:)
name:WebPreferencesChangedNotification object:[self preferences]];
+}
+
+- init
+{
+ return [self initWithView: nil frameName: nil groupName: nil];
+}
+
+- initWithFrame: (NSRect)f
+{
+ [super initWithFrame: f];
+ WebFrameView *wv = [[WebFrameView alloc] initWithFrame: f];
+ [wv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+ [self addSubview: wv];
+ [self _commonInitialization: wv frameName:nil groupName:nil];
+ return self;
+}
+
+- initWithView: (WebFrameView *)view
+{
+ return [self initWithView: view frameName: nil groupName: nil];
+}
+
+
+- initWithView: (WebFrameView *)view frameName: (NSString *)frameName groupName: (NSString *)groupName;
+{
+ [super init];
+ [self _commonInitialization: view frameName:frameName groupName:groupName];
return self;
}
@@ -313,7 +327,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
- (BOOL)supportsTextEncoding
{
- id documentView = [[[self mainFrame] webView] documentView];
+ id documentView = [[[self mainFrame] view] documentView];
return [documentView conformsToProtocol:@protocol(WebDocumentText)]
&& [documentView supportsTextEncoding];
}
@@ -446,3 +460,32 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
}
@end
+
+
+ at implementation WebController (WebIBActions)
+
+- (IBAction)takeStringURLFrom: sender
+{
+ NSString *URLString = [sender stringValue];
+
+ [[self mainFrame] loadRequest: [WebRequest requestWithURL: [NSURL URLWithString: URLString]]];
+}
+
+- (IBAction)goBack:(id)sender
+{
+ [self goBack];
+}
+
+- (IBAction)goForward:(id)sender
+{
+ [self goForward];
+}
+
+- (IBAction)stopLoading:(id)sender
+{
+ [[self mainFrame] stopLoading];
+}
+
+
+ at end
+
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index 3e41538..d1dd150 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -71,7 +71,7 @@ enum { NumUserAgentStringTypes = WinIE + 1 };
@param aView The view to match against each frame.
@result The frame that has the associated view.
*/
-- (WebFrame *)_frameForView: (WebView *)aView;
+- (WebFrame *)_frameForView: (WebFrameView *)aView;
- (WebFrame *)_createFrameNamed:(NSString *)name inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index d2b9ec3..c4b904d 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -54,7 +54,7 @@
int i, count;
[[aFrame dataSource] _setController: nil];
- [[aFrame webView] _setController: nil];
+ [[aFrame view] _setController: nil];
[aFrame _setController: nil];
// Walk the frame tree, niling the controller.
@@ -96,12 +96,12 @@
- (WebFrame *)_createFrameNamed:(NSString *)fname inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling
{
- WebView *childView = [[WebView alloc] initWithFrame:NSMakeRect(0,0,0,0)];
+ WebFrameView *childView = [[WebFrameView alloc] initWithFrame:NSMakeRect(0,0,0,0)];
[childView _setController:self];
[childView setAllowsScrolling:allowsScrolling];
- WebFrame *newFrame = [[WebFrame alloc] initWithName:fname webView:childView controller:self];
+ WebFrame *newFrame = [[WebFrame alloc] initWithName:fname webFrameView:childView controller:self];
[childView release];
@@ -467,13 +467,13 @@
}
-- (WebFrame *)_frameForView: (WebView *)aView fromFrame: (WebFrame *)frame
+- (WebFrame *)_frameForView: (WebFrameView *)aView fromFrame: (WebFrame *)frame
{
NSArray *frames;
int i, count;
WebFrame *result, *aFrame;
- if ([frame webView] == aView)
+ if ([frame view] == aView)
return frame;
frames = [frame children];
@@ -488,7 +488,7 @@
return nil;
}
-- (WebFrame *)_frameForView: (WebView *)aView
+- (WebFrame *)_frameForView: (WebFrameView *)aView
{
WebFrame *frame = [self mainFrame];
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 396f769..7bc6313 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -12,7 +12,6 @@
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebController.h>
#import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebView.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebFoundation/WebAssertions.h>
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 0caf3e8..98f1104 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -426,8 +426,8 @@
id dview;
for (i = 0; i < [subFrames count]; i++){
subFrame = [subFrames objectAtIndex: i];
- dview = [[subFrame webView] documentView];
- if ([[subFrame webView] isDocumentHTML])
+ dview = [[subFrame view] documentView];
+ if ([[subFrame view] isDocumentHTML])
[dview _adjustFrames];
[dview setNeedsDisplay: YES];
[[subFrame dataSource] _layoutChildren];
@@ -538,7 +538,7 @@
[self _commitIfReady];
[[self representation] receivedData:data withDataSource:self];
- [[[[self webFrame] webView] documentView] dataSourceUpdated:self];
+ [[[[self webFrame] view] documentView] dataSourceUpdated:self];
}
- (void)_finishedLoading
diff --git a/WebKit/WebView.subproj/WebDebugDOMNode.h b/WebKit/WebView.subproj/WebDebugDOMNode.h
index ef017aa..6a1d615 100644
--- a/WebKit/WebView.subproj/WebDebugDOMNode.h
+++ b/WebKit/WebView.subproj/WebDebugDOMNode.h
@@ -6,7 +6,7 @@
#import <Foundation/Foundation.h>
- at class WebView;
+ at class WebFrameView;
@interface WebDebugDOMNode : NSObject
{
@@ -16,7 +16,7 @@
NSString *source;
}
-- initWithWebView:(WebView *)view;
+- initWithWebFrameView:(WebFrameView *)view;
- (NSArray *)children;
- (NSString *)name;
diff --git a/WebKit/WebView.subproj/WebDebugDOMNode.m b/WebKit/WebView.subproj/WebDebugDOMNode.m
index f4f056a..a915052 100644
--- a/WebKit/WebView.subproj/WebDebugDOMNode.m
+++ b/WebKit/WebView.subproj/WebDebugDOMNode.m
@@ -26,7 +26,7 @@
return self;
}
-- initWithWebView:(WebView *)view
+- initWithWebFrameView:(WebFrameView *)view
{
WebKitDOMTreeCopier *copier;
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index ed84253..9113073 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 *)c contextMenuItemsForElement: (NSDictionary *)theElement defaultMenuItems: (NSArray *)defaultMenuItems
+- (NSArray *)controller: (WebController *)wv contextMenuItemsForElement: (NSDictionary *)theElement defaultMenuItems: (NSArray *)defaultMenuItems
{
NSMutableArray *menuItems = [NSMutableArray array];
NSURL *linkURL, *imageURL;
diff --git a/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
index 4d9927c..7ec17a1 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 *)controller locationChangeStartedForDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv locationChangeStartedForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller serverRedirectedForDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv serverRedirectedForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller locationChangeCommittedForDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv locationChangeCommittedForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller willCloseLocationForDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller locationChangedWithinPageForDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv locationChangedWithinPageForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
-- (void)controller: (WebController *)controller clientRedirectCancelledForFrame:(WebFrame *)frame { }
+- (void)controller: (WebController *)wv clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
+- (void)controller: (WebController *)wv clientRedirectCancelledForFrame:(WebFrame *)frame { }
@end
diff --git a/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.m b/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.m
index 4d9927c..7ec17a1 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 *)controller locationChangeStartedForDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv locationChangeStartedForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller serverRedirectedForDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv serverRedirectedForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller locationChangeCommittedForDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv locationChangeCommittedForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller willCloseLocationForDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller locationChangedWithinPageForDataSource:(WebDataSource *)dataSource { }
+- (void)controller: (WebController *)wv locationChangedWithinPageForDataSource:(WebDataSource *)dataSource { }
-- (void)controller: (WebController *)controller clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
-- (void)controller: (WebController *)controller clientRedirectCancelledForFrame:(WebFrame *)frame { }
+- (void)controller: (WebController *)wv clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
+- (void)controller: (WebController *)wv clientRedirectCancelledForFrame:(WebFrame *)frame { }
@end
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 07a58cf..246e3c5 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 *)c unableToImplementPolicyWithError:(WebError *)error inFrame:(WebFrame *)frame
+- (void)controller: (WebController *)wv unableToImplementPolicyWithError:(WebError *)error inFrame:(WebFrame *)frame
{
ERROR("called unableToImplementPolicyWithError:%@ inFrame:%@", error, frame);
}
-- (void)controller:(WebController *)c decideContentPolicyForMIMEType:(NSString *)type
+- (void)controller: (WebController *)wv decideContentPolicyForMIMEType:(NSString *)type
andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(WebPolicyDecisionListener *)listener;
@@ -56,7 +56,7 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
}
}
-- (void)controller:(WebController *)c decideNavigationPolicyForAction:(NSDictionary *)actionInformation
+- (void)controller: (WebController *)wv decideNavigationPolicyForAction:(NSDictionary *)actionInformation
andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(WebPolicyDecisionListener *)listener
@@ -73,7 +73,7 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
}
}
-- (void)controller:(WebController *)c decideNewWindowPolicyForAction:(NSDictionary *)actionInformation
+- (void)controller: (WebController *)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 09c6e2f..3b43256 100644
--- a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
@@ -27,33 +27,33 @@ static WebDefaultResourceLoadDelegate *sharedDelegate = nil;
return sharedDelegate;
}
-- controller:(WebController *)c identifierForInitialRequest: (WebRequest *)request fromDataSource: (WebDataSource *)dataSource
+- controller: (WebController *)wv identifierForInitialRequest: (WebRequest *)request fromDataSource: (WebDataSource *)dataSource
{
return [[[NSObject alloc] init] autorelease];
}
--(WebRequest *)controller:(WebController *)c resource:identifier willSendRequest: (WebRequest *)newRequest fromDataSource:(WebDataSource *)dataSource
+-(WebRequest *)controller: (WebController *)wv resource:identifier willSendRequest: (WebRequest *)newRequest fromDataSource:(WebDataSource *)dataSource
{
return newRequest;
}
--(void)controller:(WebController *)c resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource
+-(void)controller: (WebController *)wv resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource
{
}
--(void)controller:(WebController *)c resource:identifier didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource
+-(void)controller: (WebController *)wv resource:identifier didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource
{
}
--(void)controller:(WebController *)c resource:identifier didFinishLoadingFromDataSource:(WebDataSource *)dataSource
+-(void)controller: (WebController *)wv resource:identifier didFinishLoadingFromDataSource:(WebDataSource *)dataSource
{
}
--(void)controller:(WebController *)c resource:identifier didFailLoadingWithError:(WebError *)error fromDataSource:(WebDataSource *)dataSource
+-(void)controller: (WebController *)wv resource:identifier didFailLoadingWithError:(WebError *)error fromDataSource:(WebDataSource *)dataSource
{
}
-- (void)controller:(WebController *)c pluginFailedWithError:(WebPluginError *)error dataSource:(WebDataSource *)dataSource
+- (void)controller: (WebController *)wv pluginFailedWithError:(WebPluginError *)error dataSource:(WebDataSource *)dataSource
{
}
diff --git a/WebKit/WebView.subproj/WebDefaultUIDelegate.m b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
index ba7ebee..28547a6 100644
--- a/WebKit/WebView.subproj/WebDefaultUIDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
@@ -29,104 +29,104 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
}
-- (WebController *)controller:(WebController *)c createWindowWithRequest:(WebRequest *)request;
+- (WebController *)controller: (WebController *)wv createWindowWithRequest:(WebRequest *)request;
{
return nil;
}
-- (void)controllerShowWindow:(WebController *)c;
+- (void)webViewShowWindow: (WebController *)wv;
{
}
-- (void)controllerShowWindowBehindFrontmost:(WebController *)c;
+- (void)webViewShowWindowBehindFrontmost: (WebController *)wv;
{
}
-- (void)controllerCloseWindow:(WebController *)c;
+- (void)webViewCloseWindow: (WebController *)wv;
{
}
-- (void)controllerFocusWindow:(WebController *)c;
+- (void)webViewFocusWindow: (WebController *)wv;
{
}
-- (void)controllerUnfocusWindow:(WebController *)c;
+- (void)webViewUnfocusWindow: (WebController *)wv;
{
}
-- (NSResponder *)controllerFirstResponderInWindow:(WebController *)c;
+- (NSResponder *)webViewFirstResponderInWindow: (WebController *)wv;
{
return nil;
}
-- (void)controller:(WebController *)c makeFirstResponderInWindow:(NSResponder *)responder;
+- (void)controller: (WebController *)wv makeFirstResponderInWindow:(NSResponder *)responder;
{
}
-- (void)controller:(WebController *)c setStatusText:(NSString *)text;
+- (void)controller: (WebController *)wv setStatusText:(NSString *)text;
{
}
-- (NSString *)controllerStatusText:(WebController *)c;
+- (NSString *)webViewStatusText: (WebController *)wv;
{
return nil;
}
-- (void)controller:(WebController *)c mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
+- (void)controller: (WebController *)wv mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
{
}
-- (BOOL)controllerAreToolbarsVisible:(WebController *)c;
+- (BOOL)webViewAreToolbarsVisible: (WebController *)wv;
{
return NO;
}
-- (void)controller:(WebController *)c setToolbarsVisible:(BOOL)visible;
+- (void)controller: (WebController *)wv setToolbarsVisible:(BOOL)visible;
{
}
-- (BOOL)controllerIsStatusBarVisible:(WebController *)c;
+- (BOOL)webViewIsStatusBarVisible: (WebController *)wv;
{
return NO;
}
-- (void)controller:(WebController *)c setStatusBarVisible:(BOOL)visible;
+- (void)controller: (WebController *)wv setStatusBarVisible:(BOOL)visible;
{
}
-- (BOOL)controllerIsResizable:(WebController *)c;
+- (BOOL)webViewIsResizable: (WebController *)wv;
{
return NO;
}
-- (void)controller:(WebController *)c setResizable:(BOOL)resizable;
+- (void)controller: (WebController *)wv setResizable:(BOOL)resizable;
{
}
-- (void)controller:(WebController *)c setFrame:(NSRect)frame;
+- (void)controller: (WebController *)wv setFrame:(NSRect)frame;
{
}
-- (NSRect)controllerFrame:(WebController *)c;
+- (NSRect)webViewFrame: (WebController *)wv;
{
return NSMakeRect (0,0,0,0);
}
-- (void)controller:(WebController *)c runJavaScriptAlertPanelWithMessage:(NSString *)message;
+- (void)controller: (WebController *)wv runJavaScriptAlertPanelWithMessage:(NSString *)message;
{
}
-- (BOOL)controller:(WebController *)c runJavaScriptConfirmPanelWithMessage:(NSString *)message
+- (BOOL)controller: (WebController *)wv runJavaScriptConfirmPanelWithMessage:(NSString *)message
{
return NO;
}
-- (NSString *)controller:(WebController *)c runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText
+- (NSString *)controller: (WebController *)wv runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText
{
return nil;
}
-- (void)controller:(WebController *)c runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener
+- (void)controller: (WebController *)wv runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener
{
}
diff --git a/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m b/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
index ba7ebee..28547a6 100644
--- a/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
@@ -29,104 +29,104 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
}
-- (WebController *)controller:(WebController *)c createWindowWithRequest:(WebRequest *)request;
+- (WebController *)controller: (WebController *)wv createWindowWithRequest:(WebRequest *)request;
{
return nil;
}
-- (void)controllerShowWindow:(WebController *)c;
+- (void)webViewShowWindow: (WebController *)wv;
{
}
-- (void)controllerShowWindowBehindFrontmost:(WebController *)c;
+- (void)webViewShowWindowBehindFrontmost: (WebController *)wv;
{
}
-- (void)controllerCloseWindow:(WebController *)c;
+- (void)webViewCloseWindow: (WebController *)wv;
{
}
-- (void)controllerFocusWindow:(WebController *)c;
+- (void)webViewFocusWindow: (WebController *)wv;
{
}
-- (void)controllerUnfocusWindow:(WebController *)c;
+- (void)webViewUnfocusWindow: (WebController *)wv;
{
}
-- (NSResponder *)controllerFirstResponderInWindow:(WebController *)c;
+- (NSResponder *)webViewFirstResponderInWindow: (WebController *)wv;
{
return nil;
}
-- (void)controller:(WebController *)c makeFirstResponderInWindow:(NSResponder *)responder;
+- (void)controller: (WebController *)wv makeFirstResponderInWindow:(NSResponder *)responder;
{
}
-- (void)controller:(WebController *)c setStatusText:(NSString *)text;
+- (void)controller: (WebController *)wv setStatusText:(NSString *)text;
{
}
-- (NSString *)controllerStatusText:(WebController *)c;
+- (NSString *)webViewStatusText: (WebController *)wv;
{
return nil;
}
-- (void)controller:(WebController *)c mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
+- (void)controller: (WebController *)wv mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
{
}
-- (BOOL)controllerAreToolbarsVisible:(WebController *)c;
+- (BOOL)webViewAreToolbarsVisible: (WebController *)wv;
{
return NO;
}
-- (void)controller:(WebController *)c setToolbarsVisible:(BOOL)visible;
+- (void)controller: (WebController *)wv setToolbarsVisible:(BOOL)visible;
{
}
-- (BOOL)controllerIsStatusBarVisible:(WebController *)c;
+- (BOOL)webViewIsStatusBarVisible: (WebController *)wv;
{
return NO;
}
-- (void)controller:(WebController *)c setStatusBarVisible:(BOOL)visible;
+- (void)controller: (WebController *)wv setStatusBarVisible:(BOOL)visible;
{
}
-- (BOOL)controllerIsResizable:(WebController *)c;
+- (BOOL)webViewIsResizable: (WebController *)wv;
{
return NO;
}
-- (void)controller:(WebController *)c setResizable:(BOOL)resizable;
+- (void)controller: (WebController *)wv setResizable:(BOOL)resizable;
{
}
-- (void)controller:(WebController *)c setFrame:(NSRect)frame;
+- (void)controller: (WebController *)wv setFrame:(NSRect)frame;
{
}
-- (NSRect)controllerFrame:(WebController *)c;
+- (NSRect)webViewFrame: (WebController *)wv;
{
return NSMakeRect (0,0,0,0);
}
-- (void)controller:(WebController *)c runJavaScriptAlertPanelWithMessage:(NSString *)message;
+- (void)controller: (WebController *)wv runJavaScriptAlertPanelWithMessage:(NSString *)message;
{
}
-- (BOOL)controller:(WebController *)c runJavaScriptConfirmPanelWithMessage:(NSString *)message
+- (BOOL)controller: (WebController *)wv runJavaScriptConfirmPanelWithMessage:(NSString *)message
{
return NO;
}
-- (NSString *)controller:(WebController *)c runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText
+- (NSString *)controller: (WebController *)wv runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText
{
return nil;
}
-- (void)controller:(WebController *)c runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener
+- (void)controller: (WebController *)wv runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener
{
}
diff --git a/WebKit/WebView.subproj/WebDocument.h b/WebKit/WebView.subproj/WebDocument.h
index 359b17a..bbf55d4 100644
--- a/WebKit/WebView.subproj/WebDocument.h
+++ b/WebKit/WebView.subproj/WebDocument.h
@@ -10,7 +10,7 @@
/*!
@protocol WebDocumentView
- @discussion Protocol implemented by the document view of WebView
+ @discussion Protocol implemented by the document view of WebFrameView
*/
@protocol WebDocumentView <NSObject>
@@ -47,7 +47,7 @@
/*!
@protocol WebDocumentSearching
- @discussion Optional protocol for searching document view of WebView.
+ @discussion Optional protocol for searching document view of WebFrameView.
*/
@protocol WebDocumentSearching <NSObject>
/*!
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index 211427a..8485a7a 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -9,7 +9,6 @@
#import <WebKit/WebDynamicScrollBarsView.h>
#import <WebKit/WebDocument.h>
-#import <WebKit/WebView.h>
@implementation WebDynamicScrollBarsView
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 1c9cbf9..5237726 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -12,13 +12,13 @@
@class WebDataSource;
@class WebError;
@class WebFramePrivate;
- at class WebView;
+ at class WebFrameView;
@class WebRequest;
/*!
@class WebFrame
@discussion Every web page is represented by at least one WebFrame. A WebFrame
- has a WebView and a WebDataSource.
+ has a WebFrameView and a WebDataSource.
*/
@interface WebFrame : NSObject
{
@@ -27,14 +27,14 @@
}
/*!
- @method initWithName:webView:controller:
+ @method initWithName:webFrameView:controller:
@abstract The designated initializer of WebFrame.
@param name The name of the frame.
@param view The view for the frame.
@param controller The controller that manages the frame.
@result Returns an initialized WebFrame.
*/
-- (id)initWithName: (NSString *)name webView: (WebView *)view controller: (WebController *)controller;
+- (id)initWithName: (NSString *)name webFrameView: (WebFrameView *)view controller: (WebController *)controller;
/*!
@method name
@@ -49,10 +49,10 @@
- (WebController *)controller;
/*!
- @method webView
- @result The WebView for this frame.
+ @method webFrameView
+ @result The WebFrameView for this frame.
*/
-- (WebView *)webView;
+- (WebFrameView *)view;
/*!
@method loadRequest:
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 682be77..fa68ca6 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -30,10 +30,10 @@
- init
{
- return [self initWithName: nil webView: nil controller: nil];
+ return [self initWithName: nil webFrameView: nil controller: nil];
}
-- initWithName: (NSString *)n webView: (WebView *)v controller: (WebController *)c
+- initWithName: (NSString *)n webFrameView: (WebFrameView *)v controller: (WebController *)c
{
[super init];
@@ -49,7 +49,7 @@
[self _setName:n];
if (v) {
- [_private setWebView: v];
+ [_private setWebFrameView: v];
[v _setController: [self controller]];
}
@@ -72,9 +72,9 @@
return [_private name];
}
-- (WebView *)webView
+- (WebFrameView *)view
{
- return [_private webView];
+ return [_private webFrameView];
}
- (WebController *)controller
@@ -196,7 +196,7 @@
+ (void) registerViewClass:(Class)viewClass representationClass: (Class)representationClass forMIMEType:(NSString *)MIMEType
{
- [[WebView _viewTypes] setObject:viewClass forKey:MIMEType];
+ [[WebFrameView _viewTypes] setObject:viewClass forKey:MIMEType];
[[WebDataSource _repTypes] setObject:representationClass forKey:MIMEType];
}
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index 283639f..4a6b973 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -26,7 +26,7 @@
@discussion You can find out the URL and other parameters of the location change
from the data source object.
*/
-- (void)controller: (WebController *)controller locationChangeStartedForDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv locationChangeStartedForDataSource:(WebDataSource *)dataSource;
/*!
@method serverRedirectedTo:forDataSource:
@@ -34,7 +34,7 @@
@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 *)controller serverRedirectedForDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv serverRedirectedForDataSource:(WebDataSource *)dataSource;
/*!
@method locationChangeCommittedForDataSource:
@@ -47,7 +47,7 @@
page fails to load completely.
*/
-- (void)controller: (WebController *)controller locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
/*!
@method receivedPageTitle:forDataSource:
@@ -56,7 +56,7 @@
@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 *)controller receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource;
/*!
@method receivedPageIcon:forDataSource:
@@ -68,7 +68,7 @@
default or stored image and changing on a refresh.
*/
-- (void)controller: (WebController *)controller receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource;
/*!
@method locationChangeDone:forDataSource:
@@ -79,7 +79,7 @@
@discussion This callback will only be received when all
subresources are done loading.
*/
-- (void)controller: (WebController *)controller locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
/*!
@method willCloseLocationForDataSource:
@@ -89,7 +89,7 @@
@discussion This callback happens right before WebKit is done with the data source
and the document representation that it contains.
*/
-- (void)controller: (WebController *)controller willCloseLocationForDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource;
/*!
@method locationChangedWithinPageForDataSource:
@@ -100,7 +100,7 @@
@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 *)controller locationChangedWithinPageForDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv locationChangedWithinPageForDataSource:(WebDataSource *)dataSource;
/*!
@method clientWillRedirectTo:delay:fireDate:forFrame:
@@ -114,7 +114,7 @@
going while a client redirect is pending. A client redirect might
be cancelled before it fires - see clientRedirectCancelledForFrame.
*/
-- (void)controller: (WebController *)controller clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
+- (void)controller: (WebController *)wv clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
/*!
@method clientRedirectCancelledForFrame:
@@ -124,7 +124,7 @@
@discussion A client redirect can be cancelled if the frame
changes locations before the timeout.
*/
-- (void)controller: (WebController *)controller clientRedirectCancelledForFrame:(WebFrame *)frame;
+- (void)controller: (WebController *)wv clientRedirectCancelledForFrame:(WebFrame *)frame;
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index d0d71b0..61c844a 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -12,7 +12,7 @@
@class WebBridge;
@class WebFrameBridge;
@class WebHistoryItem;
- at class WebView;
+ at class WebFrameView;
@class WebRequest;
@class WebFormState;
@class WebPolicyDecisionListener;
@@ -51,7 +51,7 @@ typedef enum {
{
@public
NSString *name;
- WebView *webView;
+ WebFrameView *webFrameView;
WebDataSource *dataSource;
WebDataSource *provisionalDataSource;
WebBridge *bridge;
@@ -82,8 +82,8 @@ typedef enum {
- (NSString *)name;
- (void)setController:(WebController *)c;
- (WebController *)controller;
-- (void)setWebView:(WebView *)v;
-- (WebView *)webView;
+- (void)setWebFrameView:(WebFrameView *)v;
+- (WebFrameView *)webFrameView;
- (void)setDataSource:(WebDataSource *)d;
- (WebDataSource *)dataSource;
- (void)setProvisionalDataSource:(WebDataSource *)d;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index af76647..87ee1e8 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -152,12 +152,12 @@ Repeat load of the same URL (by any other means of navigation other than the rel
- (void)dealloc
{
- [webView _setController:nil];
+ [webFrameView _setController:nil];
[dataSource _setController:nil];
[provisionalDataSource _setController:nil];
[name release];
- [webView release];
+ [webFrameView release];
[dataSource release];
[provisionalDataSource release];
[bridge release];
@@ -185,12 +185,12 @@ Repeat load of the same URL (by any other means of navigation other than the rel
name = newName;
}
-- (WebView *)webView { return webView; }
-- (void)setWebView: (WebView *)v
+- (WebFrameView *)webFrameView { return webFrameView; }
+- (void)setWebFrameView: (WebFrameView *)v
{
[v retain];
- [webView release];
- webView = v;
+ [webFrameView release];
+ webFrameView = v;
}
- (WebDataSource *)dataSource { return dataSource; }
@@ -406,12 +406,12 @@ Repeat load of the same URL (by any other means of navigation other than the rel
[self _detachChildren];
[_private setController:nil];
- [_private->webView _setController:nil];
+ [_private->webFrameView _setController:nil];
[_private->dataSource _setController:nil];
[_private->provisionalDataSource _setController:nil];
[self _setDataSource:nil];
- [_private setWebView:nil];
+ [_private setWebFrameView:nil];
[_private->scheduledLayoutTimer invalidate];
[_private->scheduledLayoutTimer release];
@@ -472,7 +472,7 @@ 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 webView] documentView];
+ NSView <WebDocumentView> *documentView = [[self view] documentView];
if ([self controller])
LOG(Timing, "%@: performing timed layout, %f seconds since start of document load", [self name], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
@@ -549,16 +549,15 @@ Repeat load of the same URL (by any other means of navigation other than the rel
- (void)_makeDocumentView
{
- NSView <WebDocumentView> *documentView = [_private->webView _makeDocumentViewForDataSource:_private->dataSource];
+ NSView <WebDocumentView> *documentView = [_private->webFrameView _makeDocumentViewForDataSource:_private->dataSource];
if (!documentView) {
return;
}
// FIXME: We could save work and not do this for a top-level view that is not a WebHTMLView.
- [_private->bridge createKHTMLViewWithNSView:documentView
- marginWidth:[_private->webView _marginWidth]
- marginHeight:[_private->webView _marginHeight]];
- [_private->bridge installInFrame:[_private->webView frameScrollView]];
+ WebFrameView *v = _private->webFrameView;
+ [_private->bridge createKHTMLViewWithNSView:documentView marginWidth:[v _marginWidth] marginHeight:[v _marginHeight]];
+ [_private->bridge installInFrame:[v frameScrollView]];
// 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.
@@ -611,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 webView] _setDocumentView: cachedView];
+ [[self view] _setDocumentView: cachedView];
}
else
[self _makeDocumentView];
@@ -679,7 +678,7 @@ 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 webView] documentView] != nil);
+ ASSERT([[self view] documentView] != nil);
[[[self controller] _locationChangeDelegateForwarder] controller: _private->controller locationChangeCommittedForDataSource:ds];
// If we have a title let the controller know about it.
@@ -770,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 webView] frameScrollView] setDrawsBackground:NO];
+ [[[self view] frameScrollView] 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
@@ -795,7 +794,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[item setHasPageCache: YES];
[[self dataSource] _setStoredInPageCache: YES];
[[item pageCache] setObject: [self dataSource] forKey: @"WebKitDataSource"];
- [[item pageCache] setObject: [[self webView] documentView] forKey: @"WebKitDocumentView"];
+ [[item pageCache] setObject: [[self view] documentView] forKey: @"WebKitDocumentView"];
[_private->bridge saveDocumentToPageCache];
[self _purgePageCache];
}
@@ -803,7 +802,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
}
if (_private->state == WebFrameStateComplete) {
- NSScrollView *sv = [[self webView] frameScrollView];
+ NSScrollView *sv = [[self view] frameScrollView];
[sv setDrawsBackground:YES];
// FIXME: This overrides the setCopiesOnScroll setting done by
// WebCore based on whether the page's contents are dynamic or not.
@@ -822,8 +821,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
// Force a layout to update view size and thereby
// update scrollbars.
[_private->bridge reapplyStyles];
- [[[self webView] documentView] setNeedsLayout: YES];
- [[[self webView] documentView] layout];
+ [[[self view] documentView] setNeedsLayout: YES];
+ [[[self view] documentView] layout];
[self _restoreScrollPosition];
NSArray *responses = [[self dataSource] _responses];
@@ -882,7 +881,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
//LOG(Loading, "%@: checking complete, current state WEBFRAMESTATE_COMMITTED", [self name]);
if (![ds isLoading]) {
- WebView *thisView = [self webView];
+ WebFrameView *thisView = [self view];
NSView <WebDocumentView> *thisDocumentView = [thisView documentView];
ASSERT(thisDocumentView != nil);
@@ -904,14 +903,14 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
// be a reasonably inexpensive operation.
WebDataSource *parentDS = [[self parent] dataSource];
if ([[parentDS _bridge] isFrameSet]){
- WebView *parentWebView = [[self parent] webView];
- if ([parentWebView isDocumentHTML])
- [(WebHTMLView *)[parentWebView documentView] _adjustFrames];
+ WebFrameView *parentWebFrameView = [[self parent] view];
+ 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 webView] isDocumentHTML])) {
+ if (!([[self view] isDocumentHTML])) {
[thisDocumentView setNeedsLayout:YES];
[thisDocumentView layout];
[thisDocumentView setNeedsDisplay:YES];
@@ -1706,7 +1705,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (void)_saveScrollPositionToItem:(WebHistoryItem *)item
{
if (item) {
- NSView *clipView = [[[self webView] documentView] superview];
+ NSView *clipView = [[[self view] 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) {
@@ -1718,12 +1717,12 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (void)_restoreScrollPosition
{
ASSERT([_private currentItem]);
- [[[self webView] documentView] scrollPoint:[[_private currentItem] scrollPoint]];
+ [[[self view] documentView] scrollPoint:[[_private currentItem] scrollPoint]];
}
- (void)_scrollToTop
{
- [[[self webView] documentView] scrollPoint: NSZeroPoint];
+ [[[self view] documentView] scrollPoint: NSZeroPoint];
}
- (void)_textSizeMultiplierChanged
@@ -1894,7 +1893,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
// to KDE parser requiring a KHTMLView. Once we settle on a final
// KDE drop we should fix this dependency.
- ASSERT([self webView] != nil);
+ ASSERT([self view] != nil);
[self stopLoading];
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index cc4db7a..cedc46f 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -1,5 +1,5 @@
/*
- WebView.h
+ WebFrameView.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
@@ -9,64 +9,64 @@
@class WebDataSource;
@class WebFrame;
- at class WebViewPrivate;
+ at class WebFrameViewPrivate;
@protocol WebDocumentView;
/*!
- @class WebView
+ @class WebFrameView
*/
- at interface WebView : NSView
+ at interface WebFrameView : NSView
{
@private
- WebViewPrivate *_private;
+ WebFrameViewPrivate *_private;
}
/*!
@method initWithFrame:
@param frame The frame rectangle for the view
- @result An initialized WebView
+ @result An initialized WebFrameView
*/
- (id)initWithFrame: (NSRect) frame;
/*!
@method controller
- @abstract Returns the WebController associated with this WebView
- @result The WebView's controller
+ @abstract Returns the WebController associated with this WebFrameView
+ @result The WebFrameView's controller
*/
- (WebFrame *)webFrame;
/*!
@method frameScrollView
- @abstract Returns the WebView's scroll view
- @result The scrolling view used by the WebView to display its document view
+ @abstract Returns the WebFrameView's scroll view
+ @result The scrolling view used by the WebFrameView to display its document view
*/
- (NSScrollView *)frameScrollView;
/*!
@method documentView
- @abstract Returns the WebView's document subview
- @result The subview that renders the WebView's contents
+ @abstract Returns the WebFrameView's document subview
+ @result The subview that renders the WebFrameView's contents
*/
- (NSView <WebDocumentView> *)documentView;
/*!
@method isDocumentHTML
- @abstract Returns whether the WebView's document view is rendering HTML content
+ @abstract Returns whether the WebFrameView's document view is rendering HTML content
@result YES if the document represented in the view is HTML, otherwise NO.
*/
- (BOOL)isDocumentHTML;
/*!
@method setAllowsScrolling:
- @abstract Sets whether the WebView allows its document to be scrolled
+ @abstract Sets whether the WebFrameView allows its document to be scrolled
@param flag YES to allow the document to be scrolled, NO to disallow scrolling
*/
- (void)setAllowsScrolling: (BOOL)flag;
/*!
@method allowsScrolling
- @abstract Returns whether the WebView allows its document to be scrolled
+ @abstract Returns whether the WebFrameView allows its document to be scrolled
@result YES if the document is allowed to scroll, otherwise NO
*/
- (BOOL)allowsScrolling;
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 8309d1e..347335b 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -1,4 +1,4 @@
-/* WebView.m
+/* WebFrameView.m
Copyright 2001, 2002, Apple Computer, Inc. All rights reserved.
*/
@@ -34,7 +34,7 @@ enum {
SpaceKey = 0x0020
};
- at implementation WebView
+ at implementation WebFrameView
- initWithFrame: (NSRect) frame
{
@@ -45,7 +45,7 @@ enum {
[WebImageRendererFactory createSharedFactory];
[WebCookieAdapter createSharedAdapter];
- _private = [[WebViewPrivate alloc] init];
+ _private = [[WebFrameViewPrivate alloc] init];
WebDynamicScrollBarsView *scrollView = [[WebDynamicScrollBarsView alloc] initWithFrame: NSMakeRect(0,0,frame.size.width,frame.size.height)];
_private->frameScrollView = scrollView;
@@ -58,14 +58,14 @@ enum {
[self _reregisterDraggedTypes];
- ++WebViewCount;
+ ++WebFrameViewCount;
return self;
}
- (void)dealloc
{
- --WebViewCount;
+ --WebFrameViewCount;
[_private release];
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index f34aca5..ec3de33 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -1,9 +1,5 @@
-/* WebViewPrivate.h
+/* WebFrameViewPrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
-
- Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _private in
- NSWebPageView.
*/
#import <WebKit/WebView.h>
@@ -11,7 +7,7 @@
@class WebDynamicScrollBarsView;
@class WebController;
- at interface WebViewPrivate : NSObject
+ at interface WebFrameViewPrivate : NSObject
{
@public
WebController *controller;
@@ -28,7 +24,7 @@
@end
- at interface WebView (WebPrivate)
+ at interface WebFrameView (WebPrivate)
- (WebController *)_controller;
- (void)_setDocumentView:(NSView <WebDocumentView> *)view;
- (NSView <WebDocumentView> *)_makeDocumentViewForDataSource:(WebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index f34aca5..ec3de33 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -1,9 +1,5 @@
-/* WebViewPrivate.h
+/* WebFrameViewPrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
-
- Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _private in
- NSWebPageView.
*/
#import <WebKit/WebView.h>
@@ -11,7 +7,7 @@
@class WebDynamicScrollBarsView;
@class WebController;
- at interface WebViewPrivate : NSObject
+ at interface WebFrameViewPrivate : NSObject
{
@public
WebController *controller;
@@ -28,7 +24,7 @@
@end
- at interface WebView (WebPrivate)
+ at interface WebFrameView (WebPrivate)
- (WebController *)_controller;
- (void)_setDocumentView:(NSView <WebDocumentView> *)view;
- (NSView <WebDocumentView> *)_makeDocumentViewForDataSource:(WebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index c4242de..295b7e8 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -1,9 +1,5 @@
-/* WebViewPrivate.m
+/* WebFrameViewPrivate.m
Copyright 2001, Apple, Inc. All rights reserved.
-
- Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _private in
- NSWebPageView.
*/
#import <WebKit/WebViewPrivate.h>
@@ -21,7 +17,7 @@
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebResponse.h>
- at implementation WebViewPrivate
+ at implementation WebFrameViewPrivate
- init
{
@@ -42,7 +38,7 @@
@end
- at implementation WebView (WebPrivate)
+ at implementation WebFrameView (WebPrivate)
// Note that the controller is not retained.
- (WebController *)_controller
diff --git a/WebKit/WebView.subproj/WebHTMLView.h b/WebKit/WebView.subproj/WebHTMLView.h
index dabd506..0f74a9c 100644
--- a/WebKit/WebView.subproj/WebHTMLView.h
+++ b/WebKit/WebView.subproj/WebHTMLView.h
@@ -15,7 +15,7 @@
/*!
@class WebHTMLView
- @discussion A document view of WebView that displays HTML content.
+ @discussion A document view of WebFrameView that displays HTML content.
*/
@interface WebHTMLView : NSView <WebDocumentView, WebDocumentSearching, WebDocumentText>
{
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 66c67ec..ff1f5bb 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -605,8 +605,8 @@
source:(id)source
slideBack:(BOOL)slideBack
{
- // Don't allow drags to be accepted by this WebView.
- [[self _web_parentWebView] unregisterDraggedTypes];
+ // Don't allow drags to be accepted by this WebFrameView.
+ [[self _web_parentWebFrameView] unregisterDraggedTypes];
// Retain this view during the drag because it may be released before the drag ends.
[self retain];
@@ -643,7 +643,7 @@
[self mouseUp:fakeEvent]; // This will also update the mouseover state.
// Reregister for drag types because they were unregistered before the drag.
- [[self _web_parentWebView] _reregisterDraggedTypes];
+ [[self _web_parentWebFrameView] _reregisterDraggedTypes];
// Balance the previous retain from when the drag started.
[self release];
@@ -719,10 +719,10 @@
case NSDirectSelection:
break;
case NSSelectingNext:
- view = [[self _bridge] nextKeyViewInsideWebViews];
+ view = [[self _bridge] nextKeyViewInsideWebFrameViews];
break;
case NSSelectingPrevious:
- view = [[self _bridge] previousKeyViewInsideWebViews];
+ view = [[self _bridge] previousKeyViewInsideWebFrameViews];
break;
}
if (view) {
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 3e589c4..0ccc07f 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -136,13 +136,13 @@ static BOOL forceRealHitTest = NO;
- (WebController *)_controller
{
- return [[self _web_parentWebView] _controller];
+ return [[self _web_parentWebFrameView] _controller];
}
- (WebFrame *)_frame
{
- WebView *webView = [self _web_parentWebView];
- return [webView webFrame];
+ WebFrameView *webFrameView = [self _web_parentWebFrameView];
+ return [webFrameView webFrame];
}
// Required so view can access the part's selection.
@@ -201,9 +201,9 @@ static BOOL forceRealHitTest = NO;
[elementInfo _web_setObjectIfNotNil:[NSURL _web_URLWithString:[elementInfoWC objectForKey:WebElementLinkURLKey]] forKey:WebElementLinkURLKey];
[elementInfo _web_setObjectIfNotNil:[NSURL _web_URLWithString:[elementInfoWC objectForKey:WebElementImageURLKey]] forKey:WebElementImageURLKey];
- WebView *webView = [self _web_parentWebView];
- ASSERT(webView);
- WebFrame *webFrame = [webView webFrame];
+ WebFrameView *webFrameView = [self _web_parentWebFrameView];
+ ASSERT(webFrameView);
+ WebFrame *webFrame = [webFrameView webFrame];
if (webFrame) {
NSString *frameName = [elementInfoWC objectForKey:WebElementLinkTargetFrameKey];
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index 90cb40e..3dd1801 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -1,6 +1,6 @@
/*
WebImageView.m
- Copyright 2002, Apple, Inc. All rights reserved.
+ Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <WebKit/WebImageView.h>
@@ -82,7 +82,7 @@
- (WebController *)controller
{
- return [[self _web_parentWebView] _controller];
+ return [[self _web_parentWebFrameView] _controller];
}
- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
@@ -126,9 +126,9 @@
- (NSMenu *)menuForEvent:(NSEvent *)theEvent
{
- WebView *webView = [self _web_parentWebView];
- WebController *controller = [webView _controller];
- WebFrame *frame = [webView webFrame];
+ WebFrameView *webFrameView = [self _web_parentWebFrameView];
+ WebController *controller = [webFrameView _controller];
+ WebFrame *frame = [webFrameView webFrame];
ASSERT(frame);
ASSERT(controller);
@@ -145,8 +145,8 @@
- (void)mouseDragged:(NSEvent *)event
{
- // Don't allow drags to be accepted by this WebView.
- [[self _web_parentWebView] unregisterDraggedTypes];
+ // Don't allow drags to be accepted by this WebFrameView.
+ [[self _web_parentWebFrameView] unregisterDraggedTypes];
// Retain this view during the drag because it may be released before the drag ends.
[self retain];
@@ -176,7 +176,7 @@
- (void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation
{
// Reregister for drag types because they were unregistered before the drag.
- [[self _web_parentWebView] _reregisterDraggedTypes];
+ [[self _web_parentWebFrameView] _reregisterDraggedTypes];
// Balance the previous retain from when the drag started.
[self release];
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
index 283639f..4a6b973 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
@@ -26,7 +26,7 @@
@discussion You can find out the URL and other parameters of the location change
from the data source object.
*/
-- (void)controller: (WebController *)controller locationChangeStartedForDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv locationChangeStartedForDataSource:(WebDataSource *)dataSource;
/*!
@method serverRedirectedTo:forDataSource:
@@ -34,7 +34,7 @@
@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 *)controller serverRedirectedForDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv serverRedirectedForDataSource:(WebDataSource *)dataSource;
/*!
@method locationChangeCommittedForDataSource:
@@ -47,7 +47,7 @@
page fails to load completely.
*/
-- (void)controller: (WebController *)controller locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
/*!
@method receivedPageTitle:forDataSource:
@@ -56,7 +56,7 @@
@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 *)controller receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource;
/*!
@method receivedPageIcon:forDataSource:
@@ -68,7 +68,7 @@
default or stored image and changing on a refresh.
*/
-- (void)controller: (WebController *)controller receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource;
/*!
@method locationChangeDone:forDataSource:
@@ -79,7 +79,7 @@
@discussion This callback will only be received when all
subresources are done loading.
*/
-- (void)controller: (WebController *)controller locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
/*!
@method willCloseLocationForDataSource:
@@ -89,7 +89,7 @@
@discussion This callback happens right before WebKit is done with the data source
and the document representation that it contains.
*/
-- (void)controller: (WebController *)controller willCloseLocationForDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource;
/*!
@method locationChangedWithinPageForDataSource:
@@ -100,7 +100,7 @@
@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 *)controller locationChangedWithinPageForDataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv locationChangedWithinPageForDataSource:(WebDataSource *)dataSource;
/*!
@method clientWillRedirectTo:delay:fireDate:forFrame:
@@ -114,7 +114,7 @@
going while a client redirect is pending. A client redirect might
be cancelled before it fires - see clientRedirectCancelledForFrame.
*/
-- (void)controller: (WebController *)controller clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
+- (void)controller: (WebController *)wv clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
/*!
@method clientRedirectCancelledForFrame:
@@ -124,7 +124,7 @@
@discussion A client redirect can be cancelled if the frame
changes locations before the timeout.
*/
-- (void)controller: (WebController *)controller clientRedirectCancelledForFrame:(WebFrame *)frame;
+- (void)controller: (WebController *)wv clientRedirectCancelledForFrame:(WebFrame *)frame;
@end
diff --git a/WebKit/WebView.subproj/WebRenderNode.h b/WebKit/WebView.subproj/WebRenderNode.h
index 63b82ae..fe1d4ef 100644
--- a/WebKit/WebView.subproj/WebRenderNode.h
+++ b/WebKit/WebView.subproj/WebRenderNode.h
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
- at class WebView;
+ at class WebFrameView;
@interface WebRenderNode : NSObject
{
@@ -18,7 +18,7 @@
NSPoint absolutePosition;
}
-- initWithWebView:(WebView *)view;
+- initWithWebFrameView:(WebFrameView *)view;
- (NSArray *)children;
diff --git a/WebKit/WebView.subproj/WebRenderNode.m b/WebKit/WebView.subproj/WebRenderNode.m
index bf8c272..b4069c2 100644
--- a/WebKit/WebView.subproj/WebRenderNode.m
+++ b/WebKit/WebView.subproj/WebRenderNode.m
@@ -33,9 +33,9 @@
NSScrollView *scrollView = (NSScrollView *)view;
view = [scrollView superview];
}
- if ([view isKindOfClass:[WebView class]]) {
- WebView *webView = (WebView *)view;
- WebRenderNode *node = [[WebRenderNode alloc] initWithWebView:webView];
+ if ([view isKindOfClass:[WebFrameView class]]) {
+ WebFrameView *webFrameView = (WebFrameView *)view;
+ WebRenderNode *node = [[WebRenderNode alloc] initWithWebFrameView:webFrameView];
[collectChildren addObject:node];
[node release];
}
@@ -46,7 +46,7 @@
return self;
}
-- initWithWebView:(WebView *)view
+- initWithWebFrameView:(WebFrameView *)view
{
WebKitRenderTreeCopier *copier;
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index d78210e..a8c2c0b 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -36,7 +36,7 @@
@result An identifier that will be passed back to the implementor for each callback.
The identifier will be retained.
*/
-- controller: (WebController *)controller identifierForInitialRequest: (WebRequest *)request fromDataSource: (WebDataSource *)dataSource;
+- controller: (WebController *)wv identifierForInitialRequest: (WebRequest *)request fromDataSource: (WebDataSource *)dataSource;
/*!
@method resource:willSendRequest:fromDataSource:
@@ -50,7 +50,7 @@
@result Returns the request, which may be mutated by the implementor, although typically
will be request.
*/
--(WebRequest *)controller: (WebController *)controller resource:identifier willSendRequest: (WebRequest *)request fromDataSource:(WebDataSource *)dataSource;
+-(WebRequest *)controller: (WebController *)wv resource:identifier willSendRequest: (WebRequest *)request fromDataSource:(WebDataSource *)dataSource;
/*!
@method resource:didReceiveResponse:fromDataSource:
@@ -61,7 +61,7 @@
@param response The response for the request.
@param dataSource The dataSource that initiated the load.
*/
--(void)controller: (WebController *)controller resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource;
+-(void)controller: (WebController *)wv resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource;
/*!
@method resource:didReceiveContentLength:fromDataSource:
@@ -72,7 +72,7 @@
@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 *)controller resource:identifier didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource;
+-(void)controller: (WebController *)wv resource:identifier didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource;
/*!
@method resource:didFinishLoadingFromDataSource:
@@ -82,7 +82,7 @@
multiple call backs.
@param dataSource The dataSource that initiated the load.
*/
--(void)controller: (WebController *)controller resource:identifier didFinishLoadingFromDataSource:(WebDataSource *)dataSource;
+-(void)controller: (WebController *)wv resource:identifier didFinishLoadingFromDataSource:(WebDataSource *)dataSource;
/*!
@method resource:didFailLoadingWithError:fromDataSource:
@@ -93,7 +93,7 @@
@param error The error associated with this load.
@param dataSource The dataSource that initiated the load.
*/
--(void)controller: (WebController *)controller resource:identifier didFailLoadingWithError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
+-(void)controller: (WebController *)wv resource:identifier didFailLoadingWithError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
/*!
@method pluginFailedWithError:dataSource:
@@ -102,7 +102,7 @@
@param error The plug-in error.
@param dataSource The dataSource that contains the plug-in.
*/
-- (void)controller: (WebController *)controller pluginFailedWithError:(WebPluginError *)error dataSource:(WebDataSource *)dataSource;
+- (void)controller: (WebController *)wv pluginFailedWithError:(WebPluginError *)error dataSource:(WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index 0599865..361bc84 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -157,9 +157,9 @@
// Calling super causes unselected clicked text to be selected.
[super menuForEvent:theEvent];
- WebView *webView = [self _web_parentWebView];
- WebController *controller = [webView _controller];
- WebFrame *frame = [webView webFrame];
+ WebFrameView *webFrameView = [self _web_parentWebFrameView];
+ WebController *controller = [webFrameView _controller];
+ WebFrame *frame = [webFrameView webFrame];
ASSERT(frame);
ASSERT(controller);
diff --git a/WebKit/WebView.subproj/WebUIDelegate.h b/WebKit/WebView.subproj/WebUIDelegate.h
index 654ab1b..41aa4f1 100644
--- a/WebKit/WebView.subproj/WebUIDelegate.h
+++ b/WebKit/WebView.subproj/WebUIDelegate.h
@@ -108,7 +108,7 @@
hierarchy, it may be desirable to save the first responder
elsewhere, or possibly ignore this call.
*/
-- (void)controller: (WebController *)controller makeFirstResponderInWindow:(NSResponder *)responder;
+- (void)controller: (WebController *)wv makeFirstResponderInWindow:(NSResponder *)responder;
/*!
@@ -116,7 +116,7 @@
@abstract Set the window's status display, if any, to the specified string.
@param text The status text to set
*/
-- (void)controller: (WebController *)controller setStatusText:(NSString *)text;
+- (void)controller: (WebController *)wv setStatusText:(NSString *)text;
/*!
@method statusText
@@ -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 *)controller mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
+- (void)controller: (WebController *)wv 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 *)controller;
+- (BOOL)controllerAreToolbarsVisible: (WebController *)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 *)controller setToolbarsVisible:(BOOL)visible;
+- (void)controller: (WebController *)wv 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 *)controller;
+- (BOOL)controllerIsStatusBarVisible: (WebController *)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 *)controller setStatusBarVisible:(BOOL)visible;
+- (void)controller: (WebController *)wv 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 *)controller;
+- (BOOL)controllerIsResizable: (WebController *)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 *)controller setResizable:(BOOL)resizable;
+- (void)controller: (WebController *)wv 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 *)controller setFrame:(NSRect)frame;
+- (void)controller: (WebController *)wv setFrame:(NSRect)frame;
/*!
@method frame
@abstract REturn the window's frame rect
@discussion
*/
-- (NSRect)controllerFrame: (WebController *)controller;
+- (NSRect)controllerFrame: (WebController *)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 *)controller runJavaScriptAlertPanelWithMessage:(NSString *)message;
+- (void)controller: (WebController *)wv 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 *)controller runJavaScriptConfirmPanelWithMessage:(NSString *)message;
+- (BOOL)controller: (WebController *)wv 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 *)controller runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText;
+- (NSString *)controller: (WebController *)wv 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 *)controller runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener;
+- (void)controller: (WebController *)wv runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener;
@end
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 7f78f60..a8bb8fd 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -17,7 +17,7 @@
@class WebFrame;
@class WebResource;
@class WebPreferences;
- at class WebView;
+ at class WebFrameView;
@interface WebContentTypes : NSObject
/*!
@@ -62,7 +62,7 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
/*!
@class WebController
- WebController manages the interaction between WebViews and WebDataSources. Modification
+ WebController manages the interaction between WebFrameViews and WebDataSources. Modification
of the policies and behavior of the WebKit is largely managed by WebControllers and their
delegates.
@@ -73,7 +73,7 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
WebController *webController;
WebFrame *mainFrame;
- webController = [[WebController alloc] initWithView: webView];
+ webController = [[WebController alloc] initWithView: webFrameView];
mainFrame = [webController mainFrame];
[mainFrame loadRequest:request];
</pre>
@@ -98,7 +98,7 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
WebController's WebControllerPolicyDelegate can make determinations about how
content should be handled, based on the resource's URL and MIME type.
*/
- at interface WebController : NSObject
+ at interface WebController : NSView
{
@private
WebControllerPrivate *_private;
@@ -106,10 +106,10 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
/*!
@method initWithView:
- @abstract This method is a convenience equivalent to initWithView:view frameName:nil setName:nil
+ @abstract This method is a convenience equivalent to initWithView:view frameName:nil groupName:nil
@param view The view to use.
*/
-- initWithView: (WebView *)view;
+- initWithView: (WebFrameView *)view;
/*!
@method initWithView:frameName:setName:
@@ -120,10 +120,10 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
way that still ends up creating a new WebController.
@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 setName The name of the controller set to which this controller will be added. 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.
*/
-- initWithView: (WebView *)view frameName: (NSString *)frameName setName: (NSString *)name ;
+- initWithView: (WebFrameView *)view frameName: (NSString *)frameName groupName: (NSString *)name ;
/*!
@method setWindowOperationsDelegate:
@@ -355,3 +355,11 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
- (WebPreferences *)preferences;
@end
+
+
+ at interface WebController (WebIBActions)
+- (IBAction)stopLoading:(id)sender;
+- (IBAction)goBack:(id)sender;
+- (IBAction)goForward:(id)sender;
+- (IBAction)takeStringURLFrom:(id)sender;
+ at end
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 7ced2ab..cfb5475 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -59,12 +59,12 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
+ (BOOL)canShowMIMEType:(NSString *)MIMEType
{
- if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType]){
+ if([WebFrameView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType]){
return YES;
}else{
// Have the plug-ins register views and representations
[WebPluginDatabase installedPlugins];
- if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType])
+ if([WebFrameView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType])
return YES;
}
return NO;
@@ -87,36 +87,50 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
@implementation WebController
-- init
-{
- return [self initWithView: nil frameName: nil setName: nil];
-}
-
-- initWithView: (WebView *)view
-{
- return [self initWithView: view frameName: nil setName: nil];
-}
-
-
-- initWithView: (WebView *)view frameName: (NSString *)frameName setName: (NSString *)setName;
+- (void)_commonInitialization: (WebFrameView *)wv frameName:(NSString *)frameName groupName:(NSString *)groupName
{
- [super init];
-
_private = [[WebControllerPrivate alloc] init];
- _private->mainFrame = [[WebFrame alloc] initWithName: frameName webView: view controller: self];
- _private->controllerSetName = [setName retain];
+ _private->mainFrame = [[WebFrame alloc] initWithName: frameName webFrameView: wv controller: self];
+ _private->controllerSetName = [groupName retain];
if (_private->controllerSetName != nil) {
- [WebControllerSets addController:self toSetNamed:_private->controllerSetName];
+ [WebControllerSets addController:self toSetNamed:_private->controllerSetName];
}
[self setUsesBackForwardList: YES];
-
+
++WebControllerCount;
[self _updateWebCoreSettingsFromPreferences: [WebPreferences standardPreferences]];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesChangedNotification:)
name:WebPreferencesChangedNotification object:[self preferences]];
+}
+
+- init
+{
+ return [self initWithView: nil frameName: nil groupName: nil];
+}
+
+- initWithFrame: (NSRect)f
+{
+ [super initWithFrame: f];
+ WebFrameView *wv = [[WebFrameView alloc] initWithFrame: f];
+ [wv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+ [self addSubview: wv];
+ [self _commonInitialization: wv frameName:nil groupName:nil];
+ return self;
+}
+
+- initWithView: (WebFrameView *)view
+{
+ return [self initWithView: view frameName: nil groupName: nil];
+}
+
+
+- initWithView: (WebFrameView *)view frameName: (NSString *)frameName groupName: (NSString *)groupName;
+{
+ [super init];
+ [self _commonInitialization: view frameName:frameName groupName:groupName];
return self;
}
@@ -313,7 +327,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
- (BOOL)supportsTextEncoding
{
- id documentView = [[[self mainFrame] webView] documentView];
+ id documentView = [[[self mainFrame] view] documentView];
return [documentView conformsToProtocol:@protocol(WebDocumentText)]
&& [documentView supportsTextEncoding];
}
@@ -446,3 +460,32 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
}
@end
+
+
+ at implementation WebController (WebIBActions)
+
+- (IBAction)takeStringURLFrom: sender
+{
+ NSString *URLString = [sender stringValue];
+
+ [[self mainFrame] loadRequest: [WebRequest requestWithURL: [NSURL URLWithString: URLString]]];
+}
+
+- (IBAction)goBack:(id)sender
+{
+ [self goBack];
+}
+
+- (IBAction)goForward:(id)sender
+{
+ [self goForward];
+}
+
+- (IBAction)stopLoading:(id)sender
+{
+ [[self mainFrame] stopLoading];
+}
+
+
+ at end
+
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 3e41538..d1dd150 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -71,7 +71,7 @@ enum { NumUserAgentStringTypes = WinIE + 1 };
@param aView The view to match against each frame.
@result The frame that has the associated view.
*/
-- (WebFrame *)_frameForView: (WebView *)aView;
+- (WebFrame *)_frameForView: (WebFrameView *)aView;
- (WebFrame *)_createFrameNamed:(NSString *)name inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index d2b9ec3..c4b904d 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -54,7 +54,7 @@
int i, count;
[[aFrame dataSource] _setController: nil];
- [[aFrame webView] _setController: nil];
+ [[aFrame view] _setController: nil];
[aFrame _setController: nil];
// Walk the frame tree, niling the controller.
@@ -96,12 +96,12 @@
- (WebFrame *)_createFrameNamed:(NSString *)fname inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling
{
- WebView *childView = [[WebView alloc] initWithFrame:NSMakeRect(0,0,0,0)];
+ WebFrameView *childView = [[WebFrameView alloc] initWithFrame:NSMakeRect(0,0,0,0)];
[childView _setController:self];
[childView setAllowsScrolling:allowsScrolling];
- WebFrame *newFrame = [[WebFrame alloc] initWithName:fname webView:childView controller:self];
+ WebFrame *newFrame = [[WebFrame alloc] initWithName:fname webFrameView:childView controller:self];
[childView release];
@@ -467,13 +467,13 @@
}
-- (WebFrame *)_frameForView: (WebView *)aView fromFrame: (WebFrame *)frame
+- (WebFrame *)_frameForView: (WebFrameView *)aView fromFrame: (WebFrame *)frame
{
NSArray *frames;
int i, count;
WebFrame *result, *aFrame;
- if ([frame webView] == aView)
+ if ([frame view] == aView)
return frame;
frames = [frame children];
@@ -488,7 +488,7 @@
return nil;
}
-- (WebFrame *)_frameForView: (WebView *)aView
+- (WebFrame *)_frameForView: (WebFrameView *)aView
{
WebFrame *frame = [self mainFrame];
diff --git a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
index 654ab1b..41aa4f1 100644
--- a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
+++ b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
@@ -108,7 +108,7 @@
hierarchy, it may be desirable to save the first responder
elsewhere, or possibly ignore this call.
*/
-- (void)controller: (WebController *)controller makeFirstResponderInWindow:(NSResponder *)responder;
+- (void)controller: (WebController *)wv makeFirstResponderInWindow:(NSResponder *)responder;
/*!
@@ -116,7 +116,7 @@
@abstract Set the window's status display, if any, to the specified string.
@param text The status text to set
*/
-- (void)controller: (WebController *)controller setStatusText:(NSString *)text;
+- (void)controller: (WebController *)wv setStatusText:(NSString *)text;
/*!
@method statusText
@@ -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 *)controller mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
+- (void)controller: (WebController *)wv 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 *)controller;
+- (BOOL)controllerAreToolbarsVisible: (WebController *)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 *)controller setToolbarsVisible:(BOOL)visible;
+- (void)controller: (WebController *)wv 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 *)controller;
+- (BOOL)controllerIsStatusBarVisible: (WebController *)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 *)controller setStatusBarVisible:(BOOL)visible;
+- (void)controller: (WebController *)wv 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 *)controller;
+- (BOOL)controllerIsResizable: (WebController *)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 *)controller setResizable:(BOOL)resizable;
+- (void)controller: (WebController *)wv 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 *)controller setFrame:(NSRect)frame;
+- (void)controller: (WebController *)wv setFrame:(NSRect)frame;
/*!
@method frame
@abstract REturn the window's frame rect
@discussion
*/
-- (NSRect)controllerFrame: (WebController *)controller;
+- (NSRect)controllerFrame: (WebController *)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 *)controller runJavaScriptAlertPanelWithMessage:(NSString *)message;
+- (void)controller: (WebController *)wv 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 *)controller runJavaScriptConfirmPanelWithMessage:(NSString *)message;
+- (BOOL)controller: (WebController *)wv 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 *)controller runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText;
+- (NSString *)controller: (WebController *)wv 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 *)controller runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener;
+- (void)controller: (WebController *)wv runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener;
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list