[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:45:43 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit fdfc3fc758a8eba36070f5f7898da24dbb0522b9
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 30 05:03:01 2002 +0000
WebKit:
* Misc.subproj/WebIconDatabase.m: (-[WebIconDatabase _iconForFileURL:withSize:]):
Don't be case sensitive about filename extensions.
* Misc.subproj/WebDownloadHandler.m:
* Misc.subproj/WebIconLoader.m:
* Plugins.subproj/WebPluginStream.m:
* WebView.subproj/WebDataSource.m:
* WebView.subproj/WebDefaultContextMenuDelegate.m:
* WebView.subproj/WebFrame.m:
* WebView.subproj/WebFramePrivate.m:
* WebView.subproj/WebView.m:
Don't use WebFoundation.h -- faster building to just import what we really use.
WebBrowser:
* ContextMenuHandler.m: (-[ContextMenuHandler contextMenuItemsForElement:defaultMenuItems:]):
Don't be case sensitive about filename extensions.
* Preferences.subproj/SecurityPreferences.m:
Don't use WebFoundation.h -- faster building to just import what we really use.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2203 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cc5b5fe..227be30 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-09-29 Darin Adler <darin at apple.com>
+
+ * Misc.subproj/WebIconDatabase.m: (-[WebIconDatabase _iconForFileURL:withSize:]):
+ Don't be case sensitive about filename extensions.
+
+ * Misc.subproj/WebDownloadHandler.m:
+ * Misc.subproj/WebIconLoader.m:
+ * Plugins.subproj/WebPluginStream.m:
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ * WebView.subproj/WebFrame.m:
+ * WebView.subproj/WebFramePrivate.m:
+ * WebView.subproj/WebView.m:
+ Don't use WebFoundation.h -- faster building to just import what we really use.
+
2002-09-29 Chris Blumenberg <cblu at apple.com>
Fixed: 2978258 - quake3arena.com sends me to the flash=false site
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index cc5b5fe..227be30 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-09-29 Darin Adler <darin at apple.com>
+
+ * Misc.subproj/WebIconDatabase.m: (-[WebIconDatabase _iconForFileURL:withSize:]):
+ Don't be case sensitive about filename extensions.
+
+ * Misc.subproj/WebDownloadHandler.m:
+ * Misc.subproj/WebIconLoader.m:
+ * Plugins.subproj/WebPluginStream.m:
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ * WebView.subproj/WebFrame.m:
+ * WebView.subproj/WebFramePrivate.m:
+ * WebView.subproj/WebView.m:
+ Don't use WebFoundation.h -- faster building to just import what we really use.
+
2002-09-29 Chris Blumenberg <cblu at apple.com>
Fixed: 2978258 - quake3arena.com sends me to the flash=false site
diff --git a/WebKit/Misc.subproj/WebDownloadHandler.m b/WebKit/Misc.subproj/WebDownloadHandler.m
index 5477022..1b583b1 100644
--- a/WebKit/Misc.subproj/WebDownloadHandler.m
+++ b/WebKit/Misc.subproj/WebDownloadHandler.m
@@ -12,7 +12,8 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitLogging.h>
-#import <WebFoundation/WebFoundation.h>
+#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebResourceRequest.h>
@implementation WebDownloadHandler
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index d126b9d..2a54631 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -11,6 +11,7 @@
#import <WebKit/WebIconDatabasePrivate.h>
#import <WebKit/WebKitLogging.h>
+#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebFileDatabase.h>
@@ -385,7 +386,7 @@ NSSize WebIconLargeSize = {128, 128};
NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
NSImage *icon;
- if([[[fileURL path] pathExtension] rangeOfString:@"htm"].length > 0){
+ if([[[fileURL path] pathExtension] _web_hasCaseInsensitivePrefix:@"htm"]){
if(!_private->htmlIcons){
icon = [workspace iconForFileType:@"html"];
_private->htmlIcons = [[self _iconsBySplittingRepresentationsOfIcon:icon] retain];
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index b7c76fa..e911862 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -11,7 +11,6 @@
#import <WebKit/WebIconDatabase.h>
#import <WebKit/WebIconDatabasePrivate.h>
-#import <WebFoundation/WebFoundation.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResourceLoadManager.h>
#import <WebFoundation/WebResourceHandle.h>
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 56daf87..dea40f2 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -13,13 +13,11 @@
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebKitLogging.h>
-//#import <WebFoundation/WebAssertions.h>
-//#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebFoundation.h>
+#import <WebFoundation/WebError.h>
#import <WebFoundation/WebNSFileManagerExtras.h>
-//#import <WebFoundation/WebResourceHandle.h>
-//#import <WebFoundation/WebResourceRequest.h>
-//#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceRequest.h>
+#import <WebFoundation/WebResourceResponse.h>
@interface WebNetscapePluginStream (ClassInternal)
- (void)receivedData:(NSData *)data withHandle:(WebResourceHandle *)handle;
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 45fff4e..139dc91 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -16,8 +16,8 @@
#import <WebFoundation/WebAssertions.h>
#import <WebKit/WebKitStatisticsPrivate.h>
-#import <WebFoundation/WebFoundation.h>
#import <WebFoundation/WebFileTypeMappings.h>
+#import <WebFoundation/WebResourceHandle.h>
#import <WebFoundation/WebResourceRequest.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 3d7860b..7f664b2 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -14,7 +14,8 @@
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebWindowOperationsDelegate.h>
-#import <WebFoundation/WebFoundation.h>
+#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceRequest.h>
@implementation WebDefaultContextMenuDelegate
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 2b51534..91df3ee 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -21,7 +21,6 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
-#import <WebFoundation/WebFoundation.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResourceRequest.h>
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 98eddeb..41a2039 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -25,8 +25,10 @@
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebViewPrivate.h>
+#import <WebFoundation/WebError.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebFoundation.h>
+#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceRequest.h>
static const char * const stateNames[] = {
"WebFrameStateProvisional",
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index d61b620..0582be2 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -25,9 +25,9 @@
#import <WebKit/WebViewFactory.h>
#import <WebKit/WebWindowOperationsDelegate.h>
+#import <WebFoundation/WebError.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebFoundation.h>
enum {
SpaceKey = 0x0020
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list