Changeset 54230 in webkit

Timestamp:

Feb 2, 2010 5:32:31 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-02-02 Martin Robinson <​martin.james.robinson@gmail.com>

Reviewed by Gustavo Noronha Silva.

[GTK] When selection changes selections in other WebView are not collapsed
​https://bugs.webkit.org/show_bug.cgi?id=34043

Collapse the selection of a WebView even when the new selection owner is
a new WebView.

• WebCoreSupport/PasteboardHelperGtk.cpp: (WebKit::clearClipboardContentsCallback): Only clear the DataObject we are setting is not the same as the one referenced in this callback. Use the same behavior for collapsing the selection. (WebKit::PasteboardHelperGtk::writeClipboardContents): Instead of recording a boolean record the actual data used while writing to the clipboard.

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/PasteboardHelperGtk.cpp (modified) (4 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-02-02  Martin Robinson  <martin.james.robinson@gmail.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] When selection changes selections in other WebView are not collapsed
+        https://bugs.webkit.org/show_bug.cgi?id=34043
+
+        Collapse the selection of a WebView even when the new selection owner is
+        a new WebView.
+
+        * WebCoreSupport/PasteboardHelperGtk.cpp:
+        (WebKit::clearClipboardContentsCallback): Only clear the DataObject we are setting
+        is not the same as the one referenced in this callback. Use the same behavior for
+        collapsing the selection.
+        (WebKit::PasteboardHelperGtk::writeClipboardContents): Instead of recording a boolean
+        record the actual data used while writing to the clipboard.
+
 2010-01-27  Martin Robinson  <mrobinson@webkit.org>
 

trunk/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp

@@ -106 +106 @@
 }
 
-static bool settingClipboard = false;
+static DataObjectGtk* settingClipboardDataObject = 0;
+static gpointer settingClipboardData = 0;
 static void getClipboardContentsCallback(GtkClipboard* clipboard, GtkSelectionData *selectionData, guint info, gpointer data)
 {
@@ -116 +117 @@
 static void clearClipboardContentsCallback(GtkClipboard* clipboard, gpointer data)
 {
-    // GTK will call the clear clipboard callback while setting clipboard data.
-    // We don't actually want to clear the DataObject during that time.
-    if (settingClipboard)
-        return;
-
     DataObjectGtk* dataObject = DataObjectGtk::forClipboard(clipboard);
     ASSERT(dataObject);
-    dataObject->clear();
 
-    // This will be true for clipboards other than X11 primary.
-    if (!data)
+    // Only clear the DataObject for this clipboard if we are not currently setting it.
+    if (dataObject != settingClipboardDataObject)
+        dataObject->clear();
+
+    // Only collapse the selection if this is an X11 primary clipboard
+    // and we aren't currently setting the clipboard for this WebView.
+    if (!data || data == settingClipboardData)
         return;
 
@@ -155 +155 @@
 
     if (numberOfTargets > 0 && table) {
-        settingClipboard = true;
+        settingClipboardDataObject = dataObject;
+        settingClipboardData = data;
 
         // Protect the web view from being destroyed before one of the clipboard callbacks
@@ -169 +170 @@
             g_object_unref(webView);
 
-        settingClipboard = false;
+        settingClipboardDataObject = 0;
+        settingClipboardData = 0;
     } else
         gtk_clipboard_clear(clipboard);