Changeset 35007 in webkit for trunk/JavaScriptCore/kjs/JSObject.cpp

Timestamp:

Jul 4, 2008, 10:35:09 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-07-04 Sam Weinig <​[email protected]>

Rubber-stamped by Dan Bernstein.

Split Error and GetterSetter out of JSObject.h.

• API/JSCallbackObjectFunctions.h:
• GNUmakefile.am:
• JavaScriptCore.pri:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• JavaScriptCoreSources.bkl:
• kjs/AllInOneFile.cpp:
• kjs/ClassInfo.h: Copied from JavaScriptCore/kjs/JSObject.h.
• kjs/Error.cpp: Copied from JavaScriptCore/kjs/JSObject.cpp.
• kjs/Error.h: Copied from JavaScriptCore/kjs/JSObject.h.
• kjs/GetterSetter.cpp:
• kjs/GetterSetter.h: Copied from JavaScriptCore/kjs/JSObject.h.
• kjs/JSObject.cpp:
• kjs/JSObject.h:
• kjs/nodes.h:

JavaScriptGlue:

2008-07-04 Sam Weinig <​[email protected]>

Rubber-stamped by Dan Bernstein.

• JSObject.h: Rename the header guard as it now conflicts with the JSObject in JavaScriptCore.

WebCore:

2008-07-04 Sam Weinig <​[email protected]>

Rubber-stamped by Dan Bernstein.

Split Error and GetterSetter out of JSObject.h.

• ForwardingHeaders/kjs/Error.h: Added.
• bindings/js/JSCanvasRenderingContext2DCustom.cpp:
• bindings/js/JSClipboardCustom.cpp:
• bindings/js/JSDOMWindowBase.cpp:
• bindings/js/JSEventTargetBase.cpp:
• bindings/js/JSHTMLDocumentCustom.cpp:
• bindings/js/JSXMLHttpRequestCustom.cpp:
• bindings/scripts/CodeGeneratorJS.pm:
• bridge/NP_jsobject.cpp:
• bridge/jni/jni_instance.cpp:
• bridge/jni/jni_runtime.cpp:
• bridge/objc/objc_instance.mm:
• bridge/objc/objc_runtime.mm:
• bridge/objc/objc_utility.h:
• bridge/runtime_array.cpp:
• bridge/runtime_method.cpp:
• bridge/runtime_object.cpp:

File:

• trunk/JavaScriptCore/kjs/JSObject.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/JSObject.cpp

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
 /*
  *  Copyright (C) 1999-2001 Harri Porten ([email protected])
@@ -28 +27 @@
 #include "DatePrototype.h"
 #include "ErrorConstructor.h"
+#include "GetterSetter.h"
 #include "JSGlobalObject.h"
 #include "NativeErrorConstructor.h"
@@ -42 +42 @@
 
 namespace KJS {
-
-// ------------------------------ JSObject ------------------------------------
 
 void JSObject::mark()
@@ -480 +478 @@
 }
 
-// ------------------------------ Error ----------------------------------------
-
-JSObject* Error::create(ExecState* exec, ErrorType errtype, const UString& message,
-    int lineno, int sourceId, const UString& sourceURL)
-{
-  JSObject* cons;
-  const char* name;
-  switch (errtype) {
-  case EvalError:
-    cons = exec->lexicalGlobalObject()->evalErrorConstructor();
-    name = "Evaluation error";
-    break;
-  case RangeError:
-    cons = exec->lexicalGlobalObject()->rangeErrorConstructor();
-    name = "Range error";
-    break;
-  case ReferenceError:
-    cons = exec->lexicalGlobalObject()->referenceErrorConstructor();
-    name = "Reference error";
-    break;
-  case SyntaxError:
-    cons = exec->lexicalGlobalObject()->syntaxErrorConstructor();
-    name = "Syntax error";
-    break;
-  case TypeError:
-    cons = exec->lexicalGlobalObject()->typeErrorConstructor();
-    name = "Type error";
-    break;
-  case URIError:
-    cons = exec->lexicalGlobalObject()->URIErrorConstructor();
-    name = "URI error";
-    break;
-  default:
-    cons = exec->lexicalGlobalObject()->errorConstructor();
-    name = "Error";
-    break;
-  }
-
-  ArgList args;
-  if (message.isEmpty())
-    args.append(jsString(exec, name));
-  else
-    args.append(jsString(exec, message));
-  ConstructData constructData;
-  ConstructType constructType = cons->getConstructData(constructData);
-  JSObject* err = construct(exec, cons, constructType, constructData, args);
-
-  if (lineno != -1)
-    err->put(exec, Identifier(exec, "line"), jsNumber(exec, lineno));
-  if (sourceId != -1)
-    err->put(exec, Identifier(exec, "sourceId"), jsNumber(exec, sourceId));
-
-  if(!sourceURL.isNull())
-    err->put(exec, Identifier(exec, "sourceURL"), jsString(exec, sourceURL));
- 
-  return err;
-}
-
-JSObject *Error::create(ExecState *exec, ErrorType type, const char *message)
-{
-    return create(exec, type, message, -1, -1, NULL);
-}
-
-JSObject *throwError(ExecState *exec, ErrorType type)
-{
-    JSObject *error = Error::create(exec, type, UString(), -1, -1, NULL);
-    exec->setException(error);
-    return error;
-}
-
-JSObject *throwError(ExecState *exec, ErrorType type, const UString &message)
-{
-    JSObject *error = Error::create(exec, type, message, -1, -1, NULL);
-    exec->setException(error);
-    return error;
-}
-
-JSObject *throwError(ExecState *exec, ErrorType type, const char *message)
-{
-    JSObject *error = Error::create(exec, type, message, -1, -1, NULL);
-    exec->setException(error);
-    return error;
-}
-
-JSObject *throwError(ExecState *exec, ErrorType type, const UString &message, int line, int sourceId, const UString &sourceURL)
-{
-    JSObject *error = Error::create(exec, type, message, line, sourceId, sourceURL);
-    exec->setException(error);
-    return error;
-}
-
 JSObject* constructEmptyObject(ExecState* exec)
 {