<!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>[211384] branches/safari-604.1.5-branch/Source/WebKit/mac</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/211384">211384</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-30 13:02:16 -0800 (Mon, 30 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211323">r211323</a>. rdar://problem/30107776</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari60415branchSourceWebKitmacChangeLog">branches/safari-604.1.5-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari60415branchSourceWebKitmacWebCoreSupportWebDragClientmm">branches/safari-604.1.5-branch/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm</a></li>
<li><a href="#branchessafari60415branchSourceWebKitmacWebViewWebViewmm">branches/safari-604.1.5-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari60415branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebKit/mac/ChangeLog (211383 => 211384)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.5-branch/Source/WebKit/mac/ChangeLog 2017-01-30 21:02:13 UTC (rev 211383)
+++ branches/safari-604.1.5-branch/Source/WebKit/mac/ChangeLog 2017-01-30 21:02:16 UTC (rev 211384)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2017-01-30 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211323. rdar://problem/30107776
+
+ 2017-01-27 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ [WK1] Do not prevent the drag client from initializing on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=167541
+
+ Reviewed by Dan Bernstein.
+
+ Fixes fallout from r211192. To ensure compability with WebKit clients, we need to ensure that WebDragClient is
+ initialized everywhere when creating a WebView. Stub out method implementations as no-ops for non-Mac platforms.
+ This caused certain clients, such as Mail, to crash when a webView closes due to null dereference.
+
+ * WebCoreSupport/WebDragClient.mm:
+ (WebDragClient::WebDragClient):
+ (WebDragClient::actionMaskForDrag):
+ (WebDragClient::willPerformDragDestinationAction):
+ (WebDragClient::dragSourceActionMaskForPoint):
+ (WebDragClient::willPerformDragSourceAction):
+ (WebDragClient::startDrag):
+ (WebDragClient::declareAndWriteDragImage):
+ (WebDragClient::declareAndWriteAttachment):
+ * WebView/WebView.mm:
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+
</ins><span class="cx"> 2017-01-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when navigating back to a page in PacheCache when one of its frames has been removed
</span></span></pre></div>
<a id="branchessafari60415branchSourceWebKitmacWebCoreSupportWebDragClientmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm (211383 => 211384)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.5-branch/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2017-01-30 21:02:13 UTC (rev 211383)
+++ branches/safari-604.1.5-branch/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2017-01-30 21:02:16 UTC (rev 211384)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WebDragClient.h"
</span><span class="cx">
</span><del>-#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</del><ins>+#if ENABLE(DRAG_SUPPORT)
</ins><span class="cx">
</span><span class="cx"> #import "DOMElementInternal.h"
</span><span class="cx"> #import "WebArchive.h"
</span><span class="lines">@@ -36,11 +36,15 @@
</span><span class="cx"> #import "WebHTMLViewPrivate.h"
</span><span class="cx"> #import "WebKitLogging.h"
</span><span class="cx"> #import "WebKitNSStringExtras.h"
</span><del>-#import "WebNSPasteboardExtras.h"
</del><span class="cx"> #import "WebNSURLExtras.h"
</span><span class="cx"> #import "WebUIDelegate.h"
</span><span class="cx"> #import "WebUIDelegatePrivate.h"
</span><span class="cx"> #import "WebViewInternal.h"
</span><ins>+
+#if PLATFORM(MAC)
+#import "WebNSPasteboardExtras.h"
+#endif
+
</ins><span class="cx"> #import <WebCore/DataTransfer.h>
</span><span class="cx"> #import <WebCore/DragData.h>
</span><span class="cx"> #import <WebCore/Editor.h>
</span><span class="lines">@@ -57,8 +61,11 @@
</span><span class="cx"> WebDragClient::WebDragClient(WebView* webView)
</span><span class="cx"> : m_webView(webView)
</span><span class="cx"> {
</span><ins>+ UNUSED_PARAM(m_webView);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+
</ins><span class="cx"> static WebHTMLView *getTopHTMLView(Frame* frame)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(frame);
</span><span class="lines">@@ -138,9 +145,45 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#else
+
+WebCore::DragDestinationAction WebDragClient::actionMaskForDrag(const WebCore::DragData&)
+{
+ return DragDestinationActionNone;
+}
+
+void WebDragClient::willPerformDragDestinationAction(WebCore::DragDestinationAction, const WebCore::DragData&)
+{
+}
+
+WebCore::DragSourceAction WebDragClient::dragSourceActionMaskForPoint(const IntPoint&)
+{
+ return DragSourceActionNone;
+}
+
+void WebDragClient::willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::DataTransfer&)
+{
+}
+
+void WebDragClient::startDrag(DragImageRef, const IntPoint&, const IntPoint&, DataTransfer&, Frame&, bool)
+{
+}
+
+void WebDragClient::declareAndWriteDragImage(const String&, Element&, const URL&, const String&, WebCore::Frame*)
+{
+}
+
+#if ENABLE(ATTACHMENT_ELEMENT)
+void WebDragClient::declareAndWriteAttachment(const String&, Element&, const URL&, const String&, WebCore::Frame*)
+{
+}
+#endif
+
+#endif
+
</ins><span class="cx"> void WebDragClient::dragControllerDestroyed()
</span><span class="cx"> {
</span><span class="cx"> delete this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</del><ins>+#endif // ENABLE(DRAG_SUPPORT)
</ins></span></pre></div>
<a id="branchessafari60415branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.5-branch/Source/WebKit/mac/WebView/WebView.mm (211383 => 211384)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.5-branch/Source/WebKit/mac/WebView/WebView.mm 2017-01-30 21:02:13 UTC (rev 211383)
+++ branches/safari-604.1.5-branch/Source/WebKit/mac/WebView/WebView.mm 2017-01-30 21:02:16 UTC (rev 211384)
</span><span class="lines">@@ -1609,7 +1609,7 @@
</span><span class="cx"> makeUniqueRef<WebCore::LibWebRTCProvider>()
</span><span class="cx"> );
</span><span class="cx"> pageConfiguration.chromeClient = new WebChromeClientIOS(self);
</span><del>-#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
</del><ins>+#if ENABLE(DRAG_SUPPORT)
</ins><span class="cx"> pageConfiguration.dragClient = new WebDragClient(self);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>