[webkit-changes] [214054] branches/safari-603.1.30.4-branch/Source/WebKit/win

Thu, 16 Mar 2017 11:19:14 -0700

Title: [214054] branches/safari-603.1.30.4-branch/Source/WebKit/win
Revision
214054
Author
matthew_han...@apple.com
Date
2017-03-16 11:18:52 -0700 (Thu, 16 Mar 2017)

Log Message

Merge r213846. rdar://problem/30983702


Modified Paths

Diff

Modified: branches/safari-603.1.30.4-branch/Source/WebKit/win/ChangeLog (214053 => 214054)


--- branches/safari-603.1.30.4-branch/Source/WebKit/win/ChangeLog	2017-03-16 18:18:50 UTC (rev 214053)
+++ branches/safari-603.1.30.4-branch/Source/WebKit/win/ChangeLog	2017-03-16 18:18:52 UTC (rev 214054)
@@ -1,3 +1,19 @@
+2017-03-16  Matthew Hanson  <matthew_han...@apple.com>
+
+        Merge r213846. rdar://problem/30983702
+
+    2017-03-13  Per Arne Vollan  <pvol...@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-15  Matthew Hanson  <matthew_han...@apple.com>
 
         Merge r213737. rdar://problem/30983702

Modified: branches/safari-603.1.30.4-branch/Source/WebKit/win/WebKitDLL.cpp (214053 => 214054)


--- branches/safari-603.1.30.4-branch/Source/WebKit/win/WebKitDLL.cpp	2017-03-16 18:18:50 UTC (rev 214053)
+++ branches/safari-603.1.30.4-branch/Source/WebKit/win/WebKitDLL.cpp	2017-03-16 18:18:52 UTC (rev 214054)
@@ -60,6 +60,20 @@
 };
 #undef CLSID_FOR_CLASS
 
+#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 _javascript_Core.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
+
 HashCountedSet<String>& gClassNameCount()
 {
     static NeverDestroyed<HashCountedSet<String>> gClassNameCount;
@@ -286,7 +300,7 @@
 extern "C"
 {
 
-JSClassRef JSClassCreate(const JSClassDefinition* definition)
+WEBKIT_API JSClassRef JSClassCreate(const JSClassDefinition* definition)
 {
     if (m_jsClassCreateFunction)
         return m_jsClassCreateFunction(definition);
@@ -293,7 +307,7 @@
     return nullptr;
 }
 
-void* JSObjectGetPrivate(JSObjectRef object)
+WEBKIT_API void* JSObjectGetPrivate(JSObjectRef object)
 {
     if (m_jsObjectGetPrivateFunction)
         return m_jsObjectGetPrivateFunction(object);
@@ -300,7 +314,7 @@
     return nullptr;
 }
 
-JSObjectRef JSObjectMake(JSContextRef ctx, JSClassRef classRef, void* data)
+WEBKIT_API JSObjectRef JSObjectMake(JSContextRef ctx, JSClassRef classRef, void* data)
 {
     if (m_jsObjectMakeFunction)
         return m_jsObjectMakeFunction(ctx, classRef, data);
@@ -307,13 +321,13 @@
     return nullptr;
 }
 
-void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSPropertyAttributes attributes, JSValueRef* exception)
+WEBKIT_API void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSPropertyAttributes attributes, JSValueRef* exception)
 {
     if (m_jsObjectSetPropertyFunction)
         m_jsObjectSetPropertyFunction(ctx, object, propertyName, value, attributes, exception);
 }
 
-JSStringRef JSStringCreateWithCFString(CFStringRef value)
+WEBKIT_API JSStringRef JSStringCreateWithCFString(CFStringRef value)
 {
     if (m_jsStringCreateWithCFStringFunction)
         return m_jsStringCreateWithCFStringFunction(value);
@@ -320,7 +334,7 @@
     return nullptr;
 }
 
