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

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

Issue 7191003: Merge 88987 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 6 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/fast/dom/styled-not-in-document-clone-inline-style-decl-parent-crash-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 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 // these extra pointers or we will create a reference cycle. 564 // these extra pointers or we will create a reference cycle.
565 m_docType = 0; 565 m_docType = 0;
566 m_focusedNode = 0; 566 m_focusedNode = 0;
567 m_hoverNode = 0; 567 m_hoverNode = 0;
568 m_activeNode = 0; 568 m_activeNode = 0;
569 m_titleElement = 0; 569 m_titleElement = 0;
570 m_documentElement = 0; 570 m_documentElement = 0;
571 #if ENABLE(FULLSCREEN_API) 571 #if ENABLE(FULLSCREEN_API)
572 m_fullScreenElement = 0; 572 m_fullScreenElement = 0;
573 #endif 573 #endif
574 m_styleSelector.clear();
575 m_styleSheets.clear();
576 m_elemSheet.clear();
577 m_mappedElementSheet.clear();
578 m_pageUserSheet.clear();
579 m_pageGroupUserSheets.clear();
580 574
581 // removeAllChildren() doesn't always unregister IDs, 575 // removeAllChildren() doesn't always unregister IDs,
582 // so tear down scope information upfront to avoid having stale referenc es in the map. 576 // so tear down scope information upfront to avoid having stale referenc es in the map.
583 destroyTreeScopeData(); 577 destroyTreeScopeData();
584 removeAllChildren(); 578 removeAllChildren();
585 579
586 m_markers->detach(); 580 m_markers->detach();
587 581
588 detachParser(); 582 detachParser();
589 583
(...skipping 4575 matching lines...) Expand 10 before | Expand all | Expand 10 after
5165 if (!loader) 5159 if (!loader)
5166 return 0; 5160 return 0;
5167 5161
5168 if (m_frame->document() != this) 5162 if (m_frame->document() != this)
5169 return 0; 5163 return 0;
5170 5164
5171 return loader; 5165 return loader;
5172 } 5166 }
5173 5167
5174 } // namespace WebCore 5168 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/styled-not-in-document-clone-inline-style-decl-parent-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698