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

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

Issue 10537130: Merge 119439 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 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 | « 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, 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 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011 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 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 m_focusedNode = 0; 646 m_focusedNode = 0;
647 m_hoverNode = 0; 647 m_hoverNode = 0;
648 m_activeNode = 0; 648 m_activeNode = 0;
649 m_titleElement = 0; 649 m_titleElement = 0;
650 m_documentElement = 0; 650 m_documentElement = 0;
651 #if ENABLE(FULLSCREEN_API) 651 #if ENABLE(FULLSCREEN_API)
652 m_fullScreenElement = 0; 652 m_fullScreenElement = 0;
653 m_fullScreenElementStack.clear(); 653 m_fullScreenElementStack.clear();
654 #endif 654 #endif
655 655
656 detachParser();
657
656 // removeAllChildren() doesn't always unregister IDs, 658 // removeAllChildren() doesn't always unregister IDs,
657 // so tear down scope information upfront to avoid having stale referenc es in the map. 659 // so tear down scope information upfront to avoid having stale referenc es in the map.
658 destroyTreeScopeData(); 660 destroyTreeScopeData();
659 removeAllChildren(); 661 removeAllChildren();
660 662
661 m_markers->detach(); 663 m_markers->detach();
662 664
663 detachParser();
664
665 m_cssCanvasElements.clear(); 665 m_cssCanvasElements.clear();
666 666
667 #if ENABLE(REQUEST_ANIMATION_FRAME) 667 #if ENABLE(REQUEST_ANIMATION_FRAME)
668 // FIXME: consider using ActiveDOMObject. 668 // FIXME: consider using ActiveDOMObject.
669 if (m_scriptedAnimationController) 669 if (m_scriptedAnimationController)
670 m_scriptedAnimationController->clearDocumentPointer(); 670 m_scriptedAnimationController->clearDocumentPointer();
671 m_scriptedAnimationController.clear(); 671 m_scriptedAnimationController.clear();
672 #endif 672 #endif
673 673
674 #ifndef NDEBUG 674 #ifndef NDEBUG
(...skipping 5292 matching lines...) Expand 10 before | Expand all | Expand 10 after
5967 node = pluginDocument->pluginNode(); 5967 node = pluginDocument->pluginNode();
5968 } 5968 }
5969 if (!node && doc->isHTMLDocument()) 5969 if (!node && doc->isHTMLDocument())
5970 node = doc->body(); 5970 node = doc->body();
5971 if (!node) 5971 if (!node)
5972 node = doc->documentElement(); 5972 node = doc->documentElement();
5973 return node; 5973 return node;
5974 } 5974 }
5975 5975
5976 } // namespace WebCore 5976 } // 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