Changeset 91116 in webkit

Timestamp:

Jul 15, 2011 3:03:09 PM (13 years ago)

Author:

barraclough@apple.com

Message:

NativeError.prototype objects have Class? of "Object" but should be "Error"
​https://bugs.webkit.org/show_bug.cgi?id=55346

Reviewed by Sam Weinig.

Source/JavaScriptCore:

• runtime/ErrorPrototype.cpp:

(JSC::ErrorPrototype::ErrorPrototype):

• Switch to putDirect since we're not the only ones tranitioning this Structure now.

• runtime/NativeErrorPrototype.cpp:

(JSC::NativeErrorPrototype::NativeErrorPrototype):

• runtime/NativeErrorPrototype.h:
  • Switch base class to ErrorPrototype.

LayoutTests:

Added test case.

• fast/js/native-error-prototype-expected.txt: Added.
• fast/js/native-error-prototype.html: Added.
• fast/js/script-tests/native-error-prototype.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/native-error-prototype-expected.txt (added)
• LayoutTests/fast/js/native-error-prototype.html (added)
• LayoutTests/fast/js/script-tests/native-error-prototype.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/ErrorPrototype.cpp (modified) (1 diff)
• Source/JavaScriptCore/runtime/NativeErrorPrototype.cpp (modified) (2 diffs)
• Source/JavaScriptCore/runtime/NativeErrorPrototype.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-15  Gavin Barraclough  <barraclough@apple.com>
+
+        NativeError.prototype objects have [[Class]] of "Object" but should be "Error"
+        https://bugs.webkit.org/show_bug.cgi?id=55346
+
+        Reviewed by Sam Weinig.
+
+        Added test case.
+
+        * fast/js/native-error-prototype-expected.txt: Added.
+        * fast/js/native-error-prototype.html: Added.
+        * fast/js/script-tests/native-error-prototype.js: Added.
+
 2011-06-27  Adrienne Walker  <enne@google.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-07-15  Gavin Barraclough  <barraclough@apple.com>
+
+        NativeError.prototype objects have [[Class]] of "Object" but should be "Error"
+        https://bugs.webkit.org/show_bug.cgi?id=55346
+
+        Reviewed by Sam Weinig.
+
+        * runtime/ErrorPrototype.cpp:
+        (JSC::ErrorPrototype::ErrorPrototype):
+            - Switch to putDirect since we're not the only ones tranitioning this Structure now.
+        * runtime/NativeErrorPrototype.cpp:
+        (JSC::NativeErrorPrototype::NativeErrorPrototype):
+        * runtime/NativeErrorPrototype.h:
+            - Switch base class to ErrorPrototype.
+
 2011-07-15  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp

@@ -54 +54 @@
     : ErrorInstance(&exec->globalData(), structure)
 {
-    putDirectWithoutTransition(exec->globalData(), exec->propertyNames().name, jsNontrivialString(exec, "Error"), DontEnum);
+    putDirect(exec->globalData(), exec->propertyNames().name, jsNontrivialString(exec, "Error"), DontEnum);
 
     ASSERT(inherits(&s_info));

trunk/Source/JavaScriptCore/runtime/NativeErrorPrototype.cpp

@@ -22 +22 @@
 #include "NativeErrorPrototype.h"
 
-#include "ErrorPrototype.h"
 #include "JSGlobalObject.h"
 #include "JSString.h"
@@ -33 +32 @@
 
 NativeErrorPrototype::NativeErrorPrototype(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, const UString& nameAndMessage, NativeErrorConstructor* constructor)
-    : JSObjectWithGlobalObject(globalObject, structure)
+    : ErrorPrototype(exec, globalObject, structure)
 {
     putDirect(exec->globalData(), exec->propertyNames().name, jsString(exec, nameAndMessage), DontEnum);

trunk/Source/JavaScriptCore/runtime/NativeErrorPrototype.h

@@ -22 +22 @@
 #define NativeErrorPrototype_h
 
-#include "JSObjectWithGlobalObject.h"
+#include "ErrorPrototype.h"
 
 namespace JSC {
     class NativeErrorConstructor;
 
-    class NativeErrorPrototype : public JSObjectWithGlobalObject {
+    class NativeErrorPrototype : public ErrorPrototype {
     public:
         NativeErrorPrototype(ExecState*, JSGlobalObject*, Structure*, const UString&, NativeErrorConstructor*);