diff options
author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebCore/dom/Notation.cpp | |
parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebCore/dom/Notation.cpp')
-rw-r--r-- | WebCore/dom/Notation.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/WebCore/dom/Notation.cpp b/WebCore/dom/Notation.cpp index 7081d98..cade384 100644 --- a/WebCore/dom/Notation.cpp +++ b/WebCore/dom/Notation.cpp @@ -1,8 +1,6 @@ -/** - * This file is part of the DOM implementation for KDE. - * +/* * Copyright (C) 2000 Peter Kelly (pmk@post.com) - * Copyright (C) 2006 Apple Computer, Inc. + * Copyright (C) 2006, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,17 +17,14 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ + #include "config.h" #include "Notation.h" namespace WebCore { -Notation::Notation(Document* doc) : ContainerNode(doc) -{ -} - -Notation::Notation(Document* doc, const String& name, const String& publicId, const String& systemId) - : ContainerNode(doc) +Notation::Notation(Document* document, const String& name, const String& publicId, const String& systemId) + : ContainerNode(document) , m_name(name) , m_publicId(publicId) , m_systemId(systemId) @@ -52,7 +47,6 @@ PassRefPtr<Node> Notation::cloneNode(bool /*deep*/) return 0; } -// DOM Section 1.1.1 bool Notation::childTypeAllowed(NodeType) { return false; |