Title: [212156] trunk/Source/WebCore
- Revision
- 212156
- Author
- ander...@apple.com
- Date
- 2017-02-10 15:41:35 -0800 (Fri, 10 Feb 2017)
Log Message
Try to fix the iOS and Windows builds.
* platform/ios/DragImageIOS.mm:
(WebCore::deleteDragImage):
* platform/win/PasteboardWin.cpp:
(WebCore::Pasteboard::setDragImage):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (212155 => 212156)
--- trunk/Source/WebCore/ChangeLog 2017-02-10 23:14:39 UTC (rev 212155)
+++ trunk/Source/WebCore/ChangeLog 2017-02-10 23:41:35 UTC (rev 212156)
@@ -1,5 +1,14 @@
2017-02-10 Anders Carlsson <ander...@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 <ander...@apple.com>
+
Add a DragImage class that wraps a DragImageRef
https://bugs.webkit.org/show_bug.cgi?id=168131
Modified: trunk/Source/WebCore/platform/ios/DragImageIOS.mm (212155 => 212156)
--- trunk/Source/WebCore/platform/ios/DragImageIOS.mm 2017-02-10 23:14:39 UTC (rev 212155)
+++ trunk/Source/WebCore/platform/ios/DragImageIOS.mm 2017-02-10 23:41:35 UTC (rev 212156)
@@ -36,6 +36,12 @@
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)
{
Modified: trunk/Source/WebCore/platform/win/PasteboardWin.cpp (212155 => 212156)
--- trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2017-02-10 23:14:39 UTC (rev 212155)
+++ trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2017-02-10 23:41:35 UTC (rev 212156)
@@ -409,7 +409,7 @@
}
#if ENABLE(DRAG_SUPPORT)
-void Pasteboard::setDragImage(DragImageRef, const IntPoint&)
+void Pasteboard::setDragImage(DragImage, const IntPoint&)
{
// Do nothing in Windows.
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
