JavaScriptCore-7600.1.4.9.tar.gz

[apple/javascriptcore.git] / API / JSValueRef.cpp

diff --git a/API/JSValueRef.cpp b/API/JSValueRef.cpp
index a12cc3409a2e10dd5ef6c8986fe187e6bdf8276a..a0be8f07f7fc4f10fd691987489c57a5b66f5df3 100644 (file)
--- a/API/JSValueRef.cpp
+++ b/API/JSValueRef.cpp
@@ -10,44 +10,68 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *

- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY

  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR

  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  */
 
 #include "config.h"
 #include "JSValueRef.h"
 
  */
 
 #include "config.h"
 #include "JSValueRef.h"
 

-#include <wtf/Platform.h>

 #include "APICast.h"
 #include "APICast.h"

-#include "APIShims.h"
+#include "JSAPIWrapperObject.h"
+#include "JSCJSValue.h"

 #include "JSCallbackObject.h"
 #include "JSCallbackObject.h"

-
-#include <runtime/JSGlobalObject.h>
-#include <runtime/JSString.h>
-#include <runtime/Operations.h>
-#include <runtime/Protect.h>
-#include <runtime/UString.h>
-#include <runtime/JSValue.h>
+#include "JSGlobalObject.h"
+#include "JSONObject.h"
+#include "JSString.h"
+#include "LiteralParser.h"
+#include "JSCInlines.h"
+#include "Protect.h"

 
 #include <wtf/Assertions.h>
 
 #include <wtf/Assertions.h>

+#include <wtf/text/StringHash.h>
+#include <wtf/text/WTFString.h>

 
 #include <algorithm> // for std::min
 
 
 #include <algorithm> // for std::min
 

+#if PLATFORM(MAC)
+#include <mach-o/dyld.h>
+#endif
+
+#if ENABLE(REMOTE_INSPECTOR)
+#include "JSGlobalObjectInspectorController.h"
+#endif
+

 using namespace JSC;
 
 using namespace JSC;
 

