[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit ab05feb59487af9bc9186f26a76efb0e23f62c1e
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 19 17:59:05 2003 +0000

    	Fixed: <rdar://problem/3515255>: Standalone image drag makes ocassionally makes 2 copies
    
            Reviewed by john.
    
    	* WebKit.pbproj/project.pbxproj: Xcode 1.1 file format change
            * WebView.subproj/WebImageView.h:
            * WebView.subproj/WebImageView.m: copied double-drag protection code from WebHTMLView
            (-[WebImageView mouseDown:]): set ignoringMouseDraggedEvents to NO
            (-[WebImageView mouseDragged:]): if ignoringMouseDraggedEvents, return
            (-[WebImageView draggedImage:endedAt:operation:]): set ignoringMouseDraggedEvents to YES
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5834 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f6e8fac..332633e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-12-19  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3515255>: Standalone image drag makes ocassionally makes 2 copies
+
+        Reviewed by john.
+
+	* WebKit.pbproj/project.pbxproj: Xcode 1.1 file format change
+        * WebView.subproj/WebImageView.h:
+        * WebView.subproj/WebImageView.m: copied double-drag protection code from WebHTMLView
+        (-[WebImageView mouseDown:]): set ignoringMouseDraggedEvents to NO
+        (-[WebImageView mouseDragged:]): if ignoringMouseDraggedEvents, return
+        (-[WebImageView draggedImage:endedAt:operation:]): set ignoringMouseDraggedEvents to YES
+
 === Safari-119 ===
 
 2003-12-18  Richard Williamson   <rjw at apple.com>
diff --git a/WebKit/WebView.subproj/WebImageView.h b/WebKit/WebView.subproj/WebImageView.h
index 2ae5f7c..f342599 100644
--- a/WebKit/WebView.subproj/WebImageView.h
+++ b/WebKit/WebView.subproj/WebImageView.h
@@ -13,6 +13,7 @@
 {
     WebImageRepresentation *rep;
     BOOL needsLayout;
+    BOOL ignoringMouseDraggedEvents;
 }
 + (NSArray *)supportedImageMIMETypes;
 @end
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index 1e6298a..b2171cf 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -226,9 +226,15 @@
     return [webView _menuForElement:element];
 }
 
+- (void)mouseDown:(NSEvent *)event
+{
+    ignoringMouseDraggedEvents = NO;
+    [super mouseDown:event];
+}
+
 - (void)mouseDragged:(NSEvent *)event
 {
-    if (![self haveCompleteImage]) {
+    if (ignoringMouseDraggedEvents || ![self haveCompleteImage]) {
         return;
     }
     
@@ -257,6 +263,9 @@
 
 - (void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation
 {
+    // Prevent queued mouseDragged events from coming after the drag which can cause a double drag.
+    ignoringMouseDraggedEvents = YES;
+    
     // Reregister for drag types because they were unregistered before the drag.
     [[[self _web_parentWebFrameView] _webView] _registerDraggedTypes];
 

-- 
WebKit Debian packaging