Commit 9e280113 authored by mjs's avatar mjs
Browse files

Combined provisionalDataSourceChanged: and

	provisionalDataSourceCommitted: methods into a single
	setDataSource:, since they are always called one immediately after
	the other.

        * Plugins.subproj/WebPluginView.m:
        (-[WebNetscapePluginView setDataSource:]):
        (-[WebNetscapePluginView loadRequest:inTarget:withNotifyData:]):
        * WebView.subproj/WebDocument.h:
        * WebView.subproj/WebHTMLView.m:
        (-[WebHTMLView setDataSource:]):
        * WebView.subproj/WebImageView.m:
        (-[WebImageView setDataSource:]):
        * WebView.subproj/WebTextView.m:
        (-[WebTextView setDataSource:]):
        * WebView.subproj/WebViewPrivate.m:
        (-[WebView _makeDocumentViewForDataSource:]):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2040 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 87afd13a
2002-09-11 Maciej Stachowiak <mjs@apple.com>
Combined provisionalDataSourceChanged: and
provisionalDataSourceCommitted: methods into a single
setDataSource:, since they are always called one immediately after
the other.
* Plugins.subproj/WebPluginView.m:
(-[WebNetscapePluginView setDataSource:]):
(-[WebNetscapePluginView loadRequest:inTarget:withNotifyData:]):
* WebView.subproj/WebDocument.h:
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView setDataSource:]):
* WebView.subproj/WebImageView.m:
(-[WebImageView setDataSource:]):
* WebView.subproj/WebTextView.m:
(-[WebTextView setDataSource:]):
* WebView.subproj/WebViewPrivate.m:
(-[WebView _makeDocumentViewForDataSource:]):
2002-09-11 Richard Williamson <rjw@apple.com>
Better fix for previous problem.
......
2002-09-11 Maciej Stachowiak <mjs@apple.com>
Combined provisionalDataSourceChanged: and
provisionalDataSourceCommitted: methods into a single
setDataSource:, since they are always called one immediately after
the other.
* Plugins.subproj/WebPluginView.m:
(-[WebNetscapePluginView setDataSource:]):
(-[WebNetscapePluginView loadRequest:inTarget:withNotifyData:]):
* WebView.subproj/WebDocument.h:
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView setDataSource:]):
* WebView.subproj/WebImageView.m:
(-[WebImageView setDataSource:]):
* WebView.subproj/WebTextView.m:
(-[WebTextView setDataSource:]):
* WebView.subproj/WebViewPrivate.m:
(-[WebView _makeDocumentViewForDataSource:]):
2002-09-11 Richard Williamson <rjw@apple.com>
Better fix for previous problem.
......
......@@ -653,7 +653,7 @@ - (WebController *) webController
return self;
}
- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
- (void)setDataSource:(WebDataSource *)dataSource
{
WebNetscapePlugin *plugin;
......@@ -681,10 +681,6 @@ - (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
[self start];
}
- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource
{
}
- (void)dataSourceUpdated:(WebDataSource *)dataSource
{
}
......@@ -864,6 +860,9 @@ - (NPError) loadRequest:(WebResourceRequest *)request inTarget:(NSString *)targe
URL = [request URL];
if(!URL)
return NPERR_INVALID_URL;
if(!target){
stream = [[WebNetscapePluginStream alloc] initWithURL:URL pluginPointer:instance notifyData:notifyData];
if(stream){
......
......@@ -9,8 +9,7 @@
@class WebError;
@protocol WebDocumentView <NSObject>
- (void)provisionalDataSourceChanged: (WebDataSource *)dataSource;
- (void)provisionalDataSourceCommitted: (WebDataSource *)dataSource;
- (void)setDataSource: (WebDataSource *)dataSource;
- (void)dataSourceUpdated: (WebDataSource *)dataSource;
- (void)layout;
@end
......
......@@ -73,8 +73,7 @@ -(void)_makeDocumentViewForDataSource:(WebDataSource *)dataSource
[self _setDocumentView:(id<WebDocumentView>)documentView];
[documentView release];
[[self documentView] provisionalDataSourceChanged:dataSource];
[[self documentView] provisionalDataSourceCommitted:dataSource];
[[self documentView] setDataSource:dataSource];
}
- (void)_setController: (WebController *)controller
......
......@@ -700,17 +700,12 @@ - (BOOL)becomeFirstResponder
//------------------------------------------------------------------------------------
// WebDocumentView protocol
//------------------------------------------------------------------------------------
- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
- (void)setDataSource:(WebDataSource *)dataSource
{
[[dataSource _bridge]
createKHTMLViewWithNSView:self
marginWidth:[[[dataSource webFrame] webView] _marginWidth]
marginHeight:[[[dataSource webFrame] webView] _marginHeight]];
}
- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource
{
[[self _bridge] installInFrame:[[self _web_parentWebView] frameScrollView]];
}
......
......@@ -40,11 +40,7 @@ - (void)drawRect:(NSRect)rect
[[representation image] beginAnimationInRect:[self frame] fromRect:[self frame]];
}
- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
{
}
- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource
- (void)setDataSource:(WebDataSource *)dataSource
{
representation = [[dataSource representation] retain];
}
......
......@@ -41,11 +41,7 @@ - (void)setFixedWidthFont
[self setFont:font];
}
- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
{
}
- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource
- (void)setDataSource:(WebDataSource *)dataSource
{
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment