diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/bindings/js/JSDOMGlobalObject.cpp | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/bindings/js/JSDOMGlobalObject.cpp')
-rw-r--r-- | Source/WebCore/bindings/js/JSDOMGlobalObject.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp b/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp index e0b5b89..a328ee9 100644 --- a/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp +++ b/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp @@ -53,14 +53,14 @@ void JSDOMGlobalObject::markChildren(MarkStack& markStack) JSDOMStructureMap::iterator end = structures().end(); for (JSDOMStructureMap::iterator it = structures().begin(); it != end; ++it) - markStack.append(it->second->storedPrototype()); + markStack.append(it->second->storedPrototypeSlot()); JSDOMConstructorMap::iterator end2 = constructors().end(); for (JSDOMConstructorMap::iterator it2 = constructors().begin(); it2 != end2; ++it2) - markStack.append(it2->second); + markStack.append(&it2->second); if (d()->m_injectedScript) - markStack.append(d()->m_injectedScript); + markStack.append(&d()->m_injectedScript); } void JSDOMGlobalObject::setCurrentEvent(Event* evt) @@ -75,12 +75,12 @@ Event* JSDOMGlobalObject::currentEvent() const void JSDOMGlobalObject::setInjectedScript(JSObject* injectedScript) { - d()->m_injectedScript = injectedScript; + d()->m_injectedScript.set(globalData(), this, injectedScript); } JSObject* JSDOMGlobalObject::injectedScript() const { - return d()->m_injectedScript; + return d()->m_injectedScript.get(); } void JSDOMGlobalObject::destroyJSDOMGlobalObjectData(void* jsDOMGlobalObjectData) |