Try to fix the iOS and Windows builds.
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Feb 2017 23:41:35 +0000 (23:41 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Feb 2017 23:41:35 +0000 (23:41 +0000)
* platform/ios/DragImageIOS.mm:
(WebCore::deleteDragImage):
* platform/win/PasteboardWin.cpp:
(WebCore::Pasteboard::setDragImage):

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

Source/WebCore/ChangeLog
Source/WebCore/platform/ios/DragImageIOS.mm
Source/WebCore/platform/win/PasteboardWin.cpp

index 0a43485..476bbe7 100644 (file)
@@ -1,5 +1,14 @@
 2017-02-10  Anders Carlsson  <andersca@apple.com>
 
+        Try to fix the iOS and Windows builds.
+
+        * platform/ios/DragImageIOS.mm:
+        (WebCore::deleteDragImage):
+        * platform/win/PasteboardWin.cpp:
+        (WebCore::Pasteboard::setDragImage):
+
+2017-02-10  Anders Carlsson  <andersca@apple.com>
+
         Add a DragImage class that wraps a DragImageRef
         https://bugs.webkit.org/show_bug.cgi?id=168131
 
index 3682a07..22abcab 100644 (file)
 
 namespace WebCore {
 
+void deleteDragImage(RetainPtr<CGImageRef>)
+{
+    // Since this is a RetainPtr, there's nothing additional we need to do to
+    // delete it. It will be released when it falls out of scope.
+}
+
 // FIXME: fix signature of dragImageSize() to avoid copying the argument.
 IntSize dragImageSize(RetainPtr<CGImageRef> image)
 {
index 72fa843..fd34b02 100644 (file)
@@ -409,7 +409,7 @@ void Pasteboard::writeString(const String& type, const String& data)
 }
 
 #if ENABLE(DRAG_SUPPORT)
-void Pasteboard::setDragImage(DragImageRef, const IntPoint&)
+void Pasteboard::setDragImage(DragImage, const IntPoint&)
 {
     // Do nothing in Windows.
 }