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

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

Issue 38143002: Have LifecycleContext::lifecycleNotifier() return a reference (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years, 2 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 | « Source/core/dom/Document.h ('k') | Source/core/dom/ExecutionContext.h » ('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 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 614
615 // FIXME: consider using ActiveDOMObject. 615 // FIXME: consider using ActiveDOMObject.
616 if (m_scriptedAnimationController) 616 if (m_scriptedAnimationController)
617 m_scriptedAnimationController->clearDocumentPointer(); 617 m_scriptedAnimationController->clearDocumentPointer();
618 m_scriptedAnimationController.clear(); 618 m_scriptedAnimationController.clear();
619 619
620 if (svgExtensions()) 620 if (svgExtensions())
621 accessSVGExtensions()->pauseAnimations(); 621 accessSVGExtensions()->pauseAnimations();
622 622
623 m_lifecyle.advanceTo(DocumentLifecycle::Disposed); 623 m_lifecyle.advanceTo(DocumentLifecycle::Disposed);
624 lifecycleNotifier()->notifyDocumentWasDisposed(); 624 lifecycleNotifier().notifyDocumentWasDisposed();
625 } 625 }
626 626
627 SelectorQueryCache& Document::selectorQueryCache() 627 SelectorQueryCache& Document::selectorQueryCache()
628 { 628 {
629 if (!m_selectorQueryCache) 629 if (!m_selectorQueryCache)
630 m_selectorQueryCache = adoptPtr(new SelectorQueryCache()); 630 m_selectorQueryCache = adoptPtr(new SelectorQueryCache());
631 return *m_selectorQueryCache; 631 return *m_selectorQueryCache;
632 } 632 }
633 633
634 MediaQueryMatcher& Document::mediaQueryMatcher() 634 MediaQueryMatcher& Document::mediaQueryMatcher()
(...skipping 1407 matching lines...) Expand 10 before | Expand all | Expand 10 after
2042 // This is required, as our Frame might delete itself as soon as it detaches 2042 // This is required, as our Frame might delete itself as soon as it detaches
2043 // us. However, this violates Node::detach() semantics, as it's never 2043 // us. However, this violates Node::detach() semantics, as it's never
2044 // possible to re-attach. Eventually Document::detach() should be renamed, 2044 // possible to re-attach. Eventually Document::detach() should be renamed,
2045 // or this setting of the frame to 0 could be made explicit in each of the 2045 // or this setting of the frame to 0 could be made explicit in each of the
2046 // callers of Document::detach(). 2046 // callers of Document::detach().
2047 m_frame = 0; 2047 m_frame = 0;
2048 2048
2049 if (m_mediaQueryMatcher) 2049 if (m_mediaQueryMatcher)
2050 m_mediaQueryMatcher->documentDestroyed(); 2050 m_mediaQueryMatcher->documentDestroyed();
2051 2051
2052 lifecycleNotifier()->notifyDocumentWasDetached(); 2052 lifecycleNotifier().notifyDocumentWasDetached();
2053 m_lifecyle.advanceTo(DocumentLifecycle::Stopped); 2053 m_lifecyle.advanceTo(DocumentLifecycle::Stopped);
2054 } 2054 }
2055 2055
2056 void Document::prepareForDestruction() 2056 void Document::prepareForDestruction()
2057 { 2057 {
2058 disconnectDescendantFrames(); 2058 disconnectDescendantFrames();
2059 2059
2060 // The process of disconnecting descendant frames could have already 2060 // The process of disconnecting descendant frames could have already
2061 // detached us. 2061 // detached us.
2062 if (!confusingAndOftenMisusedAttached()) 2062 if (!confusingAndOftenMisusedAttached())
(...skipping 3262 matching lines...) Expand 10 before | Expand all | Expand 10 after
5325 float Document::devicePixelRatio() const 5325 float Document::devicePixelRatio() const
5326 { 5326 {
5327 return m_frame ? m_frame->devicePixelRatio() : 1.0; 5327 return m_frame ? m_frame->devicePixelRatio() : 1.0;
5328 } 5328 }
5329 5329
5330 PassOwnPtr<LifecycleNotifier<ExecutionContext> > Document::createLifecycleNotifi er() 5330 PassOwnPtr<LifecycleNotifier<ExecutionContext> > Document::createLifecycleNotifi er()
5331 { 5331 {
5332 return DocumentLifecycleNotifier::create(this); 5332 return DocumentLifecycleNotifier::create(this);
5333 } 5333 }
5334 5334
5335 DocumentLifecycleNotifier* Document::lifecycleNotifier() 5335 DocumentLifecycleNotifier& Document::lifecycleNotifier()
5336 { 5336 {
5337 return static_cast<DocumentLifecycleNotifier*>(ExecutionContext::lifecycleNo tifier()); 5337 return static_cast<DocumentLifecycleNotifier&>(ExecutionContext::lifecycleNo tifier());
5338 } 5338 }
5339 5339
5340 void Document::removedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, StyleR esolverUpdateMode updateMode) 5340 void Document::removedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, StyleR esolverUpdateMode updateMode)
5341 { 5341 {
5342 if (!isActive()) 5342 if (!isActive())
5343 return; 5343 return;
5344 5344
5345 styleEngine()->modifiedStyleSheet(sheet); 5345 styleEngine()->modifiedStyleSheet(sheet);
5346 styleResolverChanged(when, updateMode); 5346 styleResolverChanged(when, updateMode);
5347 } 5347 }
5348 5348
5349 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style ResolverUpdateMode updateMode) 5349 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style ResolverUpdateMode updateMode)
5350 { 5350 {
5351 if (!isActive()) 5351 if (!isActive())
5352 return; 5352 return;
5353 5353
5354 styleEngine()->modifiedStyleSheet(sheet); 5354 styleEngine()->modifiedStyleSheet(sheet);
5355 styleResolverChanged(when, updateMode); 5355 styleResolverChanged(when, updateMode);
5356 } 5356 }
5357 5357
5358 } // namespace WebCore 5358 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/dom/ExecutionContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698