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

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

Issue 2706963004: Clear opener when frame is detached. (Closed)
Patch Set: addressing comments Created 3 years, 10 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
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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 m_nextSibling(0), 284 m_nextSibling(0),
285 m_firstChild(0), 285 m_firstChild(0),
286 m_lastChild(0), 286 m_lastChild(0),
287 m_opener(0), 287 m_opener(0),
288 m_openedFrameTracker(new OpenedFrameTracker) {} 288 m_openedFrameTracker(new OpenedFrameTracker) {}
289 289
290 WebFrame::~WebFrame() { 290 WebFrame::~WebFrame() {
291 m_openedFrameTracker.reset(0); 291 m_openedFrameTracker.reset(0);
292 } 292 }
293 293
294 ALWAYS_INLINE bool WebFrame::isFrameAlive(const WebFrame* frame) {
295 if (!frame)
296 return true;
297
298 if (frame->isWebLocalFrame())
299 return ThreadHeap::isHeapObjectAlive(toWebLocalFrameImpl(frame));
300
301 return ThreadHeap::isHeapObjectAlive(toWebRemoteFrameImpl(frame));
302 }
303
304 void WebFrame::traceFrame(Visitor* visitor, WebFrame* frame) { 294 void WebFrame::traceFrame(Visitor* visitor, WebFrame* frame) {
305 if (!frame) 295 if (!frame)
306 return; 296 return;
307 297
308 if (frame->isWebLocalFrame()) 298 if (frame->isWebLocalFrame())
309 visitor->trace(toWebLocalFrameImpl(frame)); 299 visitor->trace(toWebLocalFrameImpl(frame));
310 else 300 else
311 visitor->trace(toWebRemoteFrameImpl(frame)); 301 visitor->trace(toWebRemoteFrameImpl(frame));
312 } 302 }
313 303
314 void WebFrame::traceFrames(Visitor* visitor, WebFrame* frame) { 304 void WebFrame::traceFrames(Visitor* visitor, WebFrame* frame) {
315 DCHECK(frame); 305 DCHECK(frame);
316 traceFrame(visitor, frame->m_parent); 306 traceFrame(visitor, frame->m_parent);
317 for (WebFrame* child = frame->firstChild(); child; 307 for (WebFrame* child = frame->firstChild(); child;
318 child = child->nextSibling()) 308 child = child->nextSibling())
319 traceFrame(visitor, child); 309 traceFrame(visitor, child);
320 // m_opener is a weak reference.
321 frame->m_openedFrameTracker->traceFrames(visitor);
322 } 310 }
323 311
324 void WebFrame::clearWeakFrames(Visitor* visitor) { 312 void WebFrame::close() {
325 if (!isFrameAlive(m_opener)) 313 m_openedFrameTracker->dispose();
326 m_opener = nullptr;
327 } 314 }
328 315
329 } // namespace blink 316 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/OpenedFrameTracker.cpp ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698