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

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

Issue 8018005: Merge 95059 - Source/WebCore: Fix crash when an iframe element is removed during a transition to (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 3 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 | « LayoutTests/fullscreen/full-screen-remove-ancestor-during-transition-expected.txt ('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) 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
577 deleteRetiredCustomFonts(); 581 deleteRetiredCustomFonts();
578 582
579 m_weakReference->clear(); 583 m_weakReference->clear();
580 584
581 if (m_mediaQueryMatcher) 585 if (m_mediaQueryMatcher)
582 m_mediaQueryMatcher->documentDestroyed(); 586 m_mediaQueryMatcher->documentDestroyed();
583 } 587 }
584 588
585 void Document::removedLastRef() 589 void Document::removedLastRef()
586 { 590 {
(...skipping 4572 matching lines...) Expand 10 before | Expand all | Expand 10 after
5159 if (!loader) 5163 if (!loader)
5160 return 0; 5164 return 0;
5161 5165
5162 if (m_frame->document() != this) 5166 if (m_frame->document() != this)
5163 return 0; 5167 return 0;
5164 5168
5165 return loader; 5169 return loader;
5166 } 5170 }
5167 5171
5168 } // namespace WebCore 5172 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fullscreen/full-screen-remove-ancestor-during-transition-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698