Changeset 164491 in webkit for trunk/Source/JavaScriptCore/API/JSValue.mm

Timestamp:

Feb 21, 2014, 12:18:59 PM (11 years ago)

Author:

Joseph Pecoraro

Message:

Revert r164486, causing a number of test failures.

Source/JavaScriptCore:

Unreviewed rollout.

Source/WebCore:

Unreviewed rollout.

Source/WebInspectorUI:

Unreviewed rollout.

File:

• trunk/Source/JavaScriptCore/API/JSValue.mm (modified) (5 diffs)

trunk/Source/JavaScriptCore/API/JSValue.mm

@@ -21 +21 @@
  * 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. 
  */
 
@@ -48 +48 @@
 #import <wtf/text/StringHash.h>
 
-#if ENABLE(REMOTE_INSPECTOR)
-#import "CallFrame.h"
-#import "JSGlobalObject.h"
-#import "JSGlobalObjectInspectorController.h"
-#endif
-
 #if JSC_OBJC_API_ENABLED
 
@@ -635 +629 @@
     return last;
 }
-
-#if ENABLE(REMOTE_INSPECTOR)
-static void reportExceptionToInspector(JSGlobalContextRef context, JSC::JSValue exception)
-{
-    JSC::ExecState* exec = toJS(context);
-    exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exception);
-}
-#endif
 
 static JSContainerConvertor::Task valueToObjectWithoutCopy(JSGlobalContextRef context, JSValueRef value)
@@ -796 +782 @@
 
     JSC::APIEntryShim shim(toJS(context));
-    if (!(JSValueIsNull(context, value) || JSValueIsUndefined(context, value))) {
-        JSC::JSObject* exceptionObject = JSC::createTypeError(toJS(context), ASCIILiteral("Cannot convert primitive to NSArray"));
-        *exception = toRef(exceptionObject);
-#if ENABLE(REMOTE_INSPECTOR)
-        reportExceptionToInspector(context, exceptionObject);
-#endif
-    }
+    if (!(JSValueIsNull(context, value) || JSValueIsUndefined(context, value)))
+        *exception = toRef(JSC::createTypeError(toJS(context), ASCIILiteral("Cannot convert primitive to NSArray")));
     return nil;
 }
@@ -818 +799 @@
 
     JSC::APIEntryShim shim(toJS(context));
-    if (!(JSValueIsNull(context, value) || JSValueIsUndefined(context, value))) {
-        JSC::JSObject* exceptionObject = JSC::createTypeError(toJS(context), ASCIILiteral("Cannot convert primitive to NSDictionary"));
-        *exception = toRef(exceptionObject);
-#if ENABLE(REMOTE_INSPECTOR)
-        reportExceptionToInspector(context, exceptionObject);
-#endif
-    }
+    if (!(JSValueIsNull(context, value) || JSValueIsUndefined(context, value)))
+        *exception = toRef(JSC::createTypeError(toJS(context), ASCIILiteral("Cannot convert primitive to NSDictionary")));
     return nil;
 }