<!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>[214057] branches/safari-603-branch/Source/WebKit/win</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/214057">214057</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-03-16 11:28:54 -0700 (Thu, 16 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213846">r213846</a>. rdar://problem/30983702</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebKitwinChangeLog">branches/safari-603-branch/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKitwinWebKitDLLcpp">branches/safari-603-branch/Source/WebKit/win/WebKitDLL.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKitwinWebKitDLLh">branches/safari-603-branch/Source/WebKit/win/WebKitDLL.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/ChangeLog (214056 => 214057)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/ChangeLog 2017-03-16 18:28:51 UTC (rev 214056)
+++ branches/safari-603-branch/Source/WebKit/win/ChangeLog 2017-03-16 18:28:54 UTC (rev 214057)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2017-03-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r213846. rdar://problem/30983702
+
+ 2017-03-13 Per Arne Vollan <pvollan@apple.com>
+
+ [Win] Compile fix.
+ https://bugs.webkit.org/show_bug.cgi?id=169545
+
+ Reviewed by Brent Fulgham.
+
+ Fix inconsistent dll linkage warnings.
+
+ * WebKitDLL.cpp:
+ * WebKitDLL.h:
+
+2017-03-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r213737. rdar://problem/30983702
</span><span class="cx">
</span><span class="cx"> 2017-03-10 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitwinWebKitDLLcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/WebKitDLL.cpp (214056 => 214057)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/WebKitDLL.cpp 2017-03-16 18:28:51 UTC (rev 214056)
+++ branches/safari-603-branch/Source/WebKit/win/WebKitDLL.cpp 2017-03-16 18:28:54 UTC (rev 214057)
</span><span class="lines">@@ -60,6 +60,20 @@
</span><span class="cx"> };
</span><span class="cx"> #undef CLSID_FOR_CLASS
</span><span class="cx">
</span><ins>+#if defined(DEPRECATED_EXPORT_SYMBOLS)
+
+// Force symbols to be included so we can export them for legacy clients.
+// DEPRECATED! People should get these symbols from JavaScriptCore.dll, not WebKit.dll!
+typedef struct OpaqueJSClass* JSClassRef;
+typedef const struct OpaqueJSContext* JSContextRef;
+typedef const struct OpaqueJSValue* JSValueRef;
+typedef struct OpaqueJSString* JSStringRef;
+typedef wchar_t JSChar;
+typedef unsigned JSPropertyAttributes;
+struct JSClassDefinition;
+
+#endif
+
</ins><span class="cx"> HashCountedSet<String>& gClassNameCount()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<HashCountedSet<String>> gClassNameCount;
</span><span class="lines">@@ -286,7 +300,7 @@
</span><span class="cx"> extern "C"
</span><span class="cx"> {
</span><span class="cx">
</span><del>-JSClassRef JSClassCreate(const JSClassDefinition* definition)
</del><ins>+WEBKIT_API JSClassRef JSClassCreate(const JSClassDefinition* definition)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsClassCreateFunction)
</span><span class="cx"> return m_jsClassCreateFunction(definition);
</span><span class="lines">@@ -293,7 +307,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void* JSObjectGetPrivate(JSObjectRef object)
</del><ins>+WEBKIT_API void* JSObjectGetPrivate(JSObjectRef object)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsObjectGetPrivateFunction)
</span><span class="cx"> return m_jsObjectGetPrivateFunction(object);
</span><span class="lines">@@ -300,7 +314,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSObjectRef JSObjectMake(JSContextRef ctx, JSClassRef classRef, void* data)
</del><ins>+WEBKIT_API JSObjectRef JSObjectMake(JSContextRef ctx, JSClassRef classRef, void* data)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsObjectMakeFunction)
</span><span class="cx"> return m_jsObjectMakeFunction(ctx, classRef, data);
</span><span class="lines">@@ -307,13 +321,13 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSPropertyAttributes attributes, JSValueRef* exception)
</del><ins>+WEBKIT_API void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSPropertyAttributes attributes, JSValueRef* exception)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsObjectSetPropertyFunction)
</span><span class="cx"> m_jsObjectSetPropertyFunction(ctx, object, propertyName, value, attributes, exception);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSStringRef JSStringCreateWithCFString(CFStringRef value)
</del><ins>+WEBKIT_API JSStringRef JSStringCreateWithCFString(CFStringRef value)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsStringCreateWithCFStringFunction)
</span><span class="cx"> return m_jsStringCreateWithCFStringFunction(value);
</span><span class="lines">@@ -320,7 +334,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSStringRef JSStringCreateWithUTF8CString(const char* value)
</del><ins>+WEBKIT_API JSStringRef JSStringCreateWithUTF8CString(const char* value)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsStringCreateWithUTF8CStringFunction)
</span><span class="cx"> return m_jsStringCreateWithUTF8CStringFunction(value);
</span><span class="lines">@@ -327,7 +341,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const JSChar* JSStringGetCharactersPtr(JSStringRef value)
</del><ins>+WEBKIT_API const JSChar* JSStringGetCharactersPtr(JSStringRef value)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsStringGetCharactersPtrFunction)
</span><span class="cx"> return m_jsStringGetCharactersPtrFunction(value);
</span><span class="lines">@@ -334,7 +348,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-size_t JSStringGetLength(JSStringRef value)
</del><ins>+WEBKIT_API size_t JSStringGetLength(JSStringRef value)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsStringGetLengthFunction)
</span><span class="cx"> return m_jsStringGetLengthFunction(value);
</span><span class="lines">@@ -341,13 +355,13 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSStringRelease(JSStringRef value)
</del><ins>+WEBKIT_API void JSStringRelease(JSStringRef value)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsStringReleaseFunction)
</span><span class="cx"> return m_jsStringReleaseFunction(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSValueIsNumber(JSContextRef ctx, JSValueRef value)
</del><ins>+WEBKIT_API bool JSValueIsNumber(JSContextRef ctx, JSValueRef value)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsValueIsNumberFunction)
</span><span class="cx"> return m_jsValueIsNumberFunction(ctx, value);
</span><span class="lines">@@ -354,7 +368,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool JSValueIsString(JSContextRef ctx, JSValueRef value)
</del><ins>+WEBKIT_API bool JSValueIsString(JSContextRef ctx, JSValueRef value)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsValueIsStringFunction)
</span><span class="cx"> return m_jsValueIsStringFunction(ctx, value);
</span><span class="lines">@@ -361,7 +375,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValueRef JSValueMakeString(JSContextRef ctx, JSStringRef value)
</del><ins>+WEBKIT_API JSValueRef JSValueMakeString(JSContextRef ctx, JSStringRef value)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsValueMakeStringFunction)
</span><span class="cx"> return m_jsValueMakeStringFunction(ctx, value);
</span><span class="lines">@@ -368,7 +382,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValueRef JSValueMakeUndefined(JSContextRef ctx)
</del><ins>+WEBKIT_API JSValueRef JSValueMakeUndefined(JSContextRef ctx)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsValueMakeUndefinedFunction)
</span><span class="cx"> return m_jsValueMakeUndefinedFunction(ctx);
</span><span class="lines">@@ -375,7 +389,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double JSValueToNumber(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
</del><ins>+WEBKIT_API double JSValueToNumber(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsValueToNumberFunction)
</span><span class="cx"> return m_jsValueToNumberFunction(ctx, value, exception);
</span><span class="lines">@@ -382,7 +396,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSStringRef JSValueToStringCopy(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
</del><ins>+WEBKIT_API JSStringRef JSValueToStringCopy(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
</ins><span class="cx"> {
</span><span class="cx"> if (m_jsValueToStringCopyFunction)
</span><span class="cx"> return m_jsValueToStringCopyFunction(ctx, value, exception);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitwinWebKitDLLh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/WebKitDLL.h (214056 => 214057)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/WebKitDLL.h 2017-03-16 18:28:51 UTC (rev 214056)
+++ branches/safari-603-branch/Source/WebKit/win/WebKitDLL.h 2017-03-16 18:28:54 UTC (rev 214057)
</span><span class="lines">@@ -56,37 +56,6 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_API void shutDownWebKit();
</span><span class="cx">
</span><del>-#if defined(DEPRECATED_EXPORT_SYMBOLS)
-
-#include <JavaScriptCore/JSObjectRef.h>
-
-// Force symbols to be included so we can export them for legacy clients.
-// DEPRECATED! People should get these symbols from JavaScriptCore.dll, not WebKit.dll!
-typedef struct OpaqueJSClass* JSClassRef;
-typedef const struct OpaqueJSContext* JSContextRef;
-typedef const struct OpaqueJSValue* JSValueRef;
-typedef struct OpaqueJSString* JSStringRef;
-typedef wchar_t JSChar;
-typedef unsigned JSPropertyAttributes;
-
-WEBKIT_API JSClassRef JSClassCreate(const JSClassDefinition*);
-WEBKIT_API void* JSObjectGetPrivate(JSObjectRef);
-WEBKIT_API JSObjectRef JSObjectMake(JSContextRef, JSClassRef, void*);
-WEBKIT_API void JSObjectSetProperty(JSContextRef, JSObjectRef, JSStringRef propertyName, JSValueRef, JSPropertyAttributes, JSValueRef* exception);
-WEBKIT_API JSStringRef JSStringCreateWithCFString(CFStringRef);
-WEBKIT_API JSStringRef JSStringCreateWithUTF8CString(const char*);
-WEBKIT_API const JSChar* JSStringGetCharactersPtr(JSStringRef);
-WEBKIT_API size_t JSStringGetLength(JSStringRef);
-WEBKIT_API void JSStringRelease(JSStringRef);
-WEBKIT_API bool JSValueIsNumber(JSContextRef, JSValueRef);
-WEBKIT_API bool JSValueIsString(JSContextRef, JSValueRef);
-WEBKIT_API JSValueRef JSValueMakeString(JSContextRef, JSStringRef);
-WEBKIT_API JSValueRef JSValueMakeUndefined(JSContextRef ctx);
-WEBKIT_API double JSValueToNumber(JSContextRef, JSValueRef, JSValueRef*);
-WEBKIT_API JSStringRef JSValueToStringCopy(JSContextRef, JSValueRef, JSValueRef* exception);
-// End
-#endif
-
</del><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>