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

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

Issue 9567036: Merge 109362 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 9 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
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, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights 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 2040 matching lines...) Expand 10 before | Expand all | Expand 10 after
2051 case COMMENT_NODE: 2051 case COMMENT_NODE:
2052 case PROCESSING_INSTRUCTION_NODE: 2052 case PROCESSING_INSTRUCTION_NODE:
2053 setNodeValue(text, ec); 2053 setNodeValue(text, ec);
2054 return; 2054 return;
2055 case ELEMENT_NODE: 2055 case ELEMENT_NODE:
2056 case ATTRIBUTE_NODE: 2056 case ATTRIBUTE_NODE:
2057 case ENTITY_NODE: 2057 case ENTITY_NODE:
2058 case ENTITY_REFERENCE_NODE: 2058 case ENTITY_REFERENCE_NODE:
2059 case DOCUMENT_FRAGMENT_NODE: 2059 case DOCUMENT_FRAGMENT_NODE:
2060 case SHADOW_ROOT_NODE: { 2060 case SHADOW_ROOT_NODE: {
2061 ContainerNode* container = toContainerNode(this); 2061 RefPtr<ContainerNode> container = toContainerNode(this);
2062 #if ENABLE(MUTATION_OBSERVERS) 2062 #if ENABLE(MUTATION_OBSERVERS)
2063 ChildListMutationScope mutation(this); 2063 ChildListMutationScope mutation(this);
2064 #endif 2064 #endif
2065 container->removeChildren(); 2065 container->removeChildren();
2066 if (!text.isEmpty()) 2066 if (!text.isEmpty())
2067 container->appendChild(document()->createTextNode(text), ec); 2067 container->appendChild(document()->createTextNode(text), ec);
2068 return; 2068 return;
2069 } 2069 }
2070 case DOCUMENT_NODE: 2070 case DOCUMENT_NODE:
2071 case DOCUMENT_TYPE_NODE: 2071 case DOCUMENT_TYPE_NODE:
(...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after
2958 2958
2959 #ifndef NDEBUG 2959 #ifndef NDEBUG
2960 2960
2961 void showTree(const WebCore::Node* node) 2961 void showTree(const WebCore::Node* node)
2962 { 2962 {
2963 if (node) 2963 if (node)
2964 node->showTreeForThis(); 2964 node->showTreeForThis();
2965 } 2965 }
2966 2966
2967 #endif 2967 #endif
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/option-text-mutation-crash-expected.txt ('k') | Source/WebCore/dom/Text.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698