[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 08:28:35 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5321f0ab96563ea19cae1f2ad82ceabf2b42447d
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 4 23:34:38 2004 +0000
WebKit:
- Made image dragging and copying always work without needing to re-download by using the data source's WebResource of the image instead of relying on the Foundation cache.
- Fixed a "drag to self" problem I introduced in my last check-in. You could drag a URL from a WebHTMLView and drop it on its own WebView which we shouldn't allow.
Reviewed by rjw.
* ChangeLog:
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge fileWrapperForURL:]): call _fileWrapperForURL on WebDataSource
* WebView.subproj/WebDataSource.m:
(-[WebDataSource _fileWrapperForURL:]): moved from WebView, creates a wrapper from a WebResource
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultUIDelegate copyImageToClipboard:]): call [WebDataSource _fileWrapperForURL:]
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView _handleMouseDragged:]): call [WebDataSource _fileWrapperForURL:]
(-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]): call [WebDataSource _fileWrapperForURL:]
(-[WebHTMLView _dragOperationForDraggingInfo:]): new, factored out from draggingUpdated:
(-[WebHTMLView draggingEntered:]): call _dragOperationForDraggingInfo:, if NSDragOperationNone, forward to WebView to it can handle the drag
(-[WebHTMLView draggingUpdated:]): ditto
(-[WebHTMLView concludeDragOperation:]): ditto
* WebView.subproj/WebResource.m:
(-[WebResource _fileWrapperRepresentation]): new
* WebView.subproj/WebResourcePrivate.h:
* WebView.subproj/WebView.m:
(-[WebViewPrivate dealloc]): release draggedTypes, a new ivar that keeps track of drag types that we're currently registered for
(-[WebView _setDraggedTypes:]): new
(-[WebView unregisterDraggedTypes]): new, calls _setDraggedTypes then super
(-[WebView registerForDraggedTypes:]): ditto
(-[WebView _dragOperationForDraggingInfo:]): new, compares the types on the pasteboard against the types we are currently registered for. Normally the AppKit handles this for us, but since these messages can be forwarded from WebHTMLView, we need to do this comparison ourselves.
(-[WebView draggingEntered:]): calls _dragOperationForDraggingInfo:
(-[WebView draggingUpdated:]): ditto
(-[WebView concludeDragOperation:]): ditto
* WebView.subproj/WebViewPrivate.h: define new draggedTypes ivar
WebBrowser:
Removed "Download Image" context menus because images no longer need to be re-downloaded.
Reviewed by rjw.
* ContextMenuHandler.m:
(-[WebDataSource isDataLocalForURL:]): new category, moved from the WebView category
(-[BrowserWebView webView:contextMenuItemsForElement:defaultMenuItems:]): call isDataLocalForURL on WebDataSource
(-[BrowserWebView saveFileWrapperForURLKey:menuItem:]): call _fileWrapperForURL on WebDataSource, use the resource to get the MIME type if possible
(-[BrowserWebView saveFileWrapperToDownloadsFolderForURLKey:menuItem:]): call _fileWrapperForURL on WebDataSource
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6170 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cd84681..c7af75a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,39 @@
+2004-03-04 Chris Blumenberg <cblu at apple.com>
+
+ - Made image dragging and copying always work without needing to re-download by using the data source's WebResource of the image instead of relying on the Foundation cache.
+ - Fixed a "drag to self" problem I introduced in my last check-in. You could drag a URL from a WebHTMLView and drop it on its own WebView which we shouldn't allow.
+
+ Reviewed by rjw.
+
+ * ChangeLog:
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge fileWrapperForURL:]): call _fileWrapperForURL on WebDataSource
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource _fileWrapperForURL:]): moved from WebView, creates a wrapper from a WebResource
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultUIDelegate copyImageToClipboard:]): call [WebDataSource _fileWrapperForURL:]
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView _handleMouseDragged:]): call [WebDataSource _fileWrapperForURL:]
+ (-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]): call [WebDataSource _fileWrapperForURL:]
+ (-[WebHTMLView _dragOperationForDraggingInfo:]): new, factored out from draggingUpdated:
+ (-[WebHTMLView draggingEntered:]): call _dragOperationForDraggingInfo:, if NSDragOperationNone, forward to WebView to it can handle the drag
+ (-[WebHTMLView draggingUpdated:]): ditto
+ (-[WebHTMLView concludeDragOperation:]): ditto
+ * WebView.subproj/WebResource.m:
+ (-[WebResource _fileWrapperRepresentation]): new
+ * WebView.subproj/WebResourcePrivate.h:
+ * WebView.subproj/WebView.m:
+ (-[WebViewPrivate dealloc]): release draggedTypes, a new ivar that keeps track of drag types that we're currently registered for
+ (-[WebView _setDraggedTypes:]): new
+ (-[WebView unregisterDraggedTypes]): new, calls _setDraggedTypes then super
+ (-[WebView registerForDraggedTypes:]): ditto
+ (-[WebView _dragOperationForDraggingInfo:]): new, compares the types on the pasteboard against the types we are currently registered for. Normally the AppKit handles this for us, but since these messages can be forwarded from WebHTMLView, we need to do this comparison ourselves.
+ (-[WebView draggingEntered:]): calls _dragOperationForDraggingInfo:
+ (-[WebView draggingUpdated:]): ditto
+ (-[WebView concludeDragOperation:]): ditto
+ * WebView.subproj/WebViewPrivate.h: define new draggedTypes ivar
+
2004-03-03 Chris Blumenberg <cblu at apple.com>
Fixed a typo.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 2ec1207..e453c7a 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -1131,7 +1131,7 @@ static id <WebFormDelegate> formDelegate(WebBridge *self)
- (NSFileWrapper *)fileWrapperForURL:(NSURL *)URL
{
- return [[_frame webView] _fileWrapperForURL:URL];
+ return [[_frame dataSource] _fileWrapperForURL:URL];
}
- (void)print
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 94ab50a..3f2334e 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -141,6 +141,28 @@
return [self _propertyListWithData:data subresourceURLStrings:[_private->subresources allKeys]];
}
+- (NSFileWrapper *)_fileWrapperForURL:(NSURL *)URL
+{
+ if ([URL isFileURL]) {
+ NSString *path = [[URL path] stringByResolvingSymlinksInPath];
+ return [[[NSFileWrapper alloc] initWithPath:path] autorelease];
+ }
+
+ WebResource *resource = [self subresourceForURL:URL];
+ if (resource) {
+ return [resource _fileWrapperRepresentation];
+ }
+
+ NSCachedURLResponse *cachedResponse = [_private->webView _cachedResponseForURL:URL];
+ if (cachedResponse) {
+ NSFileWrapper *wrapper = [[[NSFileWrapper alloc] initRegularFileWithContents:[cachedResponse data]] autorelease];
+ [wrapper setPreferredFilename:[[cachedResponse response] suggestedFilename]];
+ return wrapper;
+ }
+
+ return nil;
+}
+
- (WebView *)_webView
{
return _private->webView;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 0cea152..355da8e 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -122,6 +122,8 @@
- (void)addSubresources:(NSArray *)subresources;
- (id)propertyList;
+- (NSFileWrapper *)_fileWrapperForURL:(NSURL *)URL;
+
- (id)_propertyListWithData:(NSData *)data subresourceURLStrings:(NSArray *)subresourceURLStrings;
- (NSError *)_mainDocumentError;
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index be1e757..5799a0e 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -2,10 +2,13 @@
WebDefaultContextMenuDelegate.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
+
+#import <WebKit/WebDefaultContextMenuDelegate.h>
+
+#import <WebKit/WebAssertions.h>
#import <WebKit/DOM.h>
#import <WebKit/WebBridge.h>
#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebDefaultContextMenuDelegate.h>
#import <WebKit/WebDefaultUIDelegate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebLocalizableStrings.h>
@@ -209,12 +212,12 @@
NSDictionary *element = [sender representedObject];
NSURL *linkURL = [element objectForKey:WebElementLinkURLKey];
NSURL *imageURL = [element objectForKey:WebElementImageURLKey];
- WebView *webView = [[element objectForKey:WebElementFrameKey] webView];
-
+ NSFileWrapper *wrapper = [[[element objectForKey:WebElementFrameKey] dataSource] _fileWrapperForURL:imageURL];
+ ASSERT(wrapper);
[[NSPasteboard generalPasteboard] _web_writeImage:[element objectForKey:WebElementImageKey]
URL:linkURL ? linkURL : imageURL
title:[element objectForKey:WebElementImageAltStringKey]
- fileWrapper:[webView _fileWrapperForURL:imageURL]
+ fileWrapper:wrapper
HTMLString:[[element objectForKey:WebCoreElementDOMNodeKey] HTMLString]];
}
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 580c5b8..97ff763 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -705,8 +705,10 @@ static WebHTMLView *lastHitView = nil;
_private->draggingImageURL = [imageURL retain];
WebImageRenderer *image = [element objectForKey:WebElementImageKey];
ASSERT([image isKindOfClass:[WebImageRenderer class]]);
+ NSFileWrapper *fileWrapper = [[self _dataSource] _fileWrapperForURL:_private->draggingImageURL];
+ ASSERT(fileWrapper);
[self _web_dragImage:image
- fileWrapper:[[self _webView] _fileWrapperForURL:imageURL]
+ fileWrapper:fileWrapper
rect:[[element objectForKey:WebElementImageRectKey] rectValue]
URL:linkURL ? linkURL : imageURL
title:[element objectForKey:WebElementImageAltStringKey]
@@ -1593,35 +1595,20 @@ static WebHTMLView *lastHitView = nil;
{
ASSERT(_private->draggingImageURL);
- WebView *webView = [self _webView];
- NSFileWrapper *wrapper = [webView _fileWrapperForURL:_private->draggingImageURL];
- NSString *filename;
+ NSFileWrapper *wrapper = [[self _dataSource] _fileWrapperForURL:_private->draggingImageURL];
+ ASSERT(wrapper);
- if (wrapper) {
- // FIXME: Report an error if we fail to create a file.
- NSString *path = [[dropDestination path] stringByAppendingPathComponent:[wrapper preferredFilename]];
- path = [[NSFileManager defaultManager] _web_pathWithUniqueFilenameForPath:path];
- if (![wrapper writeToFile:path atomically:NO updateFilenames:YES]) {
- ERROR("Failed to create image file via -[NSFileWrapper writeToFile:atomically:updateFilenames:]");
- }
- filename = [path lastPathComponent];
- } else {
- // FIXME: The file is supposed to be created at this point so the Finder places the file
- // where the drag ended. Since we can't create the file until the download starts,
- // this fails.
- [webView _downloadURL:_private->draggingImageURL toDirectory:[dropDestination path]];
- filename = [_private->draggingImageURL _web_suggestedFilenameWithMIMEType:nil];
+ // FIXME: Report an error if we fail to create a file.
+ NSString *path = [[dropDestination path] stringByAppendingPathComponent:[wrapper preferredFilename]];
+ path = [[NSFileManager defaultManager] _web_pathWithUniqueFilenameForPath:path];
+ if (![wrapper writeToFile:path atomically:NO updateFilenames:YES]) {
+ ERROR("Failed to create image file via -[NSFileWrapper writeToFile:atomically:updateFilenames:]");
}
- return [NSArray arrayWithObject:filename];
-}
-
-- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
-{
- return _private->isDragging ? NSDragOperationMove : NSDragOperationCopy;
+ return [NSArray arrayWithObject:[path lastPathComponent]];
}
-- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender
+- (NSDragOperation)_dragOperationForDraggingInfo:(id <NSDraggingInfo>)sender
{
NSPoint point = [self convertPoint:[sender draggingLocation] fromView:nil];
NSDictionary *element = [self _elementAtPoint:point];
@@ -1634,8 +1621,21 @@ static WebHTMLView *lastHitView = nil;
return NSDragOperationCopy;
}
}
- // Since we're not handling the drag, forward this message to the WebView since it may want to handle it.
- return [[self _webView] draggingUpdated:sender];
+ return NSDragOperationNone;
+}
+
+- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
+{
+ // If we're not handling the drag, forward this message to the WebView since it may want to handle it.
+ NSDragOperation dragOperation = [self _dragOperationForDraggingInfo:sender];
+ return dragOperation != NSDragOperationNone ? dragOperation : [[self _webView] draggingEntered:sender];
+}
+
+- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender
+{
+ // If we're not handling the drag, forward this message to the WebView since it may want to handle it.
+ NSDragOperation dragOperation = [self _dragOperationForDraggingInfo:sender];
+ return dragOperation != NSDragOperationNone ? dragOperation : [[self _webView] draggingUpdated:sender];
}
- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
@@ -1650,8 +1650,7 @@ static WebHTMLView *lastHitView = nil;
- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
{
- NSPoint point = [self convertPoint:[sender draggingLocation] fromView:nil];
- if ([[[self _elementAtPoint:point] objectForKey:WebElementIsEditableKey] boolValue] && [[self _bridge] moveCaretToPoint:point]) {
+ if ([self _dragOperationForDraggingInfo:sender] != NSDragOperationNone) {
// FIXME: We should delete the original selection if we're doing a move.
[self _pasteHTMLFromPasteboard:[sender draggingPasteboard]];
} else {
diff --git a/WebKit/WebView.subproj/WebResource.m b/WebKit/WebView.subproj/WebResource.m
index d351889..210bca9 100644
--- a/WebKit/WebView.subproj/WebResource.m
+++ b/WebKit/WebView.subproj/WebResource.m
@@ -7,6 +7,7 @@
#import <WebKit/WebNSURLExtras.h>
#import <Foundation/NSDictionary_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
NSString *WebHTMLPboardType = @"Apple Web Kit pasteboard type";
NSString *WebMainResourceKey = @"WebMainResource";
@@ -150,6 +151,13 @@ NSString *WebSubresourcesKey = @"WebSubresources";
textEncodingName:[response textEncodingName]];
}
+- (NSFileWrapper *)_fileWrapperRepresentation
+{
+ NSFileWrapper *wrapper = [[[NSFileWrapper alloc] initRegularFileWithContents:_private->data] autorelease];
+ [wrapper setPreferredFilename:[_private->URL _web_suggestedFilenameWithMIMEType:_private->MIMEType]];
+ return wrapper;
+}
+
- (id)_propertyListRepresentation
{
NSMutableDictionary *propertyList = [NSMutableDictionary dictionary];
@@ -170,9 +178,4 @@ NSString *WebSubresourcesKey = @"WebSubresources";
textEncodingName:_private->textEncodingName] autorelease];
}
-- (NSCachedURLResponse *)_cachedResponseRepresentation
-{
- return [[[NSCachedURLResponse alloc] initWithResponse:[self _response] data:_private->data] autorelease];
-}
-
@end
diff --git a/WebKit/WebView.subproj/WebResourcePrivate.h b/WebKit/WebView.subproj/WebResourcePrivate.h
index 52b408d..939e4f0 100644
--- a/WebKit/WebView.subproj/WebResourcePrivate.h
+++ b/WebKit/WebView.subproj/WebResourcePrivate.h
@@ -22,8 +22,8 @@ extern NSString *WebSubresourcesKey;
- (id)_initWithPropertyList:(id)propertyList;
- (id)_initWithCachedResponse:(NSCachedURLResponse *)response originalURL:(NSURL *)originalURL;
+- (NSFileWrapper *)_fileWrapperRepresentation;
- (id)_propertyListRepresentation;
-- (NSCachedURLResponse *)_cachedResponseRepresentation;
- (NSURLResponse *)_response;
@end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index a72e418..9bce40b 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -127,6 +127,8 @@ NSString *_WebMainFrameURLKey = @"mainFrameURL";
[progressItems release];
+ [draggedTypes release];
+
[super dealloc];
}
@@ -689,6 +691,25 @@ NSString *_WebMainFrameURLKey = @"mainFrameURL";
return [self _frameForView: aView fromFrame: frame];
}
+- (void)_setDraggedTypes:(NSArray *)draggedTypes
+{
+ [draggedTypes retain];
+ [_private->draggedTypes release];
+ _private->draggedTypes = draggedTypes;
+}
+
+- (void)unregisterDraggedTypes
+{
+ [self _setDraggedTypes:nil];
+ [super unregisterDraggedTypes];
+}
+
+- (void)registerForDraggedTypes:(NSArray *)draggedTypes
+{
+ [self _setDraggedTypes:draggedTypes];
+ [super registerForDraggedTypes:draggedTypes];
+}
+
- (void)_registerDraggedTypes
{
[self registerForDraggedTypes:[NSPasteboard _web_dragTypesForURL]];
@@ -1045,22 +1066,6 @@ NSString *_WebMainFrameURLKey = @"mainFrameURL";
return cachedResponse;
}
-- (NSFileWrapper *)_fileWrapperForURL:(NSURL *)URL
-{
- if ([URL isFileURL]) {
- NSString *path = [[URL path] stringByResolvingSymlinksInPath];
- return [[[NSFileWrapper alloc] initWithPath:path] autorelease];
- } else {
- NSCachedURLResponse *cachedResponse = [self _cachedResponseForURL:URL];
- if (cachedResponse) {
- NSFileWrapper *wrapper = [[[NSFileWrapper alloc] initRegularFileWithContents:[cachedResponse data]] autorelease];
- [wrapper setPreferredFilename:[[cachedResponse response] suggestedFilename]];
- return wrapper;
- }
- }
- return nil;
-}
-
@end
@@ -1535,10 +1540,19 @@ NS_ENDHANDLER
return _private->hostWindow;
}
+- (NSDragOperation)_dragOperationForDraggingInfo:(id <NSDraggingInfo>)sender
+{
+ // Even though we may not be registered for any drag types, we may still get drag messages forwarded from WebHTMLView,
+ // so compare the types on the pasteboard against the types we're currently registered for.
+ if ([_private->draggedTypes count] > 0 && [[sender draggingPasteboard] availableTypeFromArray:_private->draggedTypes] != nil) {
+ return [self _web_dragOperationForDraggingInfo:sender];
+ }
+ return NSDragOperationNone;
+}
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
{
- return [self _web_dragOperationForDraggingInfo:sender];
+ return [self _dragOperationForDraggingInfo:sender];
}
- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender
@@ -1547,7 +1561,7 @@ NS_ENDHANDLER
if ([[self hitTest:point] isKindOfClass:[WebBaseNetscapePluginView class]]) {
return NSDragOperationNone;
}
- return [self _web_dragOperationForDraggingInfo:sender];
+ return [self _dragOperationForDraggingInfo:sender];
}
- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
@@ -1562,12 +1576,13 @@ NS_ENDHANDLER
- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
{
- NSURL *URL = [[sender draggingPasteboard] _web_bestURL];
-
- if (URL) {
- NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
- [[self mainFrame] loadRequest:request];
- [request release];
+ if ([self _dragOperationForDraggingInfo:sender] != NSDragOperationNone) {
+ NSURL *URL = [[sender draggingPasteboard] _web_bestURL];
+ if (URL) {
+ NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
+ [[self mainFrame] loadRequest:request];
+ [request release];
+ }
}
}
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 7ac665c..51336c7 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -87,6 +87,8 @@ extern NSString *_WebMainFrameURLKey;
NSMutableDictionary *progressItems;
void *observationInfo;
+
+ NSArray *draggedTypes;
}
@end
@@ -257,7 +259,6 @@ Could be worth adding to the API.
+ (void)_setAlwaysUseATSU:(BOOL)f;
- (NSCachedURLResponse *)_cachedResponseForURL:(NSURL *)URL;
-- (NSFileWrapper *)_fileWrapperForURL:(NSURL *)URL;
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list