Title: [278685] branches/safari-612.1.15.4-branch/Source/_javascript_Core
- Revision
- 278685
- Author
- [email protected]
- Date
- 2021-06-09 18:13:48 -0700 (Wed, 09 Jun 2021)
Log Message
Cherry-pick r278672. rdar://problem/79111918
Speculative build fix for Win32.
https://bugs.webkit.org/show_bug.cgi?id=226793
rdar://79032803
Reviewed by Saam Barati.
* API/JSCallbackObject.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278672 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.15.4-branch/Source/_javascript_Core/API/JSCallbackObject.h (278684 => 278685)
--- branches/safari-612.1.15.4-branch/Source/_javascript_Core/API/JSCallbackObject.h 2021-06-10 01:12:59 UTC (rev 278684)
+++ branches/safari-612.1.15.4-branch/Source/_javascript_Core/API/JSCallbackObject.h 2021-06-10 01:13:48 UTC (rev 278685)
@@ -30,6 +30,7 @@
#include "JSObjectRef.h"
#include "JSValueRef.h"
#include "JSObject.h"
+#include <wtf/PlatformCallingConventions.h>
namespace JSC {
@@ -199,7 +200,7 @@
void finishCreation(VM&);
static IsoSubspace* subspaceForImpl(VM&, SubspaceAccess);
- static JSC_HOST_CALL_ATTRIBUTES EncodedJSValue customToPrimitive(JSGlobalObject*, CallFrame*);
+ static EncodedJSValue JSC_HOST_CALL_ATTRIBUTES customToPrimitive(JSGlobalObject*, CallFrame*);
static bool getOwnPropertySlot(JSObject*, JSGlobalObject*, PropertyName, PropertySlot&);
static bool getOwnPropertySlotByIndex(JSObject*, JSGlobalObject*, unsigned propertyName, PropertySlot&);
Modified: branches/safari-612.1.15.4-branch/Source/_javascript_Core/ChangeLog (278684 => 278685)
--- branches/safari-612.1.15.4-branch/Source/_javascript_Core/ChangeLog 2021-06-10 01:12:59 UTC (rev 278684)
+++ branches/safari-612.1.15.4-branch/Source/_javascript_Core/ChangeLog 2021-06-10 01:13:48 UTC (rev 278685)
@@ -1,3 +1,29 @@
+2021-06-09 Russell Epstein <[email protected]>
+
+ Cherry-pick r278672. rdar://problem/79111918
+
+ Speculative build fix for Win32.
+ https://bugs.webkit.org/show_bug.cgi?id=226793
+ rdar://79032803
+
+ Reviewed by Saam Barati.
+
+ * API/JSCallbackObject.h:
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278672 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-06-09 Mark Lam <[email protected]>
+
+ Speculative build fix for Win32.
+ https://bugs.webkit.org/show_bug.cgi?id=226793
+ rdar://79032803
+
+ Reviewed by Saam Barati.
+
+ * API/JSCallbackObject.h:
+
2021-05-13 Chris Dumez <[email protected]>
Rename FileSystem::fileIsDirectory(path, followSymlinks) to isDirectory(path) / isDirectoryFollowingSymlinks(path)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
