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

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

Issue 7191002: Merge 88987 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
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 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 // these extra pointers or we will create a reference cycle. 574 // these extra pointers or we will create a reference cycle.
575 m_docType = 0; 575 m_docType = 0;
576 m_focusedNode = 0; 576 m_focusedNode = 0;
577 m_hoverNode = 0; 577 m_hoverNode = 0;
578 m_activeNode = 0; 578 m_activeNode = 0;
579 m_titleElement = 0; 579 m_titleElement = 0;
580 m_documentElement = 0; 580 m_documentElement = 0;
581 #if ENABLE(FULLSCREEN_API) 581 #if ENABLE(FULLSCREEN_API)
582 m_fullScreenElement = 0; 582 m_fullScreenElement = 0;
583 #endif 583 #endif
584 m_styleSelector.clear();
585 m_styleSheets.clear();
586 m_elemSheet.clear();
587 m_mappedElementSheet.clear();
588 m_pageUserSheet.clear();
589 m_pageGroupUserSheets.clear();
590 584
591 // removeAllChildren() doesn't always unregister IDs, 585 // removeAllChildren() doesn't always unregister IDs,
592 // so tear down scope information upfront to avoid having stale referenc es in the map. 586 // so tear down scope information upfront to avoid having stale referenc es in the map.
593 destroyTreeScopeData(); 587 destroyTreeScopeData();
594 removeAllChildren(); 588 removeAllChildren();
595 589
596 m_markers->detach(); 590 m_markers->detach();
597 591
598 detachParser(); 592 detachParser();
599 593
(...skipping 4402 matching lines...) Expand 10 before | Expand all | Expand 10 after
5002 if (!loader) 4996 if (!loader)
5003 return 0; 4997 return 0;
5004 4998
5005 if (m_frame->document() != this) 4999 if (m_frame->document() != this)
5006 return 0; 5000 return 0;
5007 5001
5008 return loader; 5002 return loader;
5009 } 5003 }
5010 5004
5011 } // namespace WebCore 5005 } // 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