-JSStringRef JSStringCreateWithUTF8CString(const char* value)
+WEBKIT_API JSStringRef JSStringCreateWithUTF8CString(const char* value)
 {
     if (m_jsStringCreateWithUTF8CStringFunction)
         return m_jsStringCreateWithUTF8CStringFunction(value);
@@ -327,7 +341,7 @@
     return nullptr;
 }
 
-const JSChar* JSStringGetCharactersPtr(JSStringRef value)
+WEBKIT_API const JSChar* JSStringGetCharactersPtr(JSStringRef value)
 {
     if (m_jsStringGetCharactersPtrFunction)
         return m_jsStringGetCharactersPtrFunction(value);
@@ -334,7 +348,7 @@
     return nullptr;
 }
 
-size_t JSStringGetLength(JSStringRef value)
+WEBKIT_API size_t JSStringGetLength(JSStringRef value)
 {
     if (m_jsStringGetLengthFunction)
         return m_jsStringGetLengthFunction(value);
@@ -341,13 +355,13 @@
     return 0;
 }
 
-void JSStringRelease(JSStringRef value)
+WEBKIT_API void JSStringRelease(JSStringRef value)
 {
     if (m_jsStringReleaseFunction)
         return m_jsStringReleaseFunction(value);
 }
 
-bool JSValueIsNumber(JSContextRef ctx, JSValueRef value)
+WEBKIT_API bool JSValueIsNumber(JSContextRef ctx, JSValueRef value)
 {
     if (m_jsValueIsNumberFunction)
         return m_jsValueIsNumberFunction(ctx, value);
@@ -354,7 +368,7 @@
     return false;
 }
 
-bool JSValueIsString(JSContextRef ctx, JSValueRef value)
+WEBKIT_API bool JSValueIsString(JSContextRef ctx, JSValueRef value)
 {
     if (m_jsValueIsStringFunction)
         return m_jsValueIsStringFunction(ctx, value);
@@ -361,7 +375,7 @@
     return false;
 }
 
-JSValueRef JSValueMakeString(JSContextRef ctx, JSStringRef value)
+WEBKIT_API JSValueRef JSValueMakeString(JSContextRef ctx, JSStringRef value)
 {
     if (m_jsValueMakeStringFunction)
         return m_jsValueMakeStringFunction(ctx, value);
@@ -368,7 +382,7 @@
     return nullptr;
 }
 
-JSValueRef JSValueMakeUndefined(JSContextRef ctx)
+WEBKIT_API JSValueRef JSValueMakeUndefined(JSContextRef ctx)
 {
     if (m_jsValueMakeUndefinedFunction)
         return m_jsValueMakeUndefinedFunction(ctx);
@@ -375,7 +389,7 @@
     return nullptr;
 }
 
-double JSValueToNumber(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
+WEBKIT_API double JSValueToNumber(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {
     if (m_jsValueToNumberFunction)
         return m_jsValueToNumberFunction(ctx, value, exception);
@@ -382,7 +396,7 @@
     return 0;
 }
 
-JSStringRef JSValueToStringCopy(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
+WEBKIT_API JSStringRef JSValueToStringCopy(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {
     if (m_jsValueToStringCopyFunction)
         return m_jsValueToStringCopyFunction(ctx, value, exception);

Modified: branches/safari-603.1.30.4-branch/Source/WebKit/win/WebKitDLL.h (214053 => 214054)


--- branches/safari-603.1.30.4-branch/Source/WebKit/win/WebKitDLL.h	2017-03-16 18:18:50 UTC (rev 214053)
+++ branches/safari-603.1.30.4-branch/Source/WebKit/win/WebKitDLL.h	2017-03-16 18:18:52 UTC (rev 214054)
@@ -56,37 +56,6 @@
 
 WEBKIT_API void shutDownWebKit();
 
-#if defined(DEPRECATED_EXPORT_SYMBOLS)
-
-#include <_javascript_Core/JSObjectRef.h>
-
-// Force symbols to be included so we can export them for legacy clients.
-// DEPRECATED! People should get these symbols from _javascript_Core.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
-
 #ifdef __cplusplus
 }
 #endif

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to