Title: [154360] trunk/Source/WebCore
- Revision
- 154360
- Author
- [email protected]
- Date
- 2013-08-20 14:52:54 -0700 (Tue, 20 Aug 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154359 => 154360)
--- trunk/Source/WebCore/ChangeLog 2013-08-20 21:44:42 UTC (rev 154359)
+++ trunk/Source/WebCore/ChangeLog 2013-08-20 21:52:54 UTC (rev 154360)
@@ -1,3 +1,15 @@
+2013-08-20 Daniel Bates <[email protected]>
+
+ <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 <[email protected]>
<https://webkit.org/b/120078> Replace NodeRenderingContext with RenderStyle& as shouldCreateRenderer() argument
Modified: trunk/Source/WebCore/dom/Clipboard.cpp (154359 => 154360)
--- trunk/Source/WebCore/dom/Clipboard.cpp 2013-08-20 21:44:42 UTC (rev 154359)
+++ trunk/Source/WebCore/dom/Clipboard.cpp 2013-08-20 21:52:54 UTC (rev 154360)
@@ -108,11 +108,6 @@
return m_policy == ClipboardWritable;
}
-bool Clipboard::hasData()
-{
- return m_pasteboard->hasData();
-}
-
void Clipboard::clearData(const String& type)
{
if (!canWriteData())
@@ -220,6 +215,11 @@
return adoptRef(new Clipboard(policy, Pasteboard::createForDragAndDrop(dragData), DragAndDrop, dragData.containsFiles()));
}
+bool Clipboard::hasData()
+{
+ return m_pasteboard->hasData();
+}
+
bool Clipboard::canSetDragImage() const
{
// Note that the spec doesn't actually allow drag image modification outside the dragstart
Modified: trunk/Source/WebCore/dom/Clipboard.h (154359 => 154360)
--- trunk/Source/WebCore/dom/Clipboard.h 2013-08-20 21:44:42 UTC (rev 154359)
+++ trunk/Source/WebCore/dom/Clipboard.h 2013-08-20 21:52:54 UTC (rev 154360)
@@ -59,8 +59,6 @@
PassRefPtr<FileList> files() const;
- bool hasData();
-
void clearData(const String& type);
void clearData();
@@ -85,6 +83,8 @@
static PassRefPtr<Clipboard> createForDragAndDrop();
static PassRefPtr<Clipboard> createForDragAndDrop(ClipboardAccessPolicy, const DragData&);
+ bool hasData();
+
bool dropEffectIsUninitialized() const { return m_dropEffect == "uninitialized"; }
DragOperation sourceOperation() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
