<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161826] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161826">161826</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-01-12 12:38:52 -0800 (Sun, 12 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stub out some DragImage functions for iOS.
* WebCore.xcodeproj/project.pbxproj:
* platform/ios/DragImageIOS.mm: Added.
(WebCore::dragImageSize):
(WebCore::scaleDragImage):
(WebCore::createDragImageFromImage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformiosDragImageIOSmm">trunk/Source/WebCore/platform/ios/DragImageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161825 => 161826)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-01-12 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ 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 <simon.fraser@apple.com>
+
</ins><span class="cx"> We need DragImage.cpp code even when ENABLE_DRAG_SUPPORT is
</span><span class="cx"> not defined, because these are actually generic snapshotting
</span><span class="cx"> functions.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161825 => 161826)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -530,6 +530,7 @@
</span><span class="cx"> 0FDA7C1E188322FC00C954B5 /* JSGestureEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C1C188322FC00C954B5 /* JSGestureEvent.cpp */; };
</span><span class="cx"> 0FDA7C1F188322FC00C954B5 /* JSGestureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDA7C1D188322FC00C954B5 /* JSGestureEvent.h */; };
</span><span class="cx"> 0FDA7C2118832BCC00C954B5 /* DateTimeFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C2018832BCC00C954B5 /* DateTimeFormat.cpp */; };
</span><ins>+ 0FDA7C23188330A900C954B5 /* DragImageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */; };
</ins><span class="cx"> 0FE71405142170B800DB33BA /* ScrollbarThemeMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FE71403142170B800DB33BA /* ScrollbarThemeMock.cpp */; };
</span><span class="cx"> 0FE71406142170B800DB33BA /* ScrollbarThemeMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FE71404142170B800DB33BA /* ScrollbarThemeMock.h */; };
</span><span class="cx"> 0FF5025B102BA9010066F39A /* DOMStyleMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FF50259102BA9010066F39A /* DOMStyleMedia.h */; };
</span><span class="lines">@@ -7316,6 +7317,7 @@
</span><span class="cx"> 0FDA7C1C188322FC00C954B5 /* JSGestureEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGestureEvent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FDA7C1D188322FC00C954B5 /* JSGestureEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGestureEvent.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FDA7C2018832BCC00C954B5 /* DateTimeFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateTimeFormat.cpp; sourceTree = "<group>"; };
</span><ins>+ 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DragImageIOS.mm; path = ios/DragImageIOS.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 0FE71403142170B800DB33BA /* ScrollbarThemeMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollbarThemeMock.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FE71404142170B800DB33BA /* ScrollbarThemeMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollbarThemeMock.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FE71415142189FC00DB33BA /* ScrollbarTheme.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollbarTheme.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -18003,6 +18005,7 @@
</span><span class="cx"> 31EAF97D121435A400E7C1BF /* DeviceMotionClientIOS.mm */,
</span><span class="cx"> 31403799124BEA7F00AF40E4 /* DeviceOrientationClientIOS.h */,
</span><span class="cx"> 3140379A124BEA7F00AF40E4 /* DeviceOrientationClientIOS.mm */,
</span><ins>+ 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */,
</ins><span class="cx"> 26F40D4914904A6300CA67C4 /* EventLoopIOS.mm */,
</span><span class="cx"> 26C17A3C1491D2D400D12BA2 /* FileSystemIOS.h */,
</span><span class="cx"> 26C17A3D1491D2D400D12BA2 /* FileSystemIOS.mm */,
</span><span class="lines">@@ -28026,6 +28029,7 @@
</span><span class="cx"> B2FA3DC20AB75A6F000E5AC4 /* JSSVGPathSegCurvetoCubicSmoothAbs.cpp in Sources */,
</span><span class="cx"> B2FA3DC40AB75A6F000E5AC4 /* JSSVGPathSegCurvetoCubicSmoothRel.cpp in Sources */,
</span><span class="cx"> E4B65A5E132FADB60070E7BE /* TileLayer.mm in Sources */,
</span><ins>+ 0FDA7C23188330A900C954B5 /* DragImageIOS.mm in Sources */,
</ins><span class="cx"> B2FA3DC60AB75A6F000E5AC4 /* JSSVGPathSegCurvetoQuadraticAbs.cpp in Sources */,
</span><span class="cx"> B2FA3DC80AB75A6F000E5AC4 /* JSSVGPathSegCurvetoQuadraticRel.cpp in Sources */,
</span><span class="cx"> B2FA3DCA0AB75A6F000E5AC4 /* JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosDragImageIOSmm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/ios/DragImageIOS.mm (0 => 161826)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * 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
</ins></span></pre>
</div>
</div>
</body>
</html>