Add an identity (id) to system drag & drop.

webkit/glue/webview_impl.cc

 /*
 * Copyright 2007 Google Inc. All Rights Reserved.
 *
 * Portions Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
 *
 * ***** BEGIN LICENSE BLOCK *****
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
@@ skipping 316 matching lines @@
       observed_new_navigation_(false),
 #ifndef NDEBUG
       new_navigation_loader_(NULL),
 #endif
       zoom_level_(0),
       context_menu_allowed_(false),
       doing_drag_and_drop_(false),
       suppress_next_keypress_event_(false),
       window_open_disposition_(IGNORE_ACTION),
       ime_accept_events_(true),
+      drag_target_dispatch_(false),
+      drag_identity_(0),
       autocomplete_popup_showing_(false) {
   // WebKit/win/WebView.cpp does the same thing, except they call the
   // KJS specific wrapper around this method. We need to have threading
   // initialized because CollatorICU requires it.
   WTF::initializeThreading();
 
   // set to impossible point so we always get the first mouse pos
   last_mouse_position_.SetPoint(-1, -1);
 
   // the page will take ownership of the various clients
@@ skipping 1118 matching lines @@
   page_->dragController()->dragEnded();
   DCHECK(doing_drag_and_drop_);
   doing_drag_and_drop_ = false;
 }
 
 bool WebViewImpl::DragTargetDragEnter(const WebDropData& drop_data,
     int client_x, int client_y, int screen_x, int screen_y) {
   DCHECK(!current_drop_data_.get());
 
   current_drop_data_ = webkit_glue::WebDropDataToChromiumDataObject(drop_data);
+  drag_identity_ = drop_data.identity;
 
   DragData drag_data(current_drop_data_.get(), IntPoint(client_x, client_y),
       IntPoint(screen_x, screen_y), kDropTargetOperation);
+  drag_target_dispatch_ = true;
   DragOperation effect = page_->dragController()->dragEntered(&drag_data);
+  drag_target_dispatch_ = false;
+
   return effect != DragOperationNone;
 }
 
 bool WebViewImpl::DragTargetDragOver(
     int client_x, int client_y, int screen_x, int screen_y) {
   DCHECK(current_drop_data_.get());
+
   DragData drag_data(current_drop_data_.get(), IntPoint(client_x, client_y),
       IntPoint(screen_x, screen_y), kDropTargetOperation);
+  drag_target_dispatch_ = true;
   DragOperation effect = page_->dragController()->dragUpdated(&drag_data);
+  drag_target_dispatch_ = false;
+
   return effect != DragOperationNone;
 }
 
 void WebViewImpl::DragTargetDragLeave() {
   DCHECK(current_drop_data_.get());
+
   DragData drag_data(current_drop_data_.get(), IntPoint(), IntPoint(),
                      DragOperationNone);
+  drag_target_dispatch_ = true;
   page_->dragController()->dragExited(&drag_data);
+  drag_target_dispatch_ = false;
+
   current_drop_data_ = NULL;
+  drag_identity_ = 0;
 }
 
 void WebViewImpl::DragTargetDrop(
     int client_x, int client_y, int screen_x, int screen_y) {
   DCHECK(current_drop_data_.get());
+
   DragData drag_data(current_drop_data_.get(), IntPoint(client_x, client_y),
       IntPoint(screen_x, screen_y), kDropTargetOperation);
+  drag_target_dispatch_ = true;
   page_->dragController()->performDrag(&drag_data);
+  drag_target_dispatch_ = false;
+
   current_drop_data_ = NULL;
+  drag_identity_ = 0;
+}
+
+int32 WebViewImpl::GetDragIdentity() {
+  if (drag_target_dispatch_)
+    return drag_identity_;
+  return 0;
 }
 
 SearchableFormData* WebViewImpl::CreateSearchableFormDataForFocusedNode() {
   if (!page_.get())
     return NULL;
 
   if (RefPtr<Frame> focused = page_->focusController()->focusedFrame()) {
     RefPtr<Document> document = focused->document();
     if (document.get()) {
       RefPtr<Node> focused_node = document->focusedNode();
@@ skipping 177 matching lines @@
   Frame* frame = page_->focusController()->focusedFrame();
   if (!frame)
     return NULL;
 
   Document* document = frame->document();
   if (!document)
     return NULL;
 
   return document->focusedNode();
 }