[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:18:56 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1d9fb3cd8865e620bee969557f25ccab2ecfcff5
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jun 14 23:32:29 2002 +0000
* Panels.subproj/IFStandardPanels.m:
(-[IFStandardPanelsPrivate frontmostWindowLoadingURL:]): Change to call webView
instead of view. Not sure why anyone was able to compile this.
* Plugins.subproj/IFNullPluginView.mm: Remove include of obsolete WCPluginWidget.h.
* WebView.subproj/IFHTMLRepresentation.mm: (-[IFHTMLRepresentation part]):
Call part instead of KHTMLPart. Not sure why anyone was able to compile this.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1359 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fd078e6..b14c999 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
2002-06-14 Darin Adler <darin at apple.com>
+ * Panels.subproj/IFStandardPanels.m:
+ (-[IFStandardPanelsPrivate frontmostWindowLoadingURL:]): Change to call webView
+ instead of view. Not sure why anyone was able to compile this.
+
+ * Plugins.subproj/IFNullPluginView.mm: Remove include of obsolete WCPluginWidget.h.
+
+ * WebView.subproj/IFHTMLRepresentation.mm: (-[IFHTMLRepresentation part]):
+ Call part instead of KHTMLPart. Not sure why anyone was able to compile this.
+
+2002-06-14 Darin Adler <darin at apple.com>
+
Add the new bridge class that connects us to WebCore in a nicer way.
Started to use it for some things. More to come.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index fd078e6..b14c999 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
2002-06-14 Darin Adler <darin at apple.com>
+ * Panels.subproj/IFStandardPanels.m:
+ (-[IFStandardPanelsPrivate frontmostWindowLoadingURL:]): Change to call webView
+ instead of view. Not sure why anyone was able to compile this.
+
+ * Plugins.subproj/IFNullPluginView.mm: Remove include of obsolete WCPluginWidget.h.
+
+ * WebView.subproj/IFHTMLRepresentation.mm: (-[IFHTMLRepresentation part]):
+ Call part instead of KHTMLPart. Not sure why anyone was able to compile this.
+
+2002-06-14 Darin Adler <darin at apple.com>
+
Add the new bridge class that connects us to WebCore in a nicer way.
Started to use it for some things. More to come.
diff --git a/WebKit/Panels.subproj/IFStandardPanels.m b/WebKit/Panels.subproj/IFStandardPanels.m
index 362fb75..496d8f5 100644
--- a/WebKit/Panels.subproj/IFStandardPanels.m
+++ b/WebKit/Panels.subproj/IFStandardPanels.m
@@ -8,6 +8,7 @@
#import <WebKit/IFStandardPanelsPrivate.h>
#import <WebKit/IFPanelAuthenticationHandler.h>
#import <WebKit/IFWebFrame.h>
+#import <WebKit/IFWebView.h>
#import <WebFoundation/IFAuthenticationManager.h>
#import <WebFoundation/IFCookieManager.h>
@@ -21,10 +22,6 @@
}
@end
- at interface IFStandardPanels (Internal)
--(id)_init;
- at end
-
@implementation IFStandardPanelsPrivate
-(id)init
{
@@ -41,9 +38,7 @@
[panelAuthenticationHandler release];
[super dealloc];
}
- at end
- at implementation IFStandardPanels (Internal)
// Private init method to implement the singleton pattern
-(id)_init
{
@@ -53,14 +48,10 @@
}
return self;
}
- at end
-
- at implementation IFStandardPanels
-(id)init
{
- // FIXME: should assert instead (or return a reference to the
- // shared instance)
+ // FIXME: should assert instead (or return a reference to the shared instance)
[self release];
return nil;
}
@@ -201,7 +192,7 @@ static BOOL WindowInFront(NSWindow *a, NSWindow *b)
if ([object isKindOfClass:[NSWindow class]]) {
window = object;
} else {
- window = [[[object mainFrame] view] window];
+ window = [[[object mainFrame] webView] window];
}
if (window != nil && (frontmostWindow == nil || WindowInFront(window, frontmostWindow))) {
diff --git a/WebKit/Panels.subproj/WebStandardPanels.m b/WebKit/Panels.subproj/WebStandardPanels.m
index 362fb75..496d8f5 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.m
+++ b/WebKit/Panels.subproj/WebStandardPanels.m
@@ -8,6 +8,7 @@
#import <WebKit/IFStandardPanelsPrivate.h>
#import <WebKit/IFPanelAuthenticationHandler.h>
#import <WebKit/IFWebFrame.h>
+#import <WebKit/IFWebView.h>
#import <WebFoundation/IFAuthenticationManager.h>
#import <WebFoundation/IFCookieManager.h>
@@ -21,10 +22,6 @@
}
@end
- at interface IFStandardPanels (Internal)
--(id)_init;
- at end
-
@implementation IFStandardPanelsPrivate
-(id)init
{
@@ -41,9 +38,7 @@
[panelAuthenticationHandler release];
[super dealloc];
}
- at end
- at implementation IFStandardPanels (Internal)
// Private init method to implement the singleton pattern
-(id)_init
{
@@ -53,14 +48,10 @@
}
return self;
}
- at end
-
- at implementation IFStandardPanels
-(id)init
{
- // FIXME: should assert instead (or return a reference to the
- // shared instance)
+ // FIXME: should assert instead (or return a reference to the shared instance)
[self release];
return nil;
}
@@ -201,7 +192,7 @@ static BOOL WindowInFront(NSWindow *a, NSWindow *b)
if ([object isKindOfClass:[NSWindow class]]) {
window = object;
} else {
- window = [[[object mainFrame] view] window];
+ window = [[[object mainFrame] webView] window];
}
if (window != nil && (frontmostWindow == nil || WindowInFront(window, frontmostWindow))) {
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.mm b/WebKit/Plugins.subproj/IFNullPluginView.mm
index 248e0fc..d730fcf 100644
--- a/WebKit/Plugins.subproj/IFNullPluginView.mm
+++ b/WebKit/Plugins.subproj/IFNullPluginView.mm
@@ -4,13 +4,11 @@
*/
#import <WebKit/IFNullPluginView.h>
+
#import <WebKit/IFWebView.h>
#import <WebKit/IFWebController.h>
#import <WebKit/IFNSViewExtras.h>
-#import <WCPluginWidget.h>
-
-static BOOL imageLoaded = NO;
static NSImage *image = nil;
@implementation IFNullPluginView
@@ -22,13 +20,11 @@ static NSImage *image = nil;
self = [super initWithFrame:frame];
if (self) {
-
// Set the view's image to the null plugin icon
- if(!imageLoaded){
+ if (!image) {
bundle = [NSBundle bundleWithIdentifier:@"com.apple.webkit"];
imagePath = [bundle pathForResource:@"nullplugin" ofType:@"tiff"];
image = [[NSImage alloc] initWithContentsOfFile:imagePath];
- imageLoaded = YES;
}
[self setImage:image];
@@ -70,6 +66,4 @@ static NSImage *image = nil;
}
}
-
-
@end
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 248e0fc..d730fcf 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -4,13 +4,11 @@
*/
#import <WebKit/IFNullPluginView.h>
+
#import <WebKit/IFWebView.h>
#import <WebKit/IFWebController.h>
#import <WebKit/IFNSViewExtras.h>
-#import <WCPluginWidget.h>
-
-static BOOL imageLoaded = NO;
static NSImage *image = nil;
@implementation IFNullPluginView
@@ -22,13 +20,11 @@ static NSImage *image = nil;
self = [super initWithFrame:frame];
if (self) {
-
// Set the view's image to the null plugin icon
- if(!imageLoaded){
+ if (!image) {
bundle = [NSBundle bundleWithIdentifier:@"com.apple.webkit"];
imagePath = [bundle pathForResource:@"nullplugin" ofType:@"tiff"];
image = [[NSImage alloc] initWithContentsOfFile:imagePath];
- imageLoaded = YES;
}
[self setImage:image];
@@ -70,6 +66,4 @@ static NSImage *image = nil;
}
}
-
-
@end
diff --git a/WebKit/WebView.subproj/IFHTMLRepresentation.mm b/WebKit/WebView.subproj/IFHTMLRepresentation.mm
index d1a193b..b65caa3 100644
--- a/WebKit/WebView.subproj/IFHTMLRepresentation.mm
+++ b/WebKit/WebView.subproj/IFHTMLRepresentation.mm
@@ -44,7 +44,7 @@
- (KHTMLPart *)part
{
- return [_private->bridge KHTMLPart];
+ return [_private->bridge part];
}
- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index d1a193b..b65caa3 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -44,7 +44,7 @@
- (KHTMLPart *)part
{
- return [_private->bridge KHTMLPart];
+ return [_private->bridge part];
}
- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list