Unreviewed, fix build.
authorfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Aug 2013 05:21:10 +0000 (05:21 +0000)
committerfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Aug 2013 05:21:10 +0000 (05:21 +0000)
* API/JSValue.mm:
(isDate):
(isArray):
* API/JSWrapperMap.mm:
(tryUnwrapObjcObject):
* API/ObjCCallbackFunction.mm:
(tryUnwrapBlock):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154040 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/API/JSValue.mm
Source/JavaScriptCore/API/JSWrapperMap.mm
Source/JavaScriptCore/API/ObjCCallbackFunction.mm
Source/JavaScriptCore/ChangeLog

index e708cc67472ba78f413f3172c63c5c0d8326ca11..014baa8da574ade8691fde799aeb8cdedd824c5c 100644 (file)
@@ -555,13 +555,13 @@ NSString * const JSPropertyDescriptorSetKey = @"set";
 inline bool isDate(JSObjectRef object, JSGlobalContextRef context)
 {
     JSC::APIEntryShim entryShim(toJS(context));
 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));
 }
 
 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)
 }
 
 @implementation JSValue(Internal)
index 4dde1a6597b670daa09ea7076d515e6793845302..6309036c083c571c6334518b5ea32bedd051f680 100644 (file)
@@ -499,7 +499,7 @@ id tryUnwrapObjcObject(JSGlobalContextRef context, JSValueRef value)
     JSValueRef exception = 0;
     JSObjectRef object = JSValueToObject(context, value, &exception);
     ASSERT(!exception);
     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;
         return (id)JSC::jsCast<JSC::JSAPIWrapperObject*>(toJS(object))->wrappedObject();
     if (id target = tryUnwrapBlock(object))
         return target;
index ae755a4fcaf3a091b68b1e35a83311207431ccf3..b23515b058d6d9c2b3e8dbd2f8311b3630903eca 100644 (file)
@@ -615,7 +615,7 @@ JSObjectRef objCCallbackFunctionForBlock(JSContext *context, id target)
 
 id tryUnwrapBlock(JSObjectRef object)
 {
 
 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();
 }
         return nil;
     return static_cast<JSC::ObjCCallbackFunction*>(toJS(object))->impl()->wrappedBlock();
 }
index 26618628b7a9cb634f90e9d50d4a56d8ba38bff5..45a772067ed954134b180213a985806003bac2f5 100644 (file)
@@ -1,3 +1,15 @@
+2013-08-13  Filip Pizlo  <fpizlo@apple.com>
+
+        Unreviewed, fix build.
+
+        * API/JSValue.mm:
+        (isDate):
+        (isArray):
+        * API/JSWrapperMap.mm:
+        (tryUnwrapObjcObject):
+        * API/ObjCCallbackFunction.mm:
+        (tryUnwrapBlock):
+
 2013-08-13  Filip Pizlo  <fpizlo@apple.com>
 
         Foo::s_info should be Foo::info(), so that you can change how the s_info is actually linked
 2013-08-13  Filip Pizlo  <fpizlo@apple.com>
 
         Foo::s_info should be Foo::info(), so that you can change how the s_info is actually linked