Changeset 50507 in webkit

Timestamp:

Nov 4, 2009 2:19:39 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-04 Martin Robinson <​martin.james.robinson@gmail.com>

Reviewed by Jan Alonzo.

[GTK] Enable DOM clipboard and drag-and-drop access
​https://bugs.webkit.org/show_bug.cgi?id=30623

Unify redudant methods which will always return the same value.

• platform/gtk/PasteboardGtk.cpp: (WebCore::Pasteboard::writeSelection):
• platform/gtk/PasteboardHelper.h:

2009-11-04 Martin Robinson <​martin.james.robinson@gmail.com>

Reviewed by Jan Alonzo.

[GTK] Enable DOM clipboard and drag-and-drop access
​https://bugs.webkit.org/show_bug.cgi?id=30623

Move handling of target list to PasteboardHelperGtk.

• WebCoreSupport/PasteboardHelperGtk.cpp: (WebKit::PasteboardHelperGtk::PasteboardHelperGtk): (WebKit::PasteboardHelperGtk::~PasteboardHelperGtk): (WebKit::PasteboardHelperGtk::fullTargetList):
• WebCoreSupport/PasteboardHelperGtk.h:
• webkit/webkitprivate.cpp: (WebKit::pasteboardHelperInstance): (webkit_init):
• webkit/webkitprivate.h:
• webkit/webkitwebview.cpp: (webkit_web_view_dispose): (webkit_web_view_init): (webkit_web_view_get_copy_target_list): (webkit_web_view_get_paste_target_list):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/PasteboardGtk.cpp (modified) (1 diff)
• WebCore/platform/gtk/PasteboardHelper.h (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp (modified) (2 diffs)
• WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h (modified) (1 diff)
• WebKit/gtk/webkit/webkitprivate.cpp (modified) (2 diffs)
• WebKit/gtk/webkit/webkitprivate.h (modified) (3 diffs)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-04  Martin Robinson  <martin.james.robinson@gmail.com>
+
+        Reviewed by Jan Alonzo.
+
+        [GTK] Enable DOM clipboard and drag-and-drop access
+        https://bugs.webkit.org/show_bug.cgi?id=30623
+
+        Unify redudant methods which will always return the same value.
+
+        * platform/gtk/PasteboardGtk.cpp:
+        (WebCore::Pasteboard::writeSelection):
+        * platform/gtk/PasteboardHelper.h:
+
 2009-11-04  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
 

trunk/WebCore/platform/gtk/PasteboardGtk.cpp

@@ -103 +103 @@
 
     gint n_targets;
-    GtkTargetEntry* targets = gtk_target_table_new_from_list(m_helper->getCopyTargetList(frame), &n_targets);
+    GtkTargetEntry* targets = gtk_target_table_new_from_list(m_helper->targetList(), &n_targets);
     gtk_clipboard_set_with_data(clipboard, targets, n_targets,
                                 clipboard_get_contents_cb, clipboard_clear_contents_cb, data);

trunk/WebCore/platform/gtk/PasteboardHelper.h

@@ -42 +42 @@
     virtual GtkClipboard* getClipboard(Frame*) const = 0;
     virtual GtkClipboard* getPrimary(Frame*) const = 0;
-    virtual GtkTargetList* getCopyTargetList(Frame*) const = 0;
-    virtual GtkTargetList* getPasteTargetList(Frame*) const = 0;
+    virtual GtkTargetList* targetList() const = 0;
     virtual gint getWebViewTargetInfoHtml() const = 0;
 };

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-11-04  Martin Robinson  <martin.james.robinson@gmail.com>
+
+        Reviewed by Jan Alonzo.
+
+        [GTK] Enable DOM clipboard and drag-and-drop access
+        https://bugs.webkit.org/show_bug.cgi?id=30623
+
+        Move handling of target list to PasteboardHelperGtk.
+
+        * WebCoreSupport/PasteboardHelperGtk.cpp:
+        (WebKit::PasteboardHelperGtk::PasteboardHelperGtk):
+        (WebKit::PasteboardHelperGtk::~PasteboardHelperGtk):
+        (WebKit::PasteboardHelperGtk::fullTargetList):
+        * WebCoreSupport/PasteboardHelperGtk.h:
+        * webkit/webkitprivate.cpp:
+        (WebKit::pasteboardHelperInstance):
+        (webkit_init):
+        * webkit/webkitprivate.h:
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_dispose):
+        (webkit_web_view_init):
+        (webkit_web_view_get_copy_target_list):
+        (webkit_web_view_get_paste_target_list):
+
 2009-10-30  Evan Stade  <estade@chromium.org>
 

trunk/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp

