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

Side by Side Diff: WebCore/dom/Node.cpp

Issue 5753004: Merge 73559 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/597/
Patch Set: Created 10 years 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 | « WebCore/dom/Document.cpp ('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 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 #if USE(JSC) 438 #if USE(JSC)
439 updateDOMNodeDocument(this, m_document, document); 439 updateDOMNodeDocument(this, m_document, document);
440 #endif 440 #endif
441 441
442 if (hasRareData() && rareData()->nodeLists()) { 442 if (hasRareData() && rareData()->nodeLists()) {
443 if (m_document) 443 if (m_document)
444 m_document->removeNodeListCache(); 444 m_document->removeNodeListCache();
445 document->addNodeListCache(); 445 document->addNodeListCache();
446 } 446 }
447 447
448 if (m_document) 448 if (m_document) {
449 m_document->moveNodeIteratorsToNewDocument(this, document);
449 m_document->selfOnlyDeref(); 450 m_document->selfOnlyDeref();
451 }
450 452
451 m_document = document; 453 m_document = document;
452 454
453 setDidMoveToNewOwnerDocumentWasCalled(false); 455 setDidMoveToNewOwnerDocumentWasCalled(false);
454 didMoveToNewOwnerDocument(); 456 didMoveToNewOwnerDocument();
455 ASSERT(didMoveToNewOwnerDocumentWasCalled); 457 ASSERT(didMoveToNewOwnerDocumentWasCalled);
456 } 458 }
457 459
458 NodeRareData* Node::rareData() const 460 NodeRareData* Node::rareData() const
459 { 461 {
(...skipping 2499 matching lines...) Expand 10 before | Expand all | Expand 10 after
2959 2961
2960 #ifndef NDEBUG 2962 #ifndef NDEBUG
2961 2963
2962 void showTree(const WebCore::Node* node) 2964 void showTree(const WebCore::Node* node)
2963 { 2965 {
2964 if (node) 2966 if (node)
2965 node->showTreeForThis(); 2967 node->showTreeForThis();
2966 } 2968 }
2967 2969
2968 #endif 2970 #endif
OLDNEW
« no previous file with comments | « WebCore/dom/Document.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698