DragImage should have a complete default implementation
authorross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Nov 2018 20:23:54 +0000 (20:23 +0000)
committerross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Nov 2018 20:23:54 +0000 (20:23 +0000)
https://bugs.webkit.org/show_bug.cgi?id=191666

Reviewed by Dean Jackson.

Move WPE's stub implementation down into the base implementation file.

* SourcesWPE.txt:
* platform/DragImage.cpp:
(WebCore::dragImageSize):
(WebCore::deleteDragImage):
(WebCore::scaleDragImage):
(WebCore::dissolveDragImageToFraction):
(WebCore::createDragImageFromImage):
(WebCore::createDragImageIconForCachedImageFilename):
(WebCore::createDragImageForLink):
* platform/wpe/DragImageWPE.cpp: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238239 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/SourcesWPE.txt
Source/WebCore/platform/DragImage.cpp
Source/WebCore/platform/wpe/DragImageWPE.cpp [deleted file]

index 40ffaba..0f66737 100644 (file)
@@ -1,3 +1,23 @@
+2018-11-15  Ross Kirsling  <ross.kirsling@sony.com>
+
+        DragImage should have a complete default implementation
+        https://bugs.webkit.org/show_bug.cgi?id=191666
+
+        Reviewed by Dean Jackson.
+
+        Move WPE's stub implementation down into the base implementation file.
+
+        * SourcesWPE.txt:
+        * platform/DragImage.cpp:
+        (WebCore::dragImageSize):
+        (WebCore::deleteDragImage):
+        (WebCore::scaleDragImage):
+        (WebCore::dissolveDragImageToFraction):
+        (WebCore::createDragImageFromImage):
+        (WebCore::createDragImageIconForCachedImageFilename):
+        (WebCore::createDragImageForLink):
+        * platform/wpe/DragImageWPE.cpp: Removed.
+
 2018-11-15  Jiewen Tan  <jiewen_tan@apple.com>
 
         [WebAuthN] UserHandle can be null
index 5e8502f..0c790ae 100644 (file)
@@ -70,7 +70,6 @@ platform/text/LocaleICU.cpp
 platform/unix/LoggingUnix.cpp
 
 platform/wpe/CursorWPE.cpp
-platform/wpe/DragImageWPE.cpp
 platform/wpe/LocalizedStringsWPE.cpp
 platform/wpe/PasteboardWPE.cpp
 platform/wpe/PlatformKeyboardEventWPE.cpp
index c3eac72..27b7216 100644 (file)
@@ -30,6 +30,7 @@
 #include "FrameSnapshotting.h"
 #include "FrameView.h"
 #include "ImageBuffer.h"
+#include "NotImplemented.h"
 #include "Range.h"
 #include "RenderElement.h"
 #include "RenderObject.h"
@@ -228,13 +229,6 @@ DragImageRef platformAdjustDragImageForDeviceScaleFactor(DragImageRef image, flo
 }
 #endif
 
-#if !PLATFORM(COCOA) && !PLATFORM(WIN)
-DragImageRef createDragImageForLink(Element&, URL&, const String&, FontRenderingMode, float)
-{
-    return nullptr;
-}
-#endif
-
 #if !PLATFORM(MAC)
 const int linkDragBorderInset = 2;
 
@@ -286,5 +280,50 @@ DragImage::~DragImage()
         deleteDragImage(m_dragImageRef);
 }
 
+#if !PLATFORM(COCOA) && !PLATFORM(GTK) && !PLATFORM(WIN)
+
+IntSize dragImageSize(DragImageRef)
+{
+    notImplemented();
+    return { 0, 0 };
+}
+
+void deleteDragImage(DragImageRef)
+{
+    notImplemented();
+}
+
+DragImageRef scaleDragImage(DragImageRef, FloatSize)
+{
+    notImplemented();
+    return nullptr;
+}
+
+DragImageRef dissolveDragImageToFraction(DragImageRef, float)
+{
+    notImplemented();
+    return nullptr;
+}
+
+DragImageRef createDragImageFromImage(Image*, ImageOrientationDescription)
+{
+    notImplemented();
+    return nullptr;
+}
+
+DragImageRef createDragImageIconForCachedImageFilename(const String&)
+{
+    notImplemented();
+    return nullptr;
+}
+
+DragImageRef createDragImageForLink(Element&, URL&, const String&, TextIndicatorData&, FontRenderingMode, float)
+{
+    notImplemented();
+    return nullptr;
+}
+
+#endif
+
 } // namespace WebCore
 
diff --git a/Source/WebCore/platform/wpe/DragImageWPE.cpp b/Source/WebCore/platform/wpe/DragImageWPE.cpp
deleted file mode 100644 (file)
index 9bd10f0..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-#include "DragImage.h"
-
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-IntSize dragImageSize(DragImageRef)
-{
-    return { 0, 0 };
-}
-
-void deleteDragImage(DragImageRef)
-{
-}
-
-DragImageRef scaleDragImage(DragImageRef, FloatSize)
-{
-    return nullptr;
-}
-
-DragImageRef dissolveDragImageToFraction(DragImageRef, float)
-{
-    return nullptr;
-}
-
-DragImageRef createDragImageFromImage(Image*, ImageOrientationDescription)
-{
-    notImplemented();
-    return nullptr;
-}
-
-DragImageRef createDragImageIconForCachedImageFilename(const String&)
-{
-    notImplemented();
-    return nullptr;
-}
-
-DragImageRef createDragImageForLink(Element&, URL&, const String&, TextIndicatorData&, FontRenderingMode, float)
-{
-    notImplemented();
-    return nullptr;
-}
-
-}