Reviewed by Anders.
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 May 2006 22:28:07 +0000 (22:28 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 May 2006 22:28:07 +0000 (22:28 +0000)
        - did the name change from "ImageElement" to "ImageForElement" that I said I would
          (oops!)

        * DefaultDelegates/WebDefaultContextMenuDelegate.m:
        (-[WebDefaultUIDelegate copyImageToClipboard:]):
        * Misc/WebNSPasteboardExtras.h:
        * Misc/WebNSPasteboardExtras.m:
        (-[NSPasteboard _web_declareAndWriteDragImageForElement:URL:title:archive:source:]):
        * Misc/WebNSViewExtras.h:
        * Misc/WebNSViewExtras.m:
        (-[NSView _web_DragImageForElement:rect:event:pasteboard:source:offset:]):
        * WebView/WebHTMLView.m:
        (-[WebHTMLView _startDraggingImage:at:operation:event:sourceIsDHTML:DHTMLWroteData:]):
        * WebView/WebView.m:
        (-[WebView _writeImageForElement:withPasteboardTypes:toPasteboard:]):
        (-[WebView writeElement:withPasteboardTypes:toPasteboard:]):
        * WebView/WebViewInternal.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14421 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog
WebKit/DefaultDelegates/WebDefaultContextMenuDelegate.m
WebKit/Misc/WebNSPasteboardExtras.h
WebKit/Misc/WebNSPasteboardExtras.m
WebKit/Misc/WebNSViewExtras.h
WebKit/Misc/WebNSViewExtras.m
WebKit/WebView/WebHTMLView.m
WebKit/WebView/WebView.m
WebKit/WebView/WebViewInternal.h

index e69d569add102fa1bfd2684585583bf7fa11fa47..4d939f5028d43966acf7102d7f036cbc1e14bce0 100644 (file)
@@ -1,3 +1,25 @@
+2006-05-16  Darin Adler  <darin@apple.com>
+
+        Reviewed by Anders.
+
+        - did the name change from "ImageElement" to "ImageForElement" that I said I would
+          (oops!)
+
+        * DefaultDelegates/WebDefaultContextMenuDelegate.m:
+        (-[WebDefaultUIDelegate copyImageToClipboard:]):
+        * Misc/WebNSPasteboardExtras.h:
+        * Misc/WebNSPasteboardExtras.m:
+        (-[NSPasteboard _web_declareAndWriteDragImageForElement:URL:title:archive:source:]):
+        * Misc/WebNSViewExtras.h:
+        * Misc/WebNSViewExtras.m:
+        (-[NSView _web_DragImageForElement:rect:event:pasteboard:source:offset:]):
+        * WebView/WebHTMLView.m:
+        (-[WebHTMLView _startDraggingImage:at:operation:event:sourceIsDHTML:DHTMLWroteData:]):
+        * WebView/WebView.m:
+        (-[WebView _writeImageForElement:withPasteboardTypes:toPasteboard:]):
+        (-[WebView writeElement:withPasteboardTypes:toPasteboard:]):
+        * WebView/WebViewInternal.h:
+
 2006-05-16  Darin Adler  <darin@apple.com>
 
         Reviewed by Anders.
index 7c2744c3d63e471652c5e07373ea7c9d5bf60710..01d2b020ccb36b14b95c313159d52e899eab52f5 100644 (file)
@@ -416,7 +416,7 @@ static NSString *localizedMenuTitleFromAppKit(NSString *key, NSString *comment)
     NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
     NSArray *types = [NSPasteboard _web_writableTypesForImageIncludingArchive:([element objectForKey:WebElementDOMNodeKey] != nil)];
     [pasteboard declareTypes:types owner:self];
-    [[[element objectForKey:WebElementFrameKey] webView] _writeImageElement:element 
+    [[[element objectForKey:WebElementFrameKey] webView] _writeImageForElement:element 
                                                         withPasteboardTypes:types 
                                                                toPasteboard:pasteboard];
 }
index f219e65d93df4c201222d5e22f53998c0b26aa74..8f88ea5009ea3f5a44b852097b973c3c89b83442 100644 (file)
@@ -68,7 +68,7 @@ extern NSString *WebURLNamePboardType;
                 archive:(WebArchive *)archive
                   types:(NSArray *)types;
 
-- (id)_web_declareAndWriteDragImageElement:(DOMElement *)element
+- (id)_web_declareAndWriteDragImageForElement:(DOMElement *)element
                                        URL:(NSURL *)URL 
                                      title:(NSString *)title
                                    archive:(WebArchive *)archive
index dc0df7edae61d44d502ba66ac215415deb7c8c09..7f05f06eb778fd0045590c3e29cccfd3ec4c7533 100644 (file)
@@ -261,7 +261,7 @@ static NSArray *_writableTypesForImageWithArchive (void)
     }
 }
 
-- (id)_web_declareAndWriteDragImageElement:(DOMElement *)element
+- (id)_web_declareAndWriteDragImageForElement:(DOMElement *)element
                                        URL:(NSURL *)URL 
                                      title:(NSString *)title
                                    archive:(WebArchive *)archive
