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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 267303004: Oilpan: cleanup based on review comments after removal of TreeShared. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix typo and merge Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/dom/ScriptLoader.cpp » ('j') | 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 2230 matching lines...) Expand 10 before | Expand all | Expand 10 after
2241 // or this setting of the frame to 0 could be made explicit in each of the 2241 // or this setting of the frame to 0 could be made explicit in each of the
2242 // callers of Document::detach(). 2242 // callers of Document::detach().
2243 m_frame = 0; 2243 m_frame = 0;
2244 2244
2245 if (m_mediaQueryMatcher) 2245 if (m_mediaQueryMatcher)
2246 m_mediaQueryMatcher->documentDestroyed(); 2246 m_mediaQueryMatcher->documentDestroyed();
2247 2247
2248 lifecycleNotifier().notifyDocumentWasDetached(); 2248 lifecycleNotifier().notifyDocumentWasDetached();
2249 m_lifecycle.advanceTo(DocumentLifecycle::Stopped); 2249 m_lifecycle.advanceTo(DocumentLifecycle::Stopped);
2250 #if ENABLE(OILPAN) 2250 #if ENABLE(OILPAN)
2251 // FIXME: Oilpan: With Oilpan dispose should not be needed. At
2252 // this point we still have dispose in order to clear out some
2253 // RefPtrs that would otherwise cause leaks. However, when the
2254 // Document is detached the document can still be alive, so we
2255 // really shouldn't clear anything at this point. It should just
2256 // die with the document when the document is no longer reachable.
2251 dispose(); 2257 dispose();
2252 #endif 2258 #endif
2253 } 2259 }
2254 2260
2255 void Document::prepareForDestruction() 2261 void Document::prepareForDestruction()
2256 { 2262 {
2257 m_markers->prepareForDestruction(); 2263 m_markers->prepareForDestruction();
2258 disconnectDescendantFrames(); 2264 disconnectDescendantFrames();
2259 2265
2260 // The process of disconnecting descendant frames could have already detache d us. 2266 // The process of disconnecting descendant frames could have already detache d us.
(...skipping 3441 matching lines...) Expand 10 before | Expand all | Expand 10 after
5702 visitor->trace(m_visibilityObservers); 5708 visitor->trace(m_visibilityObservers);
5703 visitor->trace(m_userActionElements); 5709 visitor->trace(m_userActionElements);
5704 visitor->registerWeakMembers<Document, &Document::clearWeakMembers>(this); 5710 visitor->registerWeakMembers<Document, &Document::clearWeakMembers>(this);
5705 DocumentSupplementable::trace(visitor); 5711 DocumentSupplementable::trace(visitor);
5706 TreeScope::trace(visitor); 5712 TreeScope::trace(visitor);
5707 ContainerNode::trace(visitor); 5713 ContainerNode::trace(visitor);
5708 ExecutionContext::trace(visitor); 5714 ExecutionContext::trace(visitor);
5709 } 5715 }
5710 5716
5711 } // namespace WebCore 5717 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/dom/ScriptLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698