+#if PLATFORM(MAC)
+static bool evernoteHackNeeded()
+{
+    static const int32_t webkitLastVersionWithEvernoteHack = 35133959;
+    static bool hackNeeded = CFEqual(CFBundleGetIdentifier(CFBundleGetMainBundle()), CFSTR("com.evernote.Evernote"))
+        && NSVersionOfLinkTimeLibrary("JavaScriptCore") <= webkitLastVersionWithEvernoteHack;
+
+    return hackNeeded;
+}
+#endif
+

 ::JSType JSValueGetType(JSContextRef ctx, JSValueRef value)
 {
 ::JSType JSValueGetType(JSContextRef ctx, JSValueRef value)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return kJSTypeUndefined;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJS(exec, value);
 
 
     JSValue jsValue = toJS(exec, value);
 


@@ -67,8 +91,12 @@ using namespace JSC;
 
 bool JSValueIsUndefined(JSContextRef ctx, JSValueRef value)
 {
 
 bool JSValueIsUndefined(JSContextRef ctx, JSValueRef value)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJS(exec, value);
     return jsValue.isUndefined();
 
     JSValue jsValue = toJS(exec, value);
     return jsValue.isUndefined();


@@ -76,8 +104,12 @@ bool JSValueIsUndefined(JSContextRef ctx, JSValueRef value)
 
 bool JSValueIsNull(JSContextRef ctx, JSValueRef value)
 {
 
 bool JSValueIsNull(JSContextRef ctx, JSValueRef value)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJS(exec, value);
     return jsValue.isNull();
 
     JSValue jsValue = toJS(exec, value);
     return jsValue.isNull();


@@ -85,8 +117,12 @@ bool JSValueIsNull(JSContextRef ctx, JSValueRef value)
 
 bool JSValueIsBoolean(JSContextRef ctx, JSValueRef value)
 {
 
 bool JSValueIsBoolean(JSContextRef ctx, JSValueRef value)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJS(exec, value);
     return jsValue.isBoolean();
 
     JSValue jsValue = toJS(exec, value);
     return jsValue.isBoolean();


@@ -94,8 +130,12 @@ bool JSValueIsBoolean(JSContextRef ctx, JSValueRef value)
 
 bool JSValueIsNumber(JSContextRef ctx, JSValueRef value)
 {
 
 bool JSValueIsNumber(JSContextRef ctx, JSValueRef value)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJS(exec, value);
     return jsValue.isNumber();
 
     JSValue jsValue = toJS(exec, value);
     return jsValue.isNumber();


@@ -103,8 +143,12 @@ bool JSValueIsNumber(JSContextRef ctx, JSValueRef value)
 
 bool JSValueIsString(JSContextRef ctx, JSValueRef value)
 {
 
 bool JSValueIsString(JSContextRef ctx, JSValueRef value)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJS(exec, value);
     return jsValue.isString();
 
     JSValue jsValue = toJS(exec, value);
     return jsValue.isString();


@@ -112,8 +156,12 @@ bool JSValueIsString(JSContextRef ctx, JSValueRef value)
 
 bool JSValueIsObject(JSContextRef ctx, JSValueRef value)
 {
 
 bool JSValueIsObject(JSContextRef ctx, JSValueRef value)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJS(exec, value);
     return jsValue.isObject();
 
     JSValue jsValue = toJS(exec, value);
     return jsValue.isObject();


@@ -121,41 +169,64 @@ bool JSValueIsObject(JSContextRef ctx, JSValueRef value)
 
 bool JSValueIsObjectOfClass(JSContextRef ctx, JSValueRef value, JSClassRef jsClass)
 {
 
 bool JSValueIsObjectOfClass(JSContextRef ctx, JSValueRef value, JSClassRef jsClass)
 {

+    if (!ctx || !jsClass) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJS(exec, value);
     
     if (JSObject* o = jsValue.getObject()) {
 
     JSValue jsValue = toJS(exec, value);
     
     if (JSObject* o = jsValue.getObject()) {

-        if (o->inherits(&JSCallbackObject<JSGlobalObject>::info))
-            return static_cast<JSCallbackObject<JSGlobalObject>*>(o)->inherits(jsClass);
-        else if (o->inherits(&JSCallbackObject<JSObject>::info))
-            return static_cast<JSCallbackObject<JSObject>*>(o)->inherits(jsClass);
+        if (o->inherits(JSProxy::info()))
+            o = jsCast<JSProxy*>(o)->target();
+
+        if (o->inherits(JSCallbackObject<JSGlobalObject>::info()))
+            return jsCast<JSCallbackObject<JSGlobalObject>*>(o)->inherits(jsClass);
+        if (o->inherits(JSCallbackObject<JSDestructibleObject>::info()))
+            return jsCast<JSCallbackObject<JSDestructibleObject>*>(o)->inherits(jsClass);
+#if JSC_OBJC_API_ENABLED
+        if (o->inherits(JSCallbackObject<JSAPIWrapperObject>::info()))
+            return jsCast<JSCallbackObject<JSAPIWrapperObject>*>(o)->inherits(jsClass);
+#endif

     }
     return false;
 }
 
 bool JSValueIsEqual(JSContextRef ctx, JSValueRef a, JSValueRef b, JSValueRef* exception)
 {
     }
     return false;
 }
 
 bool JSValueIsEqual(JSContextRef ctx, JSValueRef a, JSValueRef b, JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsA = toJS(exec, a);
     JSValue jsB = toJS(exec, b);
 
     bool result = JSValue::equal(exec, jsA, jsB); // false if an exception is thrown
     if (exec->hadException()) {
 
     JSValue jsA = toJS(exec, a);
     JSValue jsB = toJS(exec, b);
 
     bool result = JSValue::equal(exec, jsA, jsB); // false if an exception is thrown
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

     }
     return result;
 }
 
 bool JSValueIsStrictEqual(JSContextRef ctx, JSValueRef a, JSValueRef b)
 {
     }
     return result;
 }
 
 bool JSValueIsStrictEqual(JSContextRef ctx, JSValueRef a, JSValueRef b)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsA = toJS(exec, a);
     JSValue jsB = toJS(exec, b);
 
     JSValue jsA = toJS(exec, a);
     JSValue jsB = toJS(exec, b);


@@ -165,67 +236,142 @@ bool JSValueIsStrictEqual(JSContextRef ctx, JSValueRef a, JSValueRef b)
 
 bool JSValueIsInstanceOfConstructor(JSContextRef ctx, JSValueRef value, JSObjectRef constructor, JSValueRef* exception)
 {
 
 bool JSValueIsInstanceOfConstructor(JSContextRef ctx, JSValueRef value, JSObjectRef constructor, JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJS(exec, value);
 
     JSObject* jsConstructor = toJS(constructor);
     if (!jsConstructor->structure()->typeInfo().implementsHasInstance())
         return false;
 
     JSValue jsValue = toJS(exec, value);
 
     JSObject* jsConstructor = toJS(constructor);
     if (!jsConstructor->structure()->typeInfo().implementsHasInstance())
         return false;

-    bool result = jsConstructor->hasInstance(exec, jsValue, jsConstructor->get(exec, exec->propertyNames().prototype)); // false if an exception is thrown
+    bool result = jsConstructor->hasInstance(exec, jsValue); // false if an exception is thrown

     if (exec->hadException()) {
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

     }
     return result;
 }
 
 JSValueRef JSValueMakeUndefined(JSContextRef ctx)
 {
     }
     return result;
 }
 
 JSValueRef JSValueMakeUndefined(JSContextRef ctx)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     return toRef(exec, jsUndefined());
 }
 
 JSValueRef JSValueMakeNull(JSContextRef ctx)
 {
 
     return toRef(exec, jsUndefined());
 }
 
 JSValueRef JSValueMakeNull(JSContextRef ctx)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     return toRef(exec, jsNull());
 }
 
 JSValueRef JSValueMakeBoolean(JSContextRef ctx, bool value)
 {
 
     return toRef(exec, jsNull());
 }
 
 JSValueRef JSValueMakeBoolean(JSContextRef ctx, bool value)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     return toRef(exec, jsBoolean(value));
 }
 
 JSValueRef JSValueMakeNumber(JSContextRef ctx, double value)
 {
 
     return toRef(exec, jsBoolean(value));
 }
 
 JSValueRef JSValueMakeNumber(JSContextRef ctx, double value)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
 

-    return toRef(exec, jsNumber(exec, value));
+    return toRef(exec, jsNumber(purifyNaN(value)));

 }
 
 JSValueRef JSValueMakeString(JSContextRef ctx, JSStringRef string)
 {
 }
 
 JSValueRef JSValueMakeString(JSContextRef ctx, JSStringRef string)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }
+    ExecState* exec = toJS(ctx);
+    JSLockHolder locker(exec);
+
+    return toRef(exec, jsString(exec, string->string()));
+}
+
+JSValueRef JSValueMakeFromJSONString(JSContextRef ctx, JSStringRef string)
+{
+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);
+    String str = string->string();
+    unsigned length = str.length();
+    if (!length || str.is8Bit()) {
+        LiteralParser<LChar> parser(exec, str.characters8(), length, StrictJSON);
+        return toRef(exec, parser.tryLiteralParse());
+    }
+    LiteralParser<UChar> parser(exec, str.characters16(), length, StrictJSON);
+    return toRef(exec, parser.tryLiteralParse());
+}

 
 

