Diff
Modified: trunk/Source/WebCore/ChangeLog (161825 => 161826)
--- trunk/Source/WebCore/ChangeLog 2014-01-12 20:12:30 UTC (rev 161825)
+++ trunk/Source/WebCore/ChangeLog 2014-01-12 20:38:52 UTC (rev 161826)
@@ -1,5 +1,15 @@
2014-01-12 Simon Fraser <[email protected]>
+ Stub out some DragImage functions for iOS.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/ios/DragImageIOS.mm: Added.
+ (WebCore::dragImageSize):
+ (WebCore::scaleDragImage):
+ (WebCore::createDragImageFromImage):
+
+2014-01-12 Simon Fraser <[email protected]>
+
We need DragImage.cpp code even when ENABLE_DRAG_SUPPORT is
not defined, because these are actually generic snapshotting
functions.
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161825 => 161826)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-12 20:12:30 UTC (rev 161825)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-12 20:38:52 UTC (rev 161826)
@@ -530,6 +530,7 @@
0FDA7C1E188322FC00C954B5 /* JSGestureEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C1C188322FC00C954B5 /* JSGestureEvent.cpp */; };
0FDA7C1F188322FC00C954B5 /* JSGestureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDA7C1D188322FC00C954B5 /* JSGestureEvent.h */; };
0FDA7C2118832BCC00C954B5 /* DateTimeFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C2018832BCC00C954B5 /* DateTimeFormat.cpp */; };
+ 0FDA7C23188330A900C954B5 /* DragImageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */; };
0FE71405142170B800DB33BA /* ScrollbarThemeMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FE71403142170B800DB33BA /* ScrollbarThemeMock.cpp */; };
0FE71406142170B800DB33BA /* ScrollbarThemeMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FE71404142170B800DB33BA /* ScrollbarThemeMock.h */; };
0FF5025B102BA9010066F39A /* DOMStyleMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FF50259102BA9010066F39A /* DOMStyleMedia.h */; };
@@ -7316,6 +7317,7 @@
0FDA7C1C188322FC00C954B5 /* JSGestureEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGestureEvent.cpp; sourceTree = "<group>"; };
0FDA7C1D188322FC00C954B5 /* JSGestureEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGestureEvent.h; sourceTree = "<group>"; };
0FDA7C2018832BCC00C954B5 /* DateTimeFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateTimeFormat.cpp; sourceTree = "<group>"; };
+ 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DragImageIOS.mm; path = ios/DragImageIOS.mm; sourceTree = "<group>"; };
0FE71403142170B800DB33BA /* ScrollbarThemeMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollbarThemeMock.cpp; sourceTree = "<group>"; };
0FE71404142170B800DB33BA /* ScrollbarThemeMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollbarThemeMock.h; sourceTree = "<group>"; };
0FE71415142189FC00DB33BA /* ScrollbarTheme.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollbarTheme.cpp; sourceTree = "<group>"; };
@@ -18003,6 +18005,7 @@
31EAF97D121435A400E7C1BF /* DeviceMotionClientIOS.mm */,
31403799124BEA7F00AF40E4 /* DeviceOrientationClientIOS.h */,
3140379A124BEA7F00AF40E4 /* DeviceOrientationClientIOS.mm */,
+ 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */,
26F40D4914904A6300CA67C4 /* EventLoopIOS.mm */,
26C17A3C1491D2D400D12BA2 /* FileSystemIOS.h */,
26C17A3D1491D2D400D12BA2 /* FileSystemIOS.mm */,
@@ -28026,6 +28029,7 @@
B2FA3DC20AB75A6F000E5AC4 /* JSSVGPathSegCurvetoCubicSmoothAbs.cpp in Sources */,
B2FA3DC40AB75A6F000E5AC4 /* JSSVGPathSegCurvetoCubicSmoothRel.cpp in Sources */,
E4B65A5E132FADB60070E7BE /* TileLayer.mm in Sources */,
+ 0FDA7C23188330A900C954B5 /* DragImageIOS.mm in Sources */,
B2FA3DC60AB75A6F000E5AC4 /* JSSVGPathSegCurvetoQuadraticAbs.cpp in Sources */,
B2FA3DC80AB75A6F000E5AC4 /* JSSVGPathSegCurvetoQuadraticRel.cpp in Sources */,
B2FA3DCA0AB75A6F000E5AC4 /* JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp in Sources */,
Added: trunk/Source/WebCore/platform/ios/DragImageIOS.mm (0 => 161826)
--- trunk/Source/WebCore/platform/ios/DragImageIOS.mm (rev 0)
+++ trunk/Source/WebCore/platform/ios/DragImageIOS.mm 2014-01-12 20:38:52 UTC (rev 161826)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * 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 COMPUTER, 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 COMPUTER, 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.
+ */
+
+#import "config.h"
+#import "DragImage.h"
+
+#import <CoreGraphics/CoreGraphics.h>
+
+namespace WebCore {
+
+// FIXME: fix signature of dragImageSize() to avoid copying the argument.
+IntSize dragImageSize(RetainPtr<CGImageRef> image)
+{
+ return IntSize(CGImageGetWidth(image.get()), CGImageGetHeight(image.get()));
+ }
+
+RetainPtr<CGImageRef> scaleDragImage(RetainPtr<CGImageRef>, FloatSize)
+{
+ // FIXME: implement for iOS: https://bugs.webkit.org/show_bug.cgi?id=126849
+ return nullptr;
+}
+
+RetainPtr<CGImageRef> createDragImageFromImage(Image*, ImageOrientationDescription)
+{
+ // FIXME: implement for iOS: https://bugs.webkit.org/show_bug.cgi?id=126849
+ return nullptr;
+}
+
+} // namespace WebCore
