Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: third_party/WebKit/Source/web/WebFrame.cpp

Issue 2764883003: Make context initialization order deterministic in WebFrame::swap(). (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "public/web/WebFrame.h" 5 #include "public/web/WebFrame.h"
6 6
7 #include "bindings/core/v8/WindowProxyManager.h" 7 #include "bindings/core/v8/WindowProxyManager.h"
8 #include "core/HTMLNames.h" 8 #include "core/HTMLNames.h"
9 #include "core/frame/FrameHost.h" 9 #include "core/frame/FrameHost.h"
10 #include "core/frame/FrameView.h" 10 #include "core/frame/FrameView.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 setOpener(nullptr); 66 setOpener(nullptr);
67 } 67 }
68 m_openedFrameTracker->transferTo(frame); 68 m_openedFrameTracker->transferTo(frame);
69 69
70 FrameHost* host = oldFrame->host(); 70 FrameHost* host = oldFrame->host();
71 AtomicString name = oldFrame->tree().name(); 71 AtomicString name = oldFrame->tree().name();
72 AtomicString uniqueName = oldFrame->tree().uniqueName(); 72 AtomicString uniqueName = oldFrame->tree().uniqueName();
73 FrameOwner* owner = oldFrame->owner(); 73 FrameOwner* owner = oldFrame->owner();
74 74
75 v8::HandleScope handleScope(v8::Isolate::GetCurrent()); 75 v8::HandleScope handleScope(v8::Isolate::GetCurrent());
76 HashMap<DOMWrapperWorld*, v8::Local<v8::Object>> globals; 76 WindowProxyManagerBase::GlobalsVector globals;
77 oldFrame->getWindowProxyManager()->clearForNavigation(); 77 oldFrame->getWindowProxyManager()->clearForNavigation();
78 oldFrame->getWindowProxyManager()->releaseGlobals(globals); 78 oldFrame->getWindowProxyManager()->releaseGlobals(globals);
79 79
80 // Although the Document in this frame is now unloaded, many resources 80 // Although the Document in this frame is now unloaded, many resources
81 // associated with the frame itself have not yet been freed yet. 81 // associated with the frame itself have not yet been freed yet.
82 oldFrame->detach(FrameDetachType::Swap); 82 oldFrame->detach(FrameDetachType::Swap);
83 83
84 // Clone the state of the current Frame into the one being swapped in. 84 // Clone the state of the current Frame into the one being swapped in.
85 // FIXME: This is a bit clunky; this results in pointless decrements and 85 // FIXME: This is a bit clunky; this results in pointless decrements and
86 // increments of connected subframes. 86 // increments of connected subframes.
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 for (WebFrame* child = frame->firstChild(); child; 308 for (WebFrame* child = frame->firstChild(); child;
309 child = child->nextSibling()) 309 child = child->nextSibling())
310 traceFrame(visitor, child); 310 traceFrame(visitor, child);
311 } 311 }
312 312
313 void WebFrame::close() { 313 void WebFrame::close() {
314 m_openedFrameTracker->dispose(); 314 m_openedFrameTracker->dispose();
315 } 315 }
316 316
317 } // namespace blink 317 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698