-    return toRef(exec, jsString(exec, string->ustring()));
+JSStringRef JSValueCreateJSONString(JSContextRef ctx, JSValueRef apiValue, unsigned indent, JSValueRef* exception)
+{
+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }
+    ExecState* exec = toJS(ctx);
+    JSLockHolder locker(exec);
+    JSValue value = toJS(exec, apiValue);
+    String result = JSONStringify(exec, value, indent);
+    if (exception)
+        *exception = 0;
+    if (exec->hadException()) {
+        JSValue exceptionValue = exec->exception();
+        if (exception)
+            *exception = toRef(exec, exceptionValue);
+        exec->clearException();
+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif
+        return 0;
+    }
+    return OpaqueJSString::create(result).leakRef();

 }
 
 bool JSValueToBoolean(JSContextRef ctx, JSValueRef value)
 {
 }
 
 bool JSValueToBoolean(JSContextRef ctx, JSValueRef value)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJS(exec, value);
     return jsValue.toBoolean(exec);
 
     JSValue jsValue = toJS(exec, value);
     return jsValue.toBoolean(exec);


@@ -233,59 +379,87 @@ bool JSValueToBoolean(JSContextRef ctx, JSValueRef value)
 
 double JSValueToNumber(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {
 
 double JSValueToNumber(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return PNaN;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJS(exec, value);
 
     double number = jsValue.toNumber(exec);
     if (exec->hadException()) {
 
     JSValue jsValue = toJS(exec, value);
 
     double number = jsValue.toNumber(exec);
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

-        number = NaN;
+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif
+        number = PNaN;

     }
     return number;
 }
 
 JSStringRef JSValueToStringCopy(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {
     }
     return number;
 }
 
 JSStringRef JSValueToStringCopy(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJS(exec, value);
     
 
     JSValue jsValue = toJS(exec, value);
     

-    RefPtr<OpaqueJSString> stringRef(OpaqueJSString::create(jsValue.toString(exec)));
+    RefPtr<OpaqueJSString> stringRef(OpaqueJSString::create(jsValue.toString(exec)->value(exec)));

     if (exec->hadException()) {
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

         stringRef.clear();
     }
         stringRef.clear();
     }

-    return stringRef.release().releaseRef();
+    return stringRef.release().leakRef();

 }
 
 JSObjectRef JSValueToObject(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {
 }
 
 JSObjectRef JSValueToObject(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJS(exec, value);
     
     JSObjectRef objectRef = toRef(jsValue.toObject(exec));
     if (exec->hadException()) {
 
     JSValue jsValue = toJS(exec, value);
     
     JSObjectRef objectRef = toRef(jsValue.toObject(exec));
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

         objectRef = 0;
     }
     return objectRef;
         objectRef = 0;
     }
     return objectRef;

-}    
+}

 
 void JSValueProtect(JSContextRef ctx, JSValueRef value)
 {
 
 void JSValueProtect(JSContextRef ctx, JSValueRef value)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJSForGC(exec, value);
     gcProtect(jsValue);
 
     JSValue jsValue = toJSForGC(exec, value);
     gcProtect(jsValue);


@@ -293,8 +467,13 @@ void JSValueProtect(JSContextRef ctx, JSValueRef value)
 
 void JSValueUnprotect(JSContextRef ctx, JSValueRef value)
 {
 
 void JSValueUnprotect(JSContextRef ctx, JSValueRef value)
 {

+#if PLATFORM(MAC)
+    if ((!value || !ctx) && evernoteHackNeeded())
+        return;
+#endif
+

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsValue = toJSForGC(exec, value);
     gcUnprotect(jsValue);
 
     JSValue jsValue = toJSForGC(exec, value);
     gcUnprotect(jsValue);