[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:15:16 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 02cbd6ae7cba8dbf2a27c5e3962452556483de15
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue May 28 18:34:23 2002 +0000
WebBrowser:
Drag & Drop of file and URL support for the location field.
* LocationFieldEditor.m:
(-[LocationFieldEditor acceptableDragTypes]): Added URL and file drag types
(-[LocationFieldEditor draggingEntered:]): new
(-[LocationFieldEditor draggingUpdated:]): new
(-[LocationFieldEditor prepareForDragOperation:]): new
(-[LocationFieldEditor performDragOperation:]): new
(-[LocationFieldEditor concludeDragOperation:]): support for URL and file types
WebKit:
* Plugins.subproj/IFPluginDatabase.h:
* Plugins.subproj/IFPluginDatabase.m:
(-[IFPluginDatabase pluginForMimeType:]): renamed
(-[IFPluginDatabase pluginForExtension:]): renamed
(-[IFPluginDatabase pluginForFilename:]): renamed
(findPlugins):
* WebCoreSupport.subproj/IFWebCoreViewFactory.m: support for above renamed
(-[IFWebCoreViewFactory viewForPluginWithURL:serviceType:arguments:baseURL:]):
(-[IFWebCoreViewFactory viewForJavaAppletWithArguments:]):
* WebView.subproj/IFWebDataSourcePrivate.mm:
(-[IFWebDataSource _addURLHandle:]): fix for a nil handle being added to an array
WebCore:
Added framework-header-stamp
* .cvsignore:
WebFoundation:
Fix for 2938040 - This flash movie at macboy.com doesn't load
* Misc.subproj/IFNSStringExtensions.m:
(-[NSString _IF_looksLikeAbsoluteURL]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1224 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/.cvsignore b/WebCore/.cvsignore
index d30de60..3dde537 100644
--- a/WebCore/.cvsignore
+++ b/WebCore/.cvsignore
@@ -4,5 +4,6 @@ WebCore-combined.exp
framework-stamp
framework-dylib-stamp
framework-resource-stamp
+framework-header-stamp
libwebcore.dylib
*.pfe
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 19bb23a..8163ee2 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-05-28 Chris Blumenberg <cblu at apple.com>
+
+ Added framework-header-stamp
+
+ * .cvsignore:
+
2002-05-27 John Sullivan <sullivan at apple.com>
* Resources/linkCursor.tiff: Added. Maciej forgot to cvs add
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 19bb23a..8163ee2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-05-28 Chris Blumenberg <cblu at apple.com>
+
+ Added framework-header-stamp
+
+ * .cvsignore:
+
2002-05-27 John Sullivan <sullivan at apple.com>
* Resources/linkCursor.tiff: Added. Maciej forgot to cvs add
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 19bb23a..8163ee2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-05-28 Chris Blumenberg <cblu at apple.com>
+
+ Added framework-header-stamp
+
+ * .cvsignore:
+
2002-05-27 John Sullivan <sullivan at apple.com>
* Resources/linkCursor.tiff: Added. Maciej forgot to cvs add
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e337bd9..0fa872b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2002-05-28 Chris Blumenberg <cblu at apple.com>
+
+ * Plugins.subproj/IFPluginDatabase.h:
+ * Plugins.subproj/IFPluginDatabase.m:
+ (-[IFPluginDatabase pluginForMimeType:]): renamed
+ (-[IFPluginDatabase pluginForExtension:]): renamed
+ (-[IFPluginDatabase pluginForFilename:]): renamed
+ (findPlugins):
+ * WebCoreSupport.subproj/IFWebCoreViewFactory.m: support for above renamed
+ (-[IFWebCoreViewFactory viewForPluginWithURL:serviceType:arguments:baseURL:]):
+ (-[IFWebCoreViewFactory viewForJavaAppletWithArguments:]):
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSource _addURLHandle:]): fix for a nil handle being added to an array
+
2002-05-28 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/IFTextRenderer.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e337bd9..0fa872b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-05-28 Chris Blumenberg <cblu at apple.com>
+
+ * Plugins.subproj/IFPluginDatabase.h:
+ * Plugins.subproj/IFPluginDatabase.m:
+ (-[IFPluginDatabase pluginForMimeType:]): renamed
+ (-[IFPluginDatabase pluginForExtension:]): renamed
+ (-[IFPluginDatabase pluginForFilename:]): renamed
+ (findPlugins):
+ * WebCoreSupport.subproj/IFWebCoreViewFactory.m: support for above renamed
+ (-[IFWebCoreViewFactory viewForPluginWithURL:serviceType:arguments:baseURL:]):
+ (-[IFWebCoreViewFactory viewForJavaAppletWithArguments:]):
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSource _addURLHandle:]): fix for a nil handle being added to an array
+
2002-05-28 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/IFTextRenderer.m:
diff --git a/WebKit/Plugins.subproj/IFPluginDatabase.h b/WebKit/Plugins.subproj/IFPluginDatabase.h
index 54851c9..3549837 100644
--- a/WebKit/Plugins.subproj/IFPluginDatabase.h
+++ b/WebKit/Plugins.subproj/IFPluginDatabase.h
@@ -31,9 +31,9 @@
}
+ (IFPluginDatabase *)installedPlugins;
-- (IFPlugin *)getPluginForMimeType:(NSString *)mimeType;
-- (IFPlugin *)getPluginForExtension:(NSString *)extension;
-- (IFPlugin *)getPluginForFilename:(NSString *)filename;
+- (IFPlugin *)pluginForMimeType:(NSString *)mimeType;
+- (IFPlugin *)pluginForExtension:(NSString *)extension;
+- (IFPlugin *)pluginForFilename:(NSString *)filename;
- (NSArray *) allHandledMIMETypes;
- (NSArray *) plugins;
diff --git a/WebKit/Plugins.subproj/IFPluginDatabase.m b/WebKit/Plugins.subproj/IFPluginDatabase.m
index 8b71862..33d8821 100644
--- a/WebKit/Plugins.subproj/IFPluginDatabase.m
+++ b/WebKit/Plugins.subproj/IFPluginDatabase.m
@@ -40,7 +40,7 @@ static IFPluginDatabase *__IFPluginDatabase = nil;
}
// The first plugin with the specified mime type is returned. We may want to tie this to the defaults so that this is configurable.
-- (IFPlugin *)getPluginForMimeType:(NSString *)mimeType
+- (IFPlugin *)pluginForMimeType:(NSString *)mimeType
{
uint i, n;
IFPlugin *plugin;
@@ -58,7 +58,7 @@ static IFPluginDatabase *__IFPluginDatabase = nil;
return nil;
}
-- (IFPlugin *)getPluginForExtension:(NSString *)extension
+- (IFPlugin *)pluginForExtension:(NSString *)extension
{
uint i, n;
IFPlugin *plugin;
@@ -78,7 +78,7 @@ static IFPluginDatabase *__IFPluginDatabase = nil;
return nil;
}
-- (IFPlugin *)getPluginForFilename:(NSString *)filename
+- (IFPlugin *)pluginForFilename:(NSString *)filename
{
uint i;
IFPlugin *plugin;
@@ -170,8 +170,8 @@ NSArray *findPlugins(void)
if([plugin initWithPath:[pluginPaths objectAtIndex:i]]){
[plugin retain];
[pluginArray addObject:plugin];
- WEBKITDEBUG("Found plugin: %s\n", [[plugin name] lossyCString]);
- WEBKITDEBUG("%s", [[plugin description] lossyCString]);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Found plugin: %s\n", [[plugin name] lossyCString]);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "%s", [[plugin description] lossyCString]);
}
}
return [pluginArray retain];
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.h b/WebKit/Plugins.subproj/WebPluginDatabase.h
index 54851c9..3549837 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.h
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.h
@@ -31,9 +31,9 @@
}
+ (IFPluginDatabase *)installedPlugins;
-- (IFPlugin *)getPluginForMimeType:(NSString *)mimeType;
-- (IFPlugin *)getPluginForExtension:(NSString *)extension;
-- (IFPlugin *)getPluginForFilename:(NSString *)filename;
+- (IFPlugin *)pluginForMimeType:(NSString *)mimeType;
+- (IFPlugin *)pluginForExtension:(NSString *)extension;
+- (IFPlugin *)pluginForFilename:(NSString *)filename;
- (NSArray *) allHandledMIMETypes;
- (NSArray *) plugins;
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index 8b71862..33d8821 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -40,7 +40,7 @@ static IFPluginDatabase *__IFPluginDatabase = nil;
}
// The first plugin with the specified mime type is returned. We may want to tie this to the defaults so that this is configurable.
-- (IFPlugin *)getPluginForMimeType:(NSString *)mimeType
+- (IFPlugin *)pluginForMimeType:(NSString *)mimeType
{
uint i, n;
IFPlugin *plugin;
@@ -58,7 +58,7 @@ static IFPluginDatabase *__IFPluginDatabase = nil;
return nil;
}
-- (IFPlugin *)getPluginForExtension:(NSString *)extension
+- (IFPlugin *)pluginForExtension:(NSString *)extension
{
uint i, n;
IFPlugin *plugin;
@@ -78,7 +78,7 @@ static IFPluginDatabase *__IFPluginDatabase = nil;
return nil;
}
-- (IFPlugin *)getPluginForFilename:(NSString *)filename
+- (IFPlugin *)pluginForFilename:(NSString *)filename
{
uint i;
IFPlugin *plugin;
@@ -170,8 +170,8 @@ NSArray *findPlugins(void)
if([plugin initWithPath:[pluginPaths objectAtIndex:i]]){
[plugin retain];
[pluginArray addObject:plugin];
- WEBKITDEBUG("Found plugin: %s\n", [[plugin name] lossyCString]);
- WEBKITDEBUG("%s", [[plugin description] lossyCString]);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Found plugin: %s\n", [[plugin name] lossyCString]);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "%s", [[plugin description] lossyCString]);
}
}
return [pluginArray retain];
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m b/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m
index b37e08b..c8a3fe9 100644
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m
@@ -48,9 +48,9 @@
if ([serviceType length]) {
mimeType = serviceType;
- plugin = [[IFPluginDatabase installedPlugins] getPluginForMimeType:mimeType];
+ plugin = [[IFPluginDatabase installedPlugins] pluginForMimeType:mimeType];
} else {
- plugin = [[IFPluginDatabase installedPlugins] getPluginForExtension:[pluginURL pathExtension]];
+ plugin = [[IFPluginDatabase installedPlugins] pluginForExtension:[pluginURL pathExtension]];
mimeType = [plugin mimeTypeForURL:pluginURL];
}
@@ -70,7 +70,7 @@
IFPlugin *plugin;
NSMutableDictionary *argsCopy;
- plugin = [[IFPluginDatabase installedPlugins] getPluginForFilename:@"Java.plugin"];
+ plugin = [[IFPluginDatabase installedPlugins] pluginForFilename:@"Java.plugin"];
if (plugin == nil) {
return nil;
}
diff --git a/WebKit/WebCoreSupport.subproj/WebViewFactory.m b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
index b37e08b..c8a3fe9 100644
--- a/WebKit/WebCoreSupport.subproj/WebViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
@@ -48,9 +48,9 @@
if ([serviceType length]) {
mimeType = serviceType;
- plugin = [[IFPluginDatabase installedPlugins] getPluginForMimeType:mimeType];
+ plugin = [[IFPluginDatabase installedPlugins] pluginForMimeType:mimeType];
} else {
- plugin = [[IFPluginDatabase installedPlugins] getPluginForExtension:[pluginURL pathExtension]];
+ plugin = [[IFPluginDatabase installedPlugins] pluginForExtension:[pluginURL pathExtension]];
mimeType = [plugin mimeTypeForURL:pluginURL];
}
@@ -70,7 +70,7 @@
IFPlugin *plugin;
NSMutableDictionary *argsCopy;
- plugin = [[IFPluginDatabase installedPlugins] getPluginForFilename:@"Java.plugin"];
+ plugin = [[IFPluginDatabase installedPlugins] pluginForFilename:@"Java.plugin"];
if (plugin == nil) {
return nil;
}
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index 7c63f43..0952af4 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -173,7 +173,8 @@
{
if (_private->urlHandles == nil)
_private->urlHandles = [[NSMutableArray alloc] init];
- [_private->urlHandles addObject: handle];
+ if(handle)
+ [_private->urlHandles addObject: handle];
[self _setLoading:YES];
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 7c63f43..0952af4 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -173,7 +173,8 @@
{
if (_private->urlHandles == nil)
_private->urlHandles = [[NSMutableArray alloc] init];
- [_private->urlHandles addObject: handle];
+ if(handle)
+ [_private->urlHandles addObject: handle];
[self _setLoading:YES];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list