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

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

Issue 12518022: Merge 143840 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 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
« no previous file with comments | « Source/WebCore/dom/Document.cpp ('k') | Source/WebCore/dom/Node.h » ('j') | 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, 2009 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 16 matching lines...) Expand all
27 #include "HTMLDocumentParser.h" 27 #include "HTMLDocumentParser.h"
28 #include "Page.h" 28 #include "Page.h"
29 #include "Settings.h" 29 #include "Settings.h"
30 #include "XMLDocumentParser.h" 30 #include "XMLDocumentParser.h"
31 31
32 namespace WebCore { 32 namespace WebCore {
33 33
34 DocumentFragment::DocumentFragment(Document* document, ConstructionType construc tionType) 34 DocumentFragment::DocumentFragment(Document* document, ConstructionType construc tionType)
35 : ContainerNode(document, constructionType) 35 : ContainerNode(document, constructionType)
36 { 36 {
37 ASSERT(document);
38 } 37 }
39 38
40 PassRefPtr<DocumentFragment> DocumentFragment::create(Document* document) 39 PassRefPtr<DocumentFragment> DocumentFragment::create(Document* document)
41 { 40 {
41 ASSERT(document);
42 return adoptRef(new DocumentFragment(document, Node::CreateDocumentFragment) ); 42 return adoptRef(new DocumentFragment(document, Node::CreateDocumentFragment) );
43 } 43 }
44 44
45 String DocumentFragment::nodeName() const 45 String DocumentFragment::nodeName() const
46 { 46 {
47 return "#document-fragment"; 47 return "#document-fragment";
48 } 48 }
49 49
50 Node::NodeType DocumentFragment::nodeType() const 50 Node::NodeType DocumentFragment::nodeType() const
51 { 51 {
(...skipping 27 matching lines...) Expand all
79 { 79 {
80 HTMLDocumentParser::parseDocumentFragment(source, this, contextElement, scri ptingPermission); 80 HTMLDocumentParser::parseDocumentFragment(source, this, contextElement, scri ptingPermission);
81 } 81 }
82 82
83 bool DocumentFragment::parseXML(const String& source, Element* contextElement, F ragmentScriptingPermission scriptingPermission) 83 bool DocumentFragment::parseXML(const String& source, Element* contextElement, F ragmentScriptingPermission scriptingPermission)
84 { 84 {
85 return XMLDocumentParser::parseDocumentFragment(source, this, contextElement , scriptingPermission); 85 return XMLDocumentParser::parseDocumentFragment(source, this, contextElement , scriptingPermission);
86 } 86 }
87 87
88 } 88 }
OLDNEW
« no previous file with comments | « Source/WebCore/dom/Document.cpp ('k') | Source/WebCore/dom/Node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698