<!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>[212642] trunk/Source</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/212642">212642</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2017-02-20 09:22:56 -0800 (Mon, 20 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up how WebKit exports _WebCreateFragment
https://bugs.webkit.org/show_bug.cgi?id=168579
Reviewed by Dan Bernstein.
Source/WebCore:
* editing/Editor.h: Removed the declaration of _WebCreateFragment, SOFT_LINK doesn't need it.
* editing/cocoa/EditorCocoa.mm: Moved a FIXME comment here.
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj: Added WebCreateFragmentInternal.h.
Source/WebKit/mac:
* WebCoreSupport/WebCreateFragmentInternal.h: Added a private header.
* WebCoreSupport/WebEditorClient.mm: Include the new header that declares _WebCreateFragment.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaEditorCocoamm">trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebCreateFragmentInternalh">trunk/Source/WebKit/mac/WebCoreSupport/WebCreateFragmentInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212641 => 212642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-20 17:20:04 UTC (rev 212641)
+++ trunk/Source/WebCore/ChangeLog 2017-02-20 17:22:56 UTC (rev 212642)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-02-20 Alexey Proskuryakov <ap@apple.com>
+
+ Clean up how WebKit exports _WebCreateFragment
+ https://bugs.webkit.org/show_bug.cgi?id=168579
+
+ Reviewed by Dan Bernstein.
+
+ * editing/Editor.h: Removed the declaration of _WebCreateFragment, SOFT_LINK doesn't need it.
+ * editing/cocoa/EditorCocoa.mm: Moved a FIXME comment here.
+
</ins><span class="cx"> 2017-02-20 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r212637.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (212641 => 212642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2017-02-20 17:20:04 UTC (rev 212641)
+++ trunk/Source/WebCore/editing/Editor.h 2017-02-20 17:22:56 UTC (rev 212642)
</span><span class="lines">@@ -589,9 +589,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#if PLATFORM(COCOA)
-// This function is declared here but defined in the WebKitLegacy framework.
-// FIXME: Get rid of this and change this so it doesn't use WebKitLegacy.
-extern "C" void _WebCreateFragment(WebCore::Document&, NSAttributedString *, WebCore::FragmentAndResources&);
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaEditorCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm (212641 => 212642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm 2017-02-20 17:20:04 UTC (rev 212641)
+++ trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm 2017-02-20 17:22:56 UTC (rev 212642)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> SOFT_LINK_FRAMEWORK_IN_UMBRELLA(WebKit, WebKitLegacy)
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+// FIXME: Get rid of this and change NSAttributedString conversion so it doesn't use WebKitLegacy (cf. rdar://problem/30597352).
</ins><span class="cx"> SOFT_LINK(WebKitLegacy, _WebCreateFragment, void, (WebCore::Document& document, NSAttributedString *string, WebCore::FragmentAndResources& result), (document, string, result))
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (212641 => 212642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2017-02-20 17:20:04 UTC (rev 212641)
+++ trunk/Source/WebKit/ChangeLog 2017-02-20 17:22:56 UTC (rev 212642)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-02-20 Alexey Proskuryakov <ap@apple.com>
+
+ Clean up how WebKit exports _WebCreateFragment
+ https://bugs.webkit.org/show_bug.cgi?id=168579
+
+ Reviewed by Dan Bernstein.
+
+ * WebKit.xcodeproj/project.pbxproj: Added WebCreateFragmentInternal.h.
+
</ins><span class="cx"> 2017-02-15 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop backing up localStorage databases to iCloud by default.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (212641 => 212642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2017-02-20 17:20:04 UTC (rev 212641)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2017-02-20 17:22:56 UTC (rev 212642)
</span><span class="lines">@@ -791,6 +791,7 @@
</span><span class="cx"> DD7CDEE70A23BA9E00069928 /* WebTypesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DD7CDEE60A23BA9E00069928 /* WebTypesInternal.h */; };
</span><span class="cx"> DD89682009AA87240097E7F0 /* WebElementDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = DD89681E09AA87240097E7F0 /* WebElementDictionary.h */; };
</span><span class="cx"> DD89682109AA87240097E7F0 /* WebElementDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD89681F09AA87240097E7F0 /* WebElementDictionary.mm */; };
</span><ins>+ E13E782C1E5A7365001849D1 /* WebCreateFragmentInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = E13E782B1E5A7365001849D1 /* WebCreateFragmentInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> E15663190FB61C1F00C199CA /* WebDownload.mm in Sources */ = {isa = PBXBuildFile; fileRef = E15663180FB61C1F00C199CA /* WebDownload.mm */; };
</span><span class="cx"> E169836211346D1B00894115 /* ProxyRuntimeObject.h in Headers */ = {isa = PBXBuildFile; fileRef = E169836111346D1B00894115 /* ProxyRuntimeObject.h */; };
</span><span class="cx"> E169836C11346D5600894115 /* ProxyRuntimeObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = E169836B11346D5600894115 /* ProxyRuntimeObject.mm */; };
</span><span class="lines">@@ -1547,6 +1548,7 @@
</span><span class="cx"> DD7CDEE60A23BA9E00069928 /* WebTypesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebTypesInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> DD89681E09AA87240097E7F0 /* WebElementDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebElementDictionary.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> DD89681F09AA87240097E7F0 /* WebElementDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebElementDictionary.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><ins>+ E13E782B1E5A7365001849D1 /* WebCreateFragmentInternal.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = WebCreateFragmentInternal.h; sourceTree = "<group>"; };
</ins><span class="cx"> E15663180FB61C1F00C199CA /* WebDownload.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDownload.mm; sourceTree = "<group>"; };
</span><span class="cx"> E169836111346D1B00894115 /* ProxyRuntimeObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxyRuntimeObject.h; sourceTree = "<group>"; };
</span><span class="cx"> E169836B11346D5600894115 /* ProxyRuntimeObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ProxyRuntimeObject.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -2579,6 +2581,7 @@
</span><span class="cx"> 14D8252E0AF955090004F057 /* WebChromeClient.mm */,
</span><span class="cx"> 065AD5A10B0C32C7005A2B1D /* WebContextMenuClient.h */,
</span><span class="cx"> 065AD5A20B0C32C7005A2B1D /* WebContextMenuClient.mm */,
</span><ins>+ E13E782B1E5A7365001849D1 /* WebCreateFragmentInternal.h */,
</ins><span class="cx"> 598AD9191201CEC900ABAE4E /* WebDeviceOrientationClient.h */,
</span><span class="cx"> 598AD91D1201CECF00ABAE4E /* WebDeviceOrientationClient.mm */,
</span><span class="cx"> A70936AD0B5608DC00CDB48E /* WebDragClient.h */,
</span><span class="lines">@@ -2909,6 +2912,7 @@
</span><span class="cx"> 93D437701D57ABEF00AB85EA /* DOMRGBColor.h in Headers */,
</span><span class="cx"> 93D437721D57ABEF00AB85EA /* DOMRGBColorInternal.h in Headers */,
</span><span class="cx"> 93D437731D57ABEF00AB85EA /* DOMStyleSheet.h in Headers */,
</span><ins>+ E13E782C1E5A7365001849D1 /* WebCreateFragmentInternal.h in Headers */,
</ins><span class="cx"> 93D437751D57ABEF00AB85EA /* DOMStyleSheetInternal.h in Headers */,
</span><span class="cx"> 93D437761D57ABEF00AB85EA /* DOMStyleSheetList.h in Headers */,
</span><span class="cx"> 93D437781D57ABEF00AB85EA /* DOMStyleSheetListInternal.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (212641 => 212642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-02-20 17:20:04 UTC (rev 212641)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-02-20 17:22:56 UTC (rev 212642)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-02-20 Alexey Proskuryakov <ap@apple.com>
+
+ Clean up how WebKit exports _WebCreateFragment
+ https://bugs.webkit.org/show_bug.cgi?id=168579
+
+ Reviewed by Dan Bernstein.
+
+ * WebCoreSupport/WebCreateFragmentInternal.h: Added a private header.
+ * WebCoreSupport/WebEditorClient.mm: Include the new header that declares _WebCreateFragment.
+
</ins><span class="cx"> 2017-02-20 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop exporting DOMNodeFilter
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebCreateFragmentInternalh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/mac/WebCoreSupport/WebCreateFragmentInternal.h (0 => 212642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebCreateFragmentInternal.h (rev 0)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebCreateFragmentInternal.h 2017-02-20 17:22:56 UTC (rev 212642)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+/*
+ * Copyright (C) 2017 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
+ */
+
+#pragma once
+
+namespace WebCore {
+class Document;
+struct FragmentAndResources;
+}
+
+extern "C" void _WebCreateFragment(WebCore::Document&, NSAttributedString *, WebCore::FragmentAndResources&);
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (212641 => 212642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2017-02-20 17:20:04 UTC (rev 212641)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2017-02-20 17:22:56 UTC (rev 212642)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #import "DOMNodeInternal.h"
</span><span class="cx"> #import "DOMRangeInternal.h"
</span><span class="cx"> #import "WebArchive.h"
</span><ins>+#import "WebCreateFragmentInternal.h"
</ins><span class="cx"> #import "WebDataSourceInternal.h"
</span><span class="cx"> #import "WebDelegateImplementationCaching.h"
</span><span class="cx"> #import "WebDocument.h"
</span></span></pre>
</div>
</div>
</body>
</html>