index 2295123efc3c87c7322bdca02edd59e48626889a..ae570f495bac9680cfa04fa26a7911c0d2c91d9f 100644 (file)
@@ -57,7 +57,7 @@
 - (NSDragOperation)_web_dragOperationForDraggingInfo:(id <NSDraggingInfo>)sender;
 
 // Resizes and applies alpha to image and drags it.
-- (void)_web_dragImageElement:(DOMElement *)element
+- (void)_web_DragImageForElement:(DOMElement *)element
                          rect:(NSRect)rect
                         event:(NSEvent *)event
                    pasteboard:(NSPasteboard *)pasteboard 
index 47e5cb394cb24c891fc5ce8cd5b76447dace55b8..211b18a6dbab5c6ff04decd8a9c261a3dad05f1a 100644 (file)
     }
 }
 
-- (void)_web_dragImageElement:(DOMElement *)element
+- (void)_web_DragImageForElement:(DOMElement *)element
                          rect:(NSRect)rect
                         event:(NSEvent *)event
                    pasteboard:(NSPasteboard *)pasteboard 
index d088cb47632065bdf3b18b57054e3124d83bfa83..4174ee2f0d5a9c838892d4796be7874d493a0efe 100644 (file)
@@ -1300,7 +1300,7 @@ static WebHTMLView *lastHitView = nil;
             else
                 archive = [WebArchiver archiveMainResourceForFrame:[self _frame]];
             
-            source = [pasteboard _web_declareAndWriteDragImageElement:imageElement
+            source = [pasteboard _web_declareAndWriteDragImageForElement:imageElement
                                                                   URL:linkURL ? linkURL : imageURL
                                                                 title:[element objectForKey:WebElementImageAltStringKey]
                                                               archive:archive
@@ -1308,7 +1308,7 @@ static WebHTMLView *lastHitView = nil;
         }
         [[webView _UIDelegateForwarder] webView:webView willPerformDragSourceAction:WebDragSourceActionImage fromPoint:mouseDownPoint withPasteboard:pasteboard];
         if (dragImage == nil) {
-            [self _web_dragImageElement:[element objectForKey:WebElementDOMNodeKey]
+            [self _web_DragImageForElement:[element objectForKey:WebElementDOMNodeKey]
                                    rect:[[element objectForKey:WebElementImageRectKey] rectValue]
                                   event:_private->mouseDownEvent
                              pasteboard:pasteboard
index db175233cb96161daef96472a2eebf5e44cd5b55..853682eedbd79bb27e6b291cd1cd41d31a71aad9 100644 (file)
@@ -1274,7 +1274,7 @@ static bool debugWidget = true;
     return cachedResponse;
 }
 
-- (void)_writeImageElement:(NSDictionary *)element withPasteboardTypes:(NSArray *)types toPasteboard:(NSPasteboard *)pasteboard
+- (void)_writeImageForElement:(NSDictionary *)element withPasteboardTypes:(NSArray *)types toPasteboard:(NSPasteboard *)pasteboard
 {
     NSURL *linkURL = [element objectForKey:WebElementLinkURLKey];
     DOMElement *domElement = [element objectForKey:WebElementDOMNodeKey];
@@ -2341,7 +2341,7 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
 - (void)writeElement:(NSDictionary *)element withPasteboardTypes:(NSArray *)types toPasteboard:(NSPasteboard *)pasteboard
 {
     if ([element objectForKey:WebElementImageURLKey] != nil) {
-        [self _writeImageElement:element withPasteboardTypes:types toPasteboard:pasteboard];
+        [self _writeImageForElement:element withPasteboardTypes:types toPasteboard:pasteboard];
     } else if ([element objectForKey:WebElementLinkURLKey] != nil) {
         [self _writeLinkElement:element withPasteboardTypes:types toPasteboard:pasteboard];
     } else if ([[element objectForKey:WebElementIsSelectedKey] boolValue]) {
index 646942052327c3d52402ed7f5d00297e24e851a4..1cca8ac98ea3b924d944f3a1efb0a01ca0b40007 100644 (file)
@@ -82,7 +82,7 @@
 - (BOOL)_isPerformingProgrammaticFocus;
 - (void)_mouseDidMoveOverElement:(NSDictionary *)dictionary modifierFlags:(WebNSUInt)modifierFlags;
 - (WebView *)_openNewWindowWithRequest:(NSURLRequest *)request;
-- (void)_writeImageElement:(NSDictionary *)element withPasteboardTypes:(NSArray *)types toPasteboard:(NSPasteboard *)pasteboard;
+- (void)_writeImageForElement:(NSDictionary *)element withPasteboardTypes:(NSArray *)types toPasteboard:(NSPasteboard *)pasteboard;
 - (void)_writeLinkElement:(NSDictionary *)element withPasteboardTypes:(NSArray *)types toPasteboard:(NSPasteboard *)pasteboard;
 - (void)_progressCompleted:(WebFrame *)frame;
 - (void)_didCommitLoadForFrame:(WebFrame *)frame;