Changeset 154360 in webkit

Timestamp:

Aug 20, 2013 2:52:54 PM (11 years ago)

Author:

dbates@webkit.org

Message:

<​https://webkit.org/b/120088> Define Clipboard::hasData() only when building with drag support

Reviewed by Darin Adler.

Clipboard::hasData() is specific to drag-and-drop support. We should only define it when
such support is enabled.

• dom/Clipboard.cpp: Move hasData() to DRAG_SUPPORT section of the file.
• dom/Clipboard.h: Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Clipboard.cpp (modified) (2 diffs)
• dom/Clipboard.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-20  Daniel Bates  <dabates@apple.com>
+
+        <https://webkit.org/b/120088> Define Clipboard::hasData() only when building with drag support
+
+        Reviewed by Darin Adler.
+
+        Clipboard::hasData() is specific to drag-and-drop support. We should only define it when
+        such support is enabled.
+
+        * dom/Clipboard.cpp: Move hasData() to DRAG_SUPPORT section of the file.
+        * dom/Clipboard.h: Ditto.
+
 2013-08-20  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/Clipboard.cpp

@@ -109 +109 @@
 }
 
-bool Clipboard::hasData()
-{
-    return m_pasteboard->hasData();
-}
-
 void Clipboard::clearData(const String& type)
 {
@@ -219 +214 @@
 {
     return adoptRef(new Clipboard(policy, Pasteboard::createForDragAndDrop(dragData), DragAndDrop, dragData.containsFiles()));
+}
+
+bool Clipboard::hasData()
+{
+    return m_pasteboard->hasData();
 }
 

trunk/Source/WebCore/dom/Clipboard.h

@@ -60 +60 @@
         PassRefPtr<FileList> files() const;
 
-        bool hasData();
-
         void clearData(const String& type);
         void clearData();
@@ -85 +83 @@
         static PassRefPtr<Clipboard> createForDragAndDrop();
         static PassRefPtr<Clipboard> createForDragAndDrop(ClipboardAccessPolicy, const DragData&);
+
+        bool hasData();
 
         bool dropEffectIsUninitialized() const { return m_dropEffect == "uninitialized"; }