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

[trey]

The following commit has been merged in the debian/unstable branch:
commit 48f18dd07b8c24242335737eb04f8253fcf2ee9f
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 29 23:37:57 2004 +0000

    	DHTML dragging - source should have access to the operation chosen
    	by the destination.
    
            Reviewed by John
    
            * kwq/KWQKHTMLPart.h:
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::dragSourceEndedAt):  Set the destination's operation
    	on the clipboard.
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge dragExitedWithDraggingInfo:]):  For completeness
    	we set the source op for the ondragexit event.
            (-[WebCoreBridge concludeDragForDraggingInfo:]):  Ditto for the
    	drop event.
            (-[WebCoreBridge dragSourceEndedAt:operation:]):  Pass through of operation.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6952 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b771fc8..a3b252f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2004-06-29  Trey Matteson  <trey at apple.com>
+
+	DHTML dragging - source should have access to the operation chosen
+	by the destination.
+
+        Reviewed by John
+
+        * kwq/KWQKHTMLPart.h:
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::dragSourceEndedAt):  Set the destination's operation
+	on the clipboard.
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge dragExitedWithDraggingInfo:]):  For completeness
+	we set the source op for the ondragexit event.
+        (-[WebCoreBridge concludeDragForDraggingInfo:]):  Ditto for the
+	drop event.
+        (-[WebCoreBridge dragSourceEndedAt:operation:]):  Pass through of operation.
+
 2004-06-24  Trey Matteson  <trey at apple.com>
 
 	3710422 - REGRESSION: Safari crashes trying to send onbeforecut event at about://blank
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 19fd117..8aed333 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -233,7 +233,7 @@ public:
     bool lastEventIsMouseUp();
 
     void dragSourceMovedTo(const QPoint &loc);
-    void dragSourceEndedAt(const QPoint &loc);
+    void dragSourceEndedAt(const QPoint &loc, NSDragOperation operation);
 
     bool mayCut();
     bool mayCopy();
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 593d9b8..db2aa45 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -2086,9 +2086,10 @@ void KWQKHTMLPart::dragSourceMovedTo(const QPoint &loc)
     }
 }
 
-void KWQKHTMLPart::dragSourceEndedAt(const QPoint &loc)
+void KWQKHTMLPart::dragSourceEndedAt(const QPoint &loc, NSDragOperation operation)
 {
     if (!_dragSrc.isNull() && _dragSrcMayBeDHTML) {
+        _dragClipboard->setDestinationOperation(operation);
         // for now we don't care if event handler cancels default behavior, since there is none
         dispatchDragSrcEvent(EventImpl::DRAGEND_EVENT, loc);
     }
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 75d5540..d136629 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -1626,6 +1626,7 @@ static HTMLFormElementImpl *formElementFromDOMElement(DOMElement *element)
             KWQClipboard::AccessPolicy policy = _part->baseURL().isLocalFile() ? KWQClipboard::Readable : KWQClipboard::TypesReadable;
             KWQClipboard *clipboard = new KWQClipboard(true, [info draggingPasteboard], policy);
             clipboard->ref();
+            clipboard->setSourceOperation([info draggingSourceOperationMask]);
             
             v->cancelDragAndDrop(QPoint([info draggingLocation]), clipboard);
             clipboard->setAccessPolicy(KWQClipboard::Numb);    // invalidate clipboard here for security
@@ -1646,6 +1647,7 @@ static HTMLFormElementImpl *formElementFromDOMElement(DOMElement *element)
 
             KWQClipboard *clipboard = new KWQClipboard(true, [info draggingPasteboard], KWQClipboard::Readable);
             clipboard->ref();
+            clipboard->setSourceOperation([info draggingSourceOperationMask]);
 
             BOOL result = v->performDragAndDrop(QPoint([info draggingLocation]), clipboard);
             clipboard->setAccessPolicy(KWQClipboard::Numb);    // invalidate clipboard here for security
@@ -1669,8 +1671,7 @@ static HTMLFormElementImpl *formElementFromDOMElement(DOMElement *element)
 - (void)dragSourceEndedAt:(NSPoint)windowLoc operation:(NSDragOperation)operation
 {
     if (_part) {
-        // FIXME must handle operation
-        _part->dragSourceEndedAt(QPoint(windowLoc));
+        _part->dragSourceEndedAt(QPoint(windowLoc), operation);
     }
 }
 

-- 
WebKit Debian packaging