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

Side by Side Diff: third_party/WebKit/Source/core/page/FrameTree.cpp

Issue 1469583002: Remove more superfluous calls to clear frame views during destruction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/core/frame/RemoteFrame.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 /* 1 /*
2 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
3 * Copyright (C) 2006 Apple Computer, Inc. 3 * Copyright (C) 2006 Apple Computer, Inc.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 } // namespace 43 } // namespace
44 44
45 FrameTree::FrameTree(Frame* thisFrame) 45 FrameTree::FrameTree(Frame* thisFrame)
46 : m_thisFrame(thisFrame) 46 : m_thisFrame(thisFrame)
47 , m_scopedChildCount(invalidChildCount) 47 , m_scopedChildCount(invalidChildCount)
48 { 48 {
49 } 49 }
50 50
51 FrameTree::~FrameTree() 51 FrameTree::~FrameTree()
52 { 52 {
53 #if !ENABLE(OILPAN)
54 // FIXME: Why is this here? Doesn't this parallel what we already do in ~Loc alFrame?
55 for (Frame* child = firstChild(); child; child = child->tree().nextSibling() ) {
56 if (child->isLocalFrame())
57 toLocalFrame(child)->setView(nullptr);
58 else if (child->isRemoteFrame())
59 toRemoteFrame(child)->setView(nullptr);
60 }
61 #endif
62 } 53 }
63 54
64 void FrameTree::setName(const AtomicString& name, const AtomicString& fallbackNa me) 55 void FrameTree::setName(const AtomicString& name, const AtomicString& fallbackNa me)
65 { 56 {
66 m_name = name; 57 m_name = name;
67 if (!parent()) { 58 if (!parent()) {
68 m_uniqueName = name; 59 m_uniqueName = name;
69 return; 60 return;
70 } 61 }
71 m_uniqueName = AtomicString(); // Remove our old frame name so it's not cons idered in uniqueChildName. 62 m_uniqueName = AtomicString(); // Remove our old frame name so it's not cons idered in uniqueChildName.
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 { 398 {
408 if (!frame) { 399 if (!frame) {
409 printf("Null input frame\n"); 400 printf("Null input frame\n");
410 return; 401 return;
411 } 402 }
412 403
413 printFrames(frame->tree().top(), frame, 0); 404 printFrames(frame->tree().top(), frame, 0);
414 } 405 }
415 406
416 #endif 407 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/RemoteFrame.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698