@@ -32 +32 @@
 namespace WebKit {
 
+static GdkAtom gdkMarkupAtom = gdk_atom_intern("text/html", FALSE);
+
+PasteboardHelperGtk::PasteboardHelperGtk()
+    : m_targetList(gtk_target_list_new(0, 0))
+{
+    gtk_target_list_add_text_targets(m_targetList, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT);
+    gtk_target_list_add(m_targetList, gdkMarkupAtom, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);
+}
+
+PasteboardHelperGtk::~PasteboardHelperGtk()
+{
+    gtk_target_list_unref(m_targetList);
+}
+
 GtkClipboard* PasteboardHelperGtk::getCurrentTarget(Frame* frame) const
 {
@@ -56 +70 @@
 }
 
-GtkTargetList* PasteboardHelperGtk::getCopyTargetList(Frame* frame) const
+GtkTargetList* PasteboardHelperGtk::targetList() const
 {
-    WebKitWebView* webView = webkit_web_frame_get_web_view(kit(frame));
-    return webkit_web_view_get_copy_target_list(webView);
-}
-
-GtkTargetList* PasteboardHelperGtk::getPasteTargetList(Frame* frame) const
-{
-    WebKitWebView* webView = webkit_web_frame_get_web_view(kit(frame));
-    return webkit_web_view_get_paste_target_list(webView);
+    return m_targetList;
 }
 

trunk/WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h

@@ -40 +40 @@
 class PasteboardHelperGtk : public PasteboardHelper {
 public:
-    PasteboardHelperGtk() { }
+    PasteboardHelperGtk();
+    ~PasteboardHelperGtk();
     virtual GtkClipboard* getCurrentTarget(Frame*) const;
     virtual GtkClipboard* getClipboard(Frame*) const;
     virtual GtkClipboard* getPrimary(Frame*) const;
-    virtual GtkTargetList* getCopyTargetList(Frame*) const;
-    virtual GtkTargetList* getPasteTargetList(Frame*) const;
+    virtual GtkTargetList* targetList() const;
     virtual gint getWebViewTargetInfoHtml() const;
+
+private:
+    GtkTargetList* m_targetList;
 };
 

trunk/WebKit/gtk/webkit/webkitprivate.cpp

@@ -154 +154 @@
 }
 
+PasteboardHelperGtk* pasteboardHelperInstance()
+{
+    static PasteboardHelperGtk* helper = new PasteboardHelperGtk();
+    return helper;
+}
+
 } /** end namespace WebKit */
 
@@ -238 +244 @@
     PageGroup::setShouldTrackVisitedLinks(true);
 
-    Pasteboard::generalPasteboard()->setHelper(new WebKit::PasteboardHelperGtk());
+    Pasteboard::generalPasteboard()->setHelper(WebKit::pasteboardHelperInstance());
 
     SoupSession* session = webkit_get_default_session();

trunk/WebKit/gtk/webkit/webkitprivate.h

@@ -71 +71 @@
 
     class DocumentLoader;
+    class PasteboardHelperGtk;
 
     WebKitWebView* getViewFromFrame(WebKitWebFrame*);
@@ -98 +99 @@
 
     WebKitHitTestResult* kit(const WebCore::HitTestResult&);
+
+    WebKit::PasteboardHelperGtk* pasteboardHelperInstance();
 }
 
@@ -130 +133 @@
         GtkIMContext* imContext;
 
-        GtkTargetList* copy_target_list;
-        GtkTargetList* paste_target_list;
-
         gboolean transparent;
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -64 +64 @@
 #include "FrameView.h"
 #include "MouseEventWithHitTestResults.h"
+#include "Pasteboard.h"
 #include "PasteboardHelper.h"
+#include "PasteboardHelperGtk.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformWheelEvent.h"
@@ -1002 +1004 @@
         g_object_unref(priv->imContext);
         priv->imContext = NULL;
-
-        gtk_target_list_unref(priv->copy_target_list);
-        priv->copy_target_list = NULL;
-
-        gtk_target_list_unref(priv->paste_target_list);
-        priv->paste_target_list = NULL;
     }
 
@@ -2573 +2569 @@
     priv->zoomFullContent = FALSE;
 
-    GdkAtom textHtml = gdk_atom_intern_static_string("text/html");
-    /* Targets for copy */
-    priv->copy_target_list = gtk_target_list_new(NULL, 0);
-    gtk_target_list_add(priv->copy_target_list, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);
-    gtk_target_list_add_text_targets(priv->copy_target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT);
-
-    /* Targets for pasting */
-    priv->paste_target_list = gtk_target_list_new(NULL, 0);
-    gtk_target_list_add(priv->paste_target_list, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);
-    gtk_target_list_add_text_targets(priv->paste_target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT);
-
     priv->webSettings = webkit_web_settings_new();
     webkit_web_view_update_settings(webView);
@@ -3387 +3372 @@
 GtkTargetList* webkit_web_view_get_copy_target_list(WebKitWebView* webView)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
-
-    WebKitWebViewPrivate* priv = webView->priv;
-    return priv->copy_target_list;
+    return pasteboardHelperInstance()->targetList();
 }
 
@@ -3407 +3389 @@
 GtkTargetList* webkit_web_view_get_paste_target_list(WebKitWebView* webView)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
-
-    WebKitWebViewPrivate* priv = webView->priv;
-    return priv->paste_target_list;
+    return pasteboardHelperInstance()->targetList();
 }