Title: [154040] trunk/Source/_javascript_Core
Revision
154040
Author
[email protected]
Date
2013-08-13 22:21:10 -0700 (Tue, 13 Aug 2013)

Log Message

Unreviewed, fix build.

* API/JSValue.mm:
(isDate):
(isArray):
* API/JSWrapperMap.mm:
(tryUnwrapObjcObject):
* API/ObjCCallbackFunction.mm:
(tryUnwrapBlock):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/API/JSValue.mm (154039 => 154040)


--- trunk/Source/_javascript_Core/API/JSValue.mm	2013-08-14 03:08:31 UTC (rev 154039)
+++ trunk/Source/_javascript_Core/API/JSValue.mm	2013-08-14 05:21:10 UTC (rev 154040)
@@ -555,13 +555,13 @@
 inline bool isDate(JSObjectRef object, JSGlobalContextRef context)
 {
     JSC::APIEntryShim entryShim(toJS(context));
-    return toJS(object)->inherits(&JSC::DateInstance::s_info);
+    return toJS(object)->inherits(JSC::DateInstance::info());
 }
 
 inline bool isArray(JSObjectRef object, JSGlobalContextRef context)
 {
     JSC::APIEntryShim entryShim(toJS(context));
-    return toJS(object)->inherits(&JSC::JSArray::s_info);
+    return toJS(object)->inherits(JSC::JSArray::info());
 }
 
 @implementation JSValue(Internal)

Modified: trunk/Source/_javascript_Core/API/JSWrapperMap.mm (154039 => 154040)


--- trunk/Source/_javascript_Core/API/JSWrapperMap.mm	2013-08-14 03:08:31 UTC (rev 154039)
+++ trunk/Source/_javascript_Core/API/JSWrapperMap.mm	2013-08-14 05:21:10 UTC (rev 154040)
@@ -499,7 +499,7 @@
     JSValueRef exception = 0;
     JSObjectRef object = JSValueToObject(context, value, &exception);
     ASSERT(!exception);
-    if (toJS(object)->inherits(&JSC::JSCallbackObject<JSC::JSAPIWrapperObject>::s_info))
+    if (toJS(object)->inherits(JSC::JSCallbackObject<JSC::JSAPIWrapperObject>::info()))
         return (id)JSC::jsCast<JSC::JSAPIWrapperObject*>(toJS(object))->wrappedObject();
     if (id target = tryUnwrapBlock(object))
         return target;

Modified: trunk/Source/_javascript_Core/API/ObjCCallbackFunction.mm (154039 => 154040)


--- trunk/Source/_javascript_Core/API/ObjCCallbackFunction.mm	2013-08-14 03:08:31 UTC (rev 154039)
+++ trunk/Source/_javascript_Core/API/ObjCCallbackFunction.mm	2013-08-14 05:21:10 UTC (rev 154040)
@@ -615,7 +615,7 @@
 
 id tryUnwrapBlock(JSObjectRef object)
 {
-    if (!toJS(object)->inherits(&JSC::ObjCCallbackFunction::s_info))
+    if (!toJS(object)->inherits(JSC::ObjCCallbackFunction::info()))
         return nil;
     return static_cast<JSC::ObjCCallbackFunction*>(toJS(object))->impl()->wrappedBlock();
 }

Modified: trunk/Source/_javascript_Core/ChangeLog (154039 => 154040)


--- trunk/Source/_javascript_Core/ChangeLog	2013-08-14 03:08:31 UTC (rev 154039)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-08-14 05:21:10 UTC (rev 154040)
@@ -1,5 +1,17 @@
 2013-08-13  Filip Pizlo  <[email protected]>
 
+        Unreviewed, fix build.
+
+        * API/JSValue.mm:
+        (isDate):
+        (isArray):
+        * API/JSWrapperMap.mm:
+        (tryUnwrapObjcObject):
+        * API/ObjCCallbackFunction.mm:
+        (tryUnwrapBlock):
+
+2013-08-13  Filip Pizlo  <[email protected]>
+
         Foo::s_info should be Foo::info(), so that you can change how the s_info is actually linked
         https://bugs.webkit.org/show_bug.cgi?id=119770
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to