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

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

Issue 8016005: Merge 95497 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 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 | « no previous file | 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) 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 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights 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 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 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 * 10 *
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 m_pageUserSheet->clearOwnerNode(); 567 m_pageUserSheet->clearOwnerNode();
568 if (m_pageGroupUserSheets) { 568 if (m_pageGroupUserSheets) {
569 for (size_t i = 0; i < m_pageGroupUserSheets->size(); ++i) 569 for (size_t i = 0; i < m_pageGroupUserSheets->size(); ++i)
570 (*m_pageGroupUserSheets)[i]->clearOwnerNode(); 570 (*m_pageGroupUserSheets)[i]->clearOwnerNode();
571 } 571 }
572 if (m_userSheets) { 572 if (m_userSheets) {
573 for (size_t i = 0; i < m_userSheets->size(); ++i) 573 for (size_t i = 0; i < m_userSheets->size(); ++i)
574 (*m_userSheets)[i]->clearOwnerNode(); 574 (*m_userSheets)[i]->clearOwnerNode();
575 } 575 }
576 576
577 #if ENABLE(FULLSCREEN_API)
578 m_fullScreenChangeEventTargetQueue.clear();
579 #endif
580
581 deleteRetiredCustomFonts(); 577 deleteRetiredCustomFonts();
582 578
583 m_weakReference->clear(); 579 m_weakReference->clear();
584 580
585 if (m_mediaQueryMatcher) 581 if (m_mediaQueryMatcher)
586 m_mediaQueryMatcher->documentDestroyed(); 582 m_mediaQueryMatcher->documentDestroyed();
587 } 583 }
588 584
589 void Document::removedLastRef() 585 void Document::removedLastRef()
590 { 586 {
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1821 } 1817 }
1822 1818
1823 void Document::detach() 1819 void Document::detach()
1824 { 1820 {
1825 ASSERT(attached()); 1821 ASSERT(attached());
1826 ASSERT(!m_inPageCache); 1822 ASSERT(!m_inPageCache);
1827 1823
1828 clearAXObjectCache(); 1824 clearAXObjectCache();
1829 stopActiveDOMObjects(); 1825 stopActiveDOMObjects();
1830 m_eventQueue->close(); 1826 m_eventQueue->close();
1827 #if ENABLE(FULLSCREEN_API)
1828 m_fullScreenChangeEventTargetQueue.clear();
1829 #endif
1831 1830
1832 #if ENABLE(REQUEST_ANIMATION_FRAME) 1831 #if ENABLE(REQUEST_ANIMATION_FRAME)
1833 // FIXME: consider using ActiveDOMObject. 1832 // FIXME: consider using ActiveDOMObject.
1834 m_scriptedAnimationController = nullptr; 1833 m_scriptedAnimationController = nullptr;
1835 #endif 1834 #endif
1836 1835
1837 RenderObject* render = renderer(); 1836 RenderObject* render = renderer();
1838 1837
1839 // Send out documentWillBecomeInactive() notifications to registered element s, 1838 // Send out documentWillBecomeInactive() notifications to registered element s,
1840 // in order to stop media elements 1839 // in order to stop media elements
(...skipping 3322 matching lines...) Expand 10 before | Expand all | Expand 10 after
5163 if (!loader) 5162 if (!loader)
5164 return 0; 5163 return 0;
5165 5164
5166 if (m_frame->document() != this) 5165 if (m_frame->document() != this)
5167 return 0; 5166 return 0;
5168 5167
5169 return loader; 5168 return loader;
5170 } 5169 }
5171 5170
5172 } // namespace WebCore 5171 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698