Changeset 53785 in webkit

Timestamp:

Jan 24, 2010 2:54:18 PM (14 years ago)

Author:

oliver@apple.com

Message:

2010-01-24 Oliver Hunt <​oliver@apple.com>

Reviewed by Darin Adler.

Object Serialization assumes deserialization will always occur in the context of a webpage
​https://bugs.webkit.org/show_bug.cgi?id=34056
rdar://7573833

Added ClassInfo to JSDOMGlobalObject and make the window and worker class info
inherit from it. With this in place we're able to determine whether a given
global object is a DOMGlobalObject, and then use that information to avoid
attempting to deserialize types that require the presence of the DOM.

No test as all global objects in webkit inherit from JSDOMGlobalObject.

• bindings/js/JSDOMGlobalObject.cpp: (WebCore::):
• bindings/js/JSDOMGlobalObject.h: (WebCore::JSDOMGlobalObject::classInfo):
• bindings/js/JSDOMWindowBase.cpp: (WebCore::):
• bindings/js/JSWorkerContextBase.cpp: (WebCore::):
• bindings/js/SerializedScriptValue.cpp: (WebCore::DeserializingTreeWalker::DeserializingTreeWalker): (WebCore::DeserializingTreeWalker::convertIfTerminal):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMGlobalObject.cpp (modified) (1 diff)
• bindings/js/JSDOMGlobalObject.h (modified) (1 diff)
• bindings/js/JSDOMWindowBase.cpp (modified) (1 diff)
• bindings/js/JSWorkerContextBase.cpp (modified) (1 diff)
• bindings/js/SerializedScriptValue.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-24  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Object Serialization assumes deserialization will always occur in the context of a webpage
+        https://bugs.webkit.org/show_bug.cgi?id=34056
+        rdar://7573833
+
+        Added ClassInfo to JSDOMGlobalObject and make the window and worker class info
+        inherit from it.  With this in place we're able to determine whether a given
+        global object is a DOMGlobalObject, and then use that information to avoid
+        attempting to deserialize types that require the presence of the DOM.
+
+        No test as all global objects in webkit inherit from JSDOMGlobalObject.
+
+        * bindings/js/JSDOMGlobalObject.cpp:
+        (WebCore::):
+        * bindings/js/JSDOMGlobalObject.h:
+        (WebCore::JSDOMGlobalObject::classInfo):
+        * bindings/js/JSDOMWindowBase.cpp:
+        (WebCore::):
+        * bindings/js/JSWorkerContextBase.cpp:
+        (WebCore::):
+        * bindings/js/SerializedScriptValue.cpp:
+        (WebCore::DeserializingTreeWalker::DeserializingTreeWalker):
+        (WebCore::DeserializingTreeWalker::convertIfTerminal):
+
 2010-01-24  Eric Carlson  <eric.carlson@apple.com>
 

trunk/WebCore/bindings/js/JSDOMGlobalObject.cpp

@@ -40 +40 @@
 
 namespace WebCore {
+
+const ClassInfo JSDOMGlobalObject::s_info = { "DOMGlobalObject", 0, 0, 0 };
 
 JSDOMGlobalObject::JSDOMGlobalObject(NonNullPassRefPtr<Structure> structure, JSDOMGlobalObject::JSDOMGlobalObjectData* data, JSObject* thisValue)

trunk/WebCore/bindings/js/JSDOMGlobalObject.h

@@ -68 +68 @@
         DOMWrapperWorld* world() { return d()->m_world.get(); }
 
+        virtual const JSC::ClassInfo* classInfo() const { return &s_info; }
+        static const JSC::ClassInfo s_info;
+
     protected:
         struct JSDOMGlobalObjectData : public JSC::JSGlobalObject::JSGlobalObjectData {

trunk/WebCore/bindings/js/JSDOMWindowBase.cpp

@@ -42 +42 @@
 namespace WebCore {
 
-const ClassInfo JSDOMWindowBase::s_info = { "Window", 0, 0, 0 };
+const ClassInfo JSDOMWindowBase::s_info = { "Window", &JSDOMGlobalObject::s_info, 0, 0 };
 
 JSDOMWindowBase::JSDOMWindowBaseData::JSDOMWindowBaseData(PassRefPtr<DOMWindow> window, JSDOMWindowShell* shell)

trunk/WebCore/bindings/js/JSWorkerContextBase.cpp

@@ -43 +43 @@
 ASSERT_CLASS_FITS_IN_CELL(JSWorkerContextBase);
 
-const ClassInfo JSWorkerContextBase::s_info = { "WorkerContext", 0, 0, 0 };
+const ClassInfo JSWorkerContextBase::s_info = { "WorkerContext", &JSDOMGlobalObject::s_info, 0, 0 };
 
 JSWorkerContextBase::JSWorkerContextBase(NonNullPassRefPtr<JSC::Structure> structure, PassRefPtr<WorkerContext> impl)

trunk/WebCore/bindings/js/SerializedScriptValue.cpp

@@ -615 +615 @@
     DeserializingTreeWalker(ExecState* exec, bool mustCopy)
         : BaseWalker(exec)
+        , m_globalObject(exec->lexicalGlobalObject())
+        , m_isDOMGlobalObject(m_globalObject->inherits(&JSDOMGlobalObject::s_info))
         , m_mustCopy(mustCopy)
     {
@@ -695 +697 @@
                 return new (m_exec) DateInstance(m_exec, value.asDouble());
             case SerializedScriptValueData::FileType:
+                if (!m_isDOMGlobalObject)
+                    return jsNull();
                 return toJS(m_exec, static_cast<JSDOMGlobalObject*>(m_exec->lexicalGlobalObject()), File::create(value.asString().crossThreadString()));
             case SerializedScriptValueData::FileListType: {
+                if (!m_isDOMGlobalObject)
+                    return jsNull();
                 RefPtr<FileList> result = FileList::create();
                 SerializedFileList* serializedFileList = value.asFileList();
@@ -747 +753 @@
 
 private:
+    JSGlobalObject* m_globalObject;
+    bool m_isDOMGlobalObject;
     bool m_mustCopy;
 };