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/JSDOMWindowShell.h | |
| 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/JSDOMWindowShell.h')
| -rw-r--r-- | Source/WebCore/bindings/js/JSDOMWindowShell.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/bindings/js/JSDOMWindowShell.h b/Source/WebCore/bindings/js/JSDOMWindowShell.h index 888325d..d585fd4 100644 --- a/Source/WebCore/bindings/js/JSDOMWindowShell.h +++ b/Source/WebCore/bindings/js/JSDOMWindowShell.h @@ -43,11 +43,11 @@ namespace WebCore { JSDOMWindowShell(PassRefPtr<DOMWindow>, DOMWrapperWorld* world); virtual ~JSDOMWindowShell(); - JSDOMWindow* window() const { return m_window; } - void setWindow(JSDOMWindow* window) + JSDOMWindow* window() const { return m_window.get(); } + void setWindow(JSC::JSGlobalData& globalData, JSDOMWindow* window) { ASSERT_ARG(window, window); - m_window = window; + m_window.set(globalData, this, window); setPrototype(window->prototype()); } void setWindow(PassRefPtr<DOMWindow>); @@ -85,7 +85,7 @@ namespace WebCore { virtual JSC::JSObject* unwrappedObject(); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } - JSDOMWindow* m_window; + JSC::WriteBarrier<JSDOMWindow> m_window; RefPtr<DOMWrapperWorld> m_world; }; |