Changeset 98909 in webkit for trunk/Source/JavaScriptCore/runtime/JSObject.cpp

Timestamp:

Oct 31, 2011, 4:43:58 PM (14 years ago)

Author:

[email protected]

Message:

Remove need for virtual JSObject::unwrappedObject
​https://bugs.webkit.org/show_bug.cgi?id=71034

Reviewed by Geoffrey Garen.

../JavaScriptCore:

• JavaScriptCore.exp:

Update exports.

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.exp:
• JavaScriptCore.gypi:
• JavaScriptCore.pro:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:

Add JSGlobalThis.cpp.

• runtime/JSGlobalThis.cpp: Added.

(JSC::JSGlobalThis::visitChildren):
(JSC::JSGlobalThis::unwrappedObject):

• runtime/JSGlobalThis.h:

(JSC::JSGlobalThis::createStructure):
Move underlying object from JSDOMWindowShell down to JSGlobalThis
and corresponding visitChildren method.

• runtime/JSObject.cpp:

(JSC::JSObject::unwrappedObject):
Change unwrappedObject from virtual, to just needing an if check.

• runtime/JSObject.h:

(JSC::JSObject::isGlobalThis):

• runtime/JSType.h:

Add isGlobalThis predicate and type.

../WebCore:

Move the member containing the global object from the JSDOMWindowShell
down to the JSGlobalThis class, and update JSDOMWindowShell to go through
an inline helper (which just casts) to get the window.

• bindings/js/JSDOMWindowShell.cpp:

(WebCore::JSDOMWindowShell::setWindow):
(WebCore::JSDOMWindowShell::className):
(WebCore::JSDOMWindowShell::getOwnPropertySlot):
(WebCore::JSDOMWindowShell::getOwnPropertyDescriptor):
(WebCore::JSDOMWindowShell::put):
(WebCore::JSDOMWindowShell::putWithAttributes):
(WebCore::JSDOMWindowShell::defineOwnProperty):
(WebCore::JSDOMWindowShell::deleteProperty):
(WebCore::JSDOMWindowShell::getPropertyNames):
(WebCore::JSDOMWindowShell::getOwnPropertyNames):
(WebCore::JSDOMWindowShell::defineGetter):
(WebCore::JSDOMWindowShell::defineSetter):
(WebCore::JSDOMWindowShell::lookupGetter):
(WebCore::JSDOMWindowShell::lookupSetter):
(WebCore::JSDOMWindowShell::impl):

• bindings/js/JSDOMWindowShell.h:

(WebCore::JSDOMWindowShell::window):
(WebCore::JSDOMWindowShell::setWindow):
(WebCore::JSDOMWindowShell::createStructure):

File:

• trunk/Source/JavaScriptCore/runtime/JSObject.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -30 +30 @@
 #include "JSFunction.h"
 #include "JSGlobalObject.h"
+#include "JSGlobalThis.h"
+#include "Lookup.h"
 #include "NativeErrorConstructor.h"
+#include "Nodes.h"
 #include "ObjectPrototype.h"
+#include "Operations.h"
 #include "PropertyDescriptor.h"
 #include "PropertyNameArray.h"
-#include "Lookup.h"
-#include "Nodes.h"
-#include "Operations.h"
 #include <math.h>
 #include <wtf/Assertions.h>
@@ -565 +566 @@
 JSObject* JSObject::unwrappedObject()
 {
+    if (isGlobalThis())
+        return static_cast<JSGlobalThis*>(this)->unwrappedObject();
     return this;
 }