Title: [210904] branches/safari-603-branch/Source/_javascript_Core
- Revision
- 210904
- Author
- matthew_han...@apple.com
- Date
- 2017-01-18 19:06:56 -0800 (Wed, 18 Jan 2017)
Log Message
Merge r210858. rdar://problem/30069096
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/_javascript_Core/API/JSObjectRef.cpp (210903 => 210904)
--- branches/safari-603-branch/Source/_javascript_Core/API/JSObjectRef.cpp 2017-01-19 01:28:26 UTC (rev 210903)
+++ branches/safari-603-branch/Source/_javascript_Core/API/JSObjectRef.cpp 2017-01-19 03:06:56 UTC (rev 210904)
@@ -424,21 +424,21 @@
// Get wrapped object if proxied
if (classInfo->isSubClassOf(JSProxy::info())) {
- jsObject = jsCast<JSProxy*>(jsObject)->target();
+ jsObject = static_cast<JSProxy*>(jsObject)->target();
classInfo = jsObject->classInfo();
}
if (classInfo->isSubClassOf(JSCallbackObject<JSGlobalObject>::info())) {
- jsCast<JSCallbackObject<JSGlobalObject>*>(jsObject)->setPrivate(data);
+ static_cast<JSCallbackObject<JSGlobalObject>*>(jsObject)->setPrivate(data);
return true;
}
if (classInfo->isSubClassOf(JSCallbackObject<JSDestructibleObject>::info())) {
- jsCast<JSCallbackObject<JSDestructibleObject>*>(jsObject)->setPrivate(data);
+ static_cast<JSCallbackObject<JSDestructibleObject>*>(jsObject)->setPrivate(data);
return true;
}
#if JSC_OBJC_API_ENABLED
if (classInfo->isSubClassOf(JSCallbackObject<JSAPIWrapperObject>::info())) {
- jsCast<JSCallbackObject<JSAPIWrapperObject>*>(jsObject)->setPrivate(data);
+ static_cast<JSCallbackObject<JSAPIWrapperObject>*>(jsObject)->setPrivate(data);
return true;
}
#endif
Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (210903 => 210904)
--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-19 01:28:26 UTC (rev 210903)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-19 03:06:56 UTC (rev 210904)
@@ -1,5 +1,19 @@
2017-01-18 Matthew Hanson <matthew_han...@apple.com>
+ Merge r210858. rdar://problem/30069096
+
+ 2017-01-18 Filip Pizlo <fpi...@apple.com>
+
+ JSObjectSetPrivate should not use jsCast<>
+ rdar://problem/30069096
+
+ Reviewed by Keith Miller.
+
+ * API/JSObjectRef.cpp:
+ (JSObjectSetPrivate):
+
+2017-01-18 Matthew Hanson <matthew_han...@apple.com>
+
Merge r210844. rdar://problem/29993906
2017-01-16 Filip Pizlo <fpi...@apple.com>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
