diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-08 08:06:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-08 08:06:12 -0700 |
| commit | ecc88dcc9bcc917892396ed149e0c254b4b177a3 (patch) | |
| tree | 97bd9a643e1a96528201d293ed499eea1fba33d6 /WebCore/bindings/js/ScriptController.cpp | |
| parent | d88ddb512f90bbb26b918b3e0bcebf5a636ba19b (diff) | |
| parent | df1815070cfd8d2ed6f7101d1b8d60d037c839e6 (diff) | |
| download | external_webkit-ecc88dcc9bcc917892396ed149e0c254b4b177a3.zip external_webkit-ecc88dcc9bcc917892396ed149e0c254b4b177a3.tar.gz external_webkit-ecc88dcc9bcc917892396ed149e0c254b4b177a3.tar.bz2 | |
Merge change 3067 into donut
* changes:
browser security patches
Diffstat (limited to 'WebCore/bindings/js/ScriptController.cpp')
| -rw-r--r-- | WebCore/bindings/js/ScriptController.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebCore/bindings/js/ScriptController.cpp b/WebCore/bindings/js/ScriptController.cpp index efd3a70..11d2945 100644 --- a/WebCore/bindings/js/ScriptController.cpp +++ b/WebCore/bindings/js/ScriptController.cpp @@ -133,7 +133,6 @@ void ScriptController::clearWindowShell() JSLock lock(false); m_windowShell->window()->clear(); - m_liveFormerWindows.add(m_windowShell->window()); m_windowShell->setWindow(m_frame->domWindow()); if (Page* page = m_frame->page()) { attachDebugger(page->debugger()); @@ -168,7 +167,7 @@ void ScriptController::initScript() JSLock lock(false); m_windowShell = new JSDOMWindowShell(m_frame->domWindow()); - updateDocument(); + m_windowShell->window()->updateDocument(); if (Page* page = m_frame->page()) { attachDebugger(page->debugger()); @@ -265,9 +264,6 @@ void ScriptController::updateDocument() JSLock lock(false); if (m_windowShell) m_windowShell->window()->updateDocument(); - HashSet<JSDOMWindow*>::iterator end = m_liveFormerWindows.end(); - for (HashSet<JSDOMWindow*>::iterator it = m_liveFormerWindows.begin(); it != end; ++it) - (*it)->updateDocument(); } void ScriptController::updateSecurityOrigin() |