[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 06:19:56 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ef5bc2626b4e27f1a26aa415f03e7986eea4d1ee
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Jun 16 05:27:50 2002 +0000
* Misc.subproj/IFNSViewExtras.h:
* Misc.subproj/IFNSViewExtras.m:
(-[NSView _IF_superviewWithName:]):
(-[NSView _IF_parentWebView]):
Replaced use of _IF_superviewWithName w/ safer _IF_parentWebView.
* Plugins.subproj/IFNullPluginView.mm:
(-[IFNullPluginView drawRect:]):
Replaced use of _IF_superviewWithName w/ safer _IF_parentWebView.
* Plugins.subproj/IFPluginStream.mm:
(-[IFPluginStream IFURLHandle:resourceDataDidBecomeAvailable:]):
(-[IFPluginStream IFURLHandleResourceDidFinishLoading:data:]):
(-[IFPluginStream IFURLHandleResourceDidCancelLoading:]):
(-[IFPluginStream IFURLHandle:resourceDidFailLoadingWithResult:]):
Call _receiveProgress instead of directly calling handler.
* Plugins.subproj/IFPluginView.mm:
(-[IFPluginView start]):
Replaced use of _IF_superviewWithName w/ safer _IF_parentWebView.
* WebCoreSupport.subproj/IFWebCoreBridge.mm:
(-[IFWebCoreBridge loadURL:attributes:flags:inFrame:withParent:]):
Handle changing top frame correctly. Parent may be nil.
(-[IFWebCoreBridge didFinishLoadingWithHandle:]):
Added non-terminal error case.
* WebView.subproj/IFHTMLView.mm:
(-[IFHTMLView provisionalDataSourceCommitted:]):
Replaced use of _IF_superviewWithName w/ safer _IF_parentWebView.
* WebView.subproj/IFMainURLHandleClient.mm:
* WebView.subproj/IFWebControllerPrivate.mm:
Comment changes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1382 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2631116..cc88a8c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,34 @@
+2002-06-15 Richard Williamson <rjw at apple.com>
+
+ * Misc.subproj/IFNSViewExtras.h:
+ * Misc.subproj/IFNSViewExtras.m:
+ (-[NSView _IF_superviewWithName:]):
+ (-[NSView _IF_parentWebView]):
+ Replaced use of _IF_superviewWithName w/ safer _IF_parentWebView.
+ * Plugins.subproj/IFNullPluginView.mm:
+ (-[IFNullPluginView drawRect:]):
+ Replaced use of _IF_superviewWithName w/ safer _IF_parentWebView.
+ * Plugins.subproj/IFPluginStream.mm:
+ (-[IFPluginStream IFURLHandle:resourceDataDidBecomeAvailable:]):
+ (-[IFPluginStream IFURLHandleResourceDidFinishLoading:data:]):
+ (-[IFPluginStream IFURLHandleResourceDidCancelLoading:]):
+ (-[IFPluginStream IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Call _receiveProgress instead of directly calling handler.
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView start]):
+ Replaced use of _IF_superviewWithName w/ safer _IF_parentWebView.
+ * WebCoreSupport.subproj/IFWebCoreBridge.mm:
+ (-[IFWebCoreBridge loadURL:attributes:flags:inFrame:withParent:]):
+ Handle changing top frame correctly. Parent may be nil.
+ (-[IFWebCoreBridge didFinishLoadingWithHandle:]):
+ Added non-terminal error case.
+ * WebView.subproj/IFHTMLView.mm:
+ (-[IFHTMLView provisionalDataSourceCommitted:]):
+ Replaced use of _IF_superviewWithName w/ safer _IF_parentWebView.
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ * WebView.subproj/IFWebControllerPrivate.mm:
+ Comment changes.
+
2002-06-15 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/IFWebCoreBridge.mm:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2631116..cc88a8c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,34 @@
+2002-06-15 Richard Williamson <rjw at apple.com>
+
+ * Misc.subproj/IFNSViewExtras.h:
+ * Misc.subproj/IFNSViewExtras.m:
+ (-[NSView _IF_superviewWithName:]):
+ (-[NSView _IF_parentWebView]):
+ Replaced use of _IF_superviewWithName w/ safer _IF_parentWebView.
+ * Plugins.subproj/IFNullPluginView.mm:
+ (-[IFNullPluginView drawRect:]):
+ Replaced use of _IF_superviewWithName w/ safer _IF_parentWebView.
+ * Plugins.subproj/IFPluginStream.mm:
+ (-[IFPluginStream IFURLHandle:resourceDataDidBecomeAvailable:]):
+ (-[IFPluginStream IFURLHandleResourceDidFinishLoading:data:]):
+ (-[IFPluginStream IFURLHandleResourceDidCancelLoading:]):
+ (-[IFPluginStream IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Call _receiveProgress instead of directly calling handler.
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView start]):
+ Replaced use of _IF_superviewWithName w/ safer _IF_parentWebView.
+ * WebCoreSupport.subproj/IFWebCoreBridge.mm:
+ (-[IFWebCoreBridge loadURL:attributes:flags:inFrame:withParent:]):
+ Handle changing top frame correctly. Parent may be nil.
+ (-[IFWebCoreBridge didFinishLoadingWithHandle:]):
+ Added non-terminal error case.
+ * WebView.subproj/IFHTMLView.mm:
+ (-[IFHTMLView provisionalDataSourceCommitted:]):
+ Replaced use of _IF_superviewWithName w/ safer _IF_parentWebView.
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ * WebView.subproj/IFWebControllerPrivate.mm:
+ Comment changes.
+
2002-06-15 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/IFWebCoreBridge.mm:
diff --git a/WebKit/Misc.subproj/IFNSViewExtras.h b/WebKit/Misc.subproj/IFNSViewExtras.h
index 0883ce4..5c92dda 100644
--- a/WebKit/Misc.subproj/IFNSViewExtras.h
+++ b/WebKit/Misc.subproj/IFNSViewExtras.h
@@ -1,16 +1,15 @@
-//
-// NSViewExtras.h
-// WebKit
-//
-// Created by Chris Blumenberg on Tue Jun 11 2002.
-// Copyright (c) 2002 __MyCompanyName__. All rights reserved.
-//
+/*
+ IFNSViewExtras.h
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
+*/
#import <AppKit/AppKit.h>
+ at class IFWebView;
@interface NSView (IFExtensions)
- (NSView *) _IF_superviewWithName:(NSString *)viewName;
+- (IFWebView *)_IF_parentWebView;
@end
diff --git a/WebKit/Misc.subproj/IFNSViewExtras.m b/WebKit/Misc.subproj/IFNSViewExtras.m
index 953becd..70f7b9e 100644
--- a/WebKit/Misc.subproj/IFNSViewExtras.m
+++ b/WebKit/Misc.subproj/IFNSViewExtras.m
@@ -1,12 +1,10 @@
-//
-// NSViewExtras.m
-// WebKit
-//
-// Created by Chris Blumenberg on Tue Jun 11 2002.
-// Copyright (c) 2002 __MyCompanyName__. All rights reserved.
-//
+/*
+ IFNSViewExtras.mm
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
+*/
-#import "IFNSViewExtras.h"
+#import <WebKit/IFNSViewExtras.h>
+#import <WebKit/IFWebView.h>
@implementation NSView (IFExtensions)
@@ -25,4 +23,13 @@
return nil;
}
+- (IFWebView *)_IF_parentWebView
+{
+ IFWebView *view = (IFWebView *)[[[self superview] superview] superview];
+
+ if ([view isKindOfClass: [IFWebView class]])
+ return view;
+ return nil;
+}
+
@end
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.h b/WebKit/Misc.subproj/WebNSViewExtras.h
index 0883ce4..5c92dda 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.h
+++ b/WebKit/Misc.subproj/WebNSViewExtras.h
@@ -1,16 +1,15 @@
-//
-// NSViewExtras.h
-// WebKit
-//
-// Created by Chris Blumenberg on Tue Jun 11 2002.
-// Copyright (c) 2002 __MyCompanyName__. All rights reserved.
-//
+/*
+ IFNSViewExtras.h
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
+*/
#import <AppKit/AppKit.h>
+ at class IFWebView;
@interface NSView (IFExtensions)
- (NSView *) _IF_superviewWithName:(NSString *)viewName;
+- (IFWebView *)_IF_parentWebView;
@end
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.m b/WebKit/Misc.subproj/WebNSViewExtras.m
index 953becd..70f7b9e 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.m
+++ b/WebKit/Misc.subproj/WebNSViewExtras.m
@@ -1,12 +1,10 @@
-//
-// NSViewExtras.m
-// WebKit
-//
-// Created by Chris Blumenberg on Tue Jun 11 2002.
-// Copyright (c) 2002 __MyCompanyName__. All rights reserved.
-//
+/*
+ IFNSViewExtras.mm
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
+*/
-#import "IFNSViewExtras.h"
+#import <WebKit/IFNSViewExtras.h>
+#import <WebKit/IFWebView.h>
@implementation NSView (IFExtensions)
@@ -25,4 +23,13 @@
return nil;
}
+- (IFWebView *)_IF_parentWebView
+{
+ IFWebView *view = (IFWebView *)[[[self superview] superview] superview];
+
+ if ([view isKindOfClass: [IFWebView class]])
+ return view;
+ return nil;
+}
+
@end
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.mm b/WebKit/Plugins.subproj/IFNullPluginView.mm
index 0768420..f7dfc7a 100644
--- a/WebKit/Plugins.subproj/IFNullPluginView.mm
+++ b/WebKit/Plugins.subproj/IFNullPluginView.mm
@@ -60,7 +60,7 @@ static NSImage *image = nil;
[super drawRect:rect];
if(!errorSent){
errorSent = YES;
- webView = [self _IF_superviewWithName:@"IFWebView"];
+ webView = [self _IF_parentWebView];
webController = [webView controller];
[[webController policyHandler] pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
}
diff --git a/WebKit/Plugins.subproj/IFPluginStream.mm b/WebKit/Plugins.subproj/IFPluginStream.mm
index f46e1bb..4c58a4b 100644
--- a/WebKit/Plugins.subproj/IFPluginStream.mm
+++ b/WebKit/Plugins.subproj/IFPluginStream.mm
@@ -1,14 +1,15 @@
/*
IFPluginStream.m
- Copyright 2002, Apple, Inc. All rights reserved.
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
*/
-#import "IFPluginStream.h"
-#import <WebFoundation/WebFoundation.h>
-#import <WebKitDebug.h>
#import <WebKit/IFLoadProgress.h>
+#import <WebKit/IFPluginStream.h>
#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebController.h>
+#import <WebKitDebug.h>
+
+#import <WebFoundation/WebFoundation.h>
+
static NSString *getCarbonPath(NSString *posixPath);
@@ -134,7 +135,7 @@ static NSString *getCarbonPath(NSString *posixPath);
offset += [data length];
}
- [[[view webController] resourceProgressHandler] receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
+ [[view webController] _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
forResourceHandle: sender fromDataSource: [view webDataSource]];
}
@@ -165,7 +166,7 @@ static NSString *getCarbonPath(NSString *posixPath);
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_URLNotify\n");
}
- [[[view webController] resourceProgressHandler] receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
+ [[view webController] _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
forResourceHandle: sender fromDataSource: [view webDataSource]];
[self stop];
@@ -174,7 +175,7 @@ static NSString *getCarbonPath(NSString *posixPath);
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
- [[[view webController] resourceProgressHandler] receivedProgress:[IFLoadProgress progress]
+ [[view webController] _receivedProgress:[IFLoadProgress progress]
forResourceHandle: sender fromDataSource: [view webDataSource]];
[self stop];
@@ -187,7 +188,7 @@ static NSString *getCarbonPath(NSString *posixPath);
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [sender contentLengthReceived];
- [[[view webController] resourceProgressHandler] receivedError: result forResourceHandle: sender
+ [[view webController] _receivedError: result forResourceHandle: sender
partialProgress: loadProgress fromDataSource: [view webDataSource]];
[loadProgress release];
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 08f383e..2d017a4 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -443,7 +443,7 @@ static char *newCString(NSString *string)
[eventSender sendNullEvents];
trackingTag = [self addTrackingRect:[self bounds] owner:self userData:nil assumeInside:NO];
- id webView = [self _IF_superviewWithName:@"IFWebView"];
+ id webView = [self _IF_parentWebView];
webController = [[webView controller] retain];
webFrame = [[webController frameForView:webView] retain];
webDataSource = [[webFrame dataSource] retain];
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 0768420..f7dfc7a 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -60,7 +60,7 @@ static NSImage *image = nil;
[super drawRect:rect];
if(!errorSent){
errorSent = YES;
- webView = [self _IF_superviewWithName:@"IFWebView"];
+ webView = [self _IF_parentWebView];
webController = [webView controller];
[[webController policyHandler] pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
}
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index f46e1bb..4c58a4b 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -1,14 +1,15 @@
/*
IFPluginStream.m
- Copyright 2002, Apple, Inc. All rights reserved.
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
*/
-#import "IFPluginStream.h"
-#import <WebFoundation/WebFoundation.h>
-#import <WebKitDebug.h>
#import <WebKit/IFLoadProgress.h>
+#import <WebKit/IFPluginStream.h>
#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebController.h>
+#import <WebKitDebug.h>
+
+#import <WebFoundation/WebFoundation.h>
+
static NSString *getCarbonPath(NSString *posixPath);
@@ -134,7 +135,7 @@ static NSString *getCarbonPath(NSString *posixPath);
offset += [data length];
}
- [[[view webController] resourceProgressHandler] receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
+ [[view webController] _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
forResourceHandle: sender fromDataSource: [view webDataSource]];
}
@@ -165,7 +166,7 @@ static NSString *getCarbonPath(NSString *posixPath);
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_URLNotify\n");
}
- [[[view webController] resourceProgressHandler] receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
+ [[view webController] _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
forResourceHandle: sender fromDataSource: [view webDataSource]];
[self stop];
@@ -174,7 +175,7 @@ static NSString *getCarbonPath(NSString *posixPath);
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
- [[[view webController] resourceProgressHandler] receivedProgress:[IFLoadProgress progress]
+ [[view webController] _receivedProgress:[IFLoadProgress progress]
forResourceHandle: sender fromDataSource: [view webDataSource]];
[self stop];
@@ -187,7 +188,7 @@ static NSString *getCarbonPath(NSString *posixPath);
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [sender contentLengthReceived];
- [[[view webController] resourceProgressHandler] receivedError: result forResourceHandle: sender
+ [[view webController] _receivedError: result forResourceHandle: sender
partialProgress: loadProgress fromDataSource: [view webDataSource]];
[loadProgress release];
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 08f383e..2d017a4 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -443,7 +443,7 @@ static char *newCString(NSString *string)
[eventSender sendNullEvents];
trackingTag = [self addTrackingRect:[self bounds] owner:self userData:nil assumeInside:NO];
- id webView = [self _IF_superviewWithName:@"IFWebView"];
+ id webView = [self _IF_parentWebView];
webController = [[webView controller] retain];
webFrame = [[webController frameForView:webView] retain];
webDataSource = [[webFrame dataSource] retain];
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
index d2672c4..1b1bfde 100644
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
+++ b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
@@ -1,10 +1,7 @@
-//
-// IFWebCoreBridge.mm
-// WebKit
-//
-// Created by Darin Adler on Thu Jun 13 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
+/*
+ IFWebCoreBridge.mm
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
+*/
#import <WebKit/IFWebCoreBridge.h>
@@ -97,7 +94,11 @@
{
IFWebDataSource *newDataSource = [[IFWebDataSource alloc] initWithURL:URL attributes:attributes flags:flags];
IFWebCoreBridge *parentPrivate = (IFWebCoreBridge *)parent;
- [newDataSource _setParent:parentPrivate->dataSource];
+ // Might be loading top frame. Parent may be nil.
+ if (parentPrivate)
+ [newDataSource _setParent:parentPrivate->dataSource];
+ else
+ [newDataSource _setParent:nil];
[frame setProvisionalDataSource:newDataSource];
[newDataSource release];
[frame startLoading];
@@ -214,6 +215,12 @@
- (void)didFinishLoadingWithHandle:(IFURLHandle *)handle
{
[self receivedProgressWithHandle:handle];
+
+ IFError *nonTerminalError = [handle error];
+ if (nonTerminalError){
+ [self didFailToLoadWithHandle:handle error:nonTerminalError];
+ }
+
[[self controller] _didStopLoading:[handle url]];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index d2672c4..1b1bfde 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -1,10 +1,7 @@
-//
-// IFWebCoreBridge.mm
-// WebKit
-//
-// Created by Darin Adler on Thu Jun 13 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
+/*
+ IFWebCoreBridge.mm
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
+*/
#import <WebKit/IFWebCoreBridge.h>
@@ -97,7 +94,11 @@
{
IFWebDataSource *newDataSource = [[IFWebDataSource alloc] initWithURL:URL attributes:attributes flags:flags];
IFWebCoreBridge *parentPrivate = (IFWebCoreBridge *)parent;
- [newDataSource _setParent:parentPrivate->dataSource];
+ // Might be loading top frame. Parent may be nil.
+ if (parentPrivate)
+ [newDataSource _setParent:parentPrivate->dataSource];
+ else
+ [newDataSource _setParent:nil];
[frame setProvisionalDataSource:newDataSource];
[newDataSource release];
[frame startLoading];
@@ -214,6 +215,12 @@
- (void)didFinishLoadingWithHandle:(IFURLHandle *)handle
{
[self receivedProgressWithHandle:handle];
+
+ IFError *nonTerminalError = [handle error];
+ if (nonTerminalError){
+ [self didFailToLoadWithHandle:handle error:nonTerminalError];
+ }
+
[[self controller] _didStopLoading:[handle url]];
}
diff --git a/WebKit/WebView.subproj/IFHTMLView.mm b/WebKit/WebView.subproj/IFHTMLView.mm
index a5ec75b..0402f31 100644
--- a/WebKit/WebView.subproj/IFHTMLView.mm
+++ b/WebKit/WebView.subproj/IFHTMLView.mm
@@ -1,4 +1,5 @@
-/* IFHTMLView.mm
+/*
+ IFHTMLView.mm
Copyright 2002, Apple, Inc. All rights reserved.
*/
@@ -112,7 +113,7 @@
- (void)provisionalDataSourceCommitted: (IFWebDataSource *)dataSource
{
IFHTMLViewPrivate *data = _private;
- IFWebView *webView = (IFWebView *)[self _IF_superviewWithName:@"IFWebView"];
+ IFWebView *webView = [self _IF_parentWebView];
id frameScrollView = [webView frameScrollView];
data->provisionalWidget->setView (frameScrollView);
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index f6a6f34..7f4218b 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -1,7 +1,6 @@
/*
IFMainURLHandleClient.mm
-
- Copyright 2001, Apple, Inc. All rights reserved.
+ Copyright (c) 2001, Apple, Inc. All rights reserved.
*/
#import <WebKit/IFDocument.h>
diff --git a/WebKit/WebView.subproj/IFWebControllerPrivate.mm b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
index 50f059a..549cffe 100644
--- a/WebKit/WebView.subproj/IFWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
@@ -1,7 +1,8 @@
/*
IFWebControllerPrivate.mm
- Copyright 2001, 2002, Apple, Inc. All rights reserved.
+ Copyright (c) 2001, 2002, Apple, Inc. All rights reserved.
*/
+
#import <WebKit/IFLoadProgress.h>
#import <WebKit/IFPreferencesPrivate.h>
#import <WebKit/IFStandardPanelsPrivate.h>
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 50f059a..549cffe 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -1,7 +1,8 @@
/*
IFWebControllerPrivate.mm
- Copyright 2001, 2002, Apple, Inc. All rights reserved.
+ Copyright (c) 2001, 2002, Apple, Inc. All rights reserved.
*/
+
#import <WebKit/IFLoadProgress.h>
#import <WebKit/IFPreferencesPrivate.h>
#import <WebKit/IFStandardPanelsPrivate.h>
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index a5ec75b..0402f31 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -1,4 +1,5 @@
-/* IFHTMLView.mm
+/*
+ IFHTMLView.mm
Copyright 2002, Apple, Inc. All rights reserved.
*/
@@ -112,7 +113,7 @@
- (void)provisionalDataSourceCommitted: (IFWebDataSource *)dataSource
{
IFHTMLViewPrivate *data = _private;
- IFWebView *webView = (IFWebView *)[self _IF_superviewWithName:@"IFWebView"];
+ IFWebView *webView = [self _IF_parentWebView];
id frameScrollView = [webView frameScrollView];
data->provisionalWidget->setView (frameScrollView);
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index f6a6f34..7f4218b 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -1,7 +1,6 @@
/*
IFMainURLHandleClient.mm
-
- Copyright 2001, Apple, Inc. All rights reserved.
+ Copyright (c) 2001, Apple, Inc. All rights reserved.
*/
#import <WebKit/IFDocument.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index f6a6f34..7f4218b 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -1,7 +1,6 @@
/*
IFMainURLHandleClient.mm
-
- Copyright 2001, Apple, Inc. All rights reserved.
+ Copyright (c) 2001, Apple, Inc. All rights reserved.
*/
#import <WebKit/IFDocument.h>
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 50f059a..549cffe 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -1,7 +1,8 @@
/*
IFWebControllerPrivate.mm
- Copyright 2001, 2002, Apple, Inc. All rights reserved.
+ Copyright (c) 2001, 2002, Apple, Inc. All rights reserved.
*/
+
#import <WebKit/IFLoadProgress.h>
#import <WebKit/IFPreferencesPrivate.h>
#import <WebKit/IFStandardPanelsPrivate.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list