diff options
| author | Ben Murdoch <benm@google.com> | 2010-06-15 19:36:43 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-06-16 14:52:28 +0100 |
| commit | 545e470e52f0ac6a3a072bf559c796b42c6066b6 (patch) | |
| tree | c0c14763654d84d37577dde512c3d3b4699a9e86 /WebCore/dom/Attr.cpp | |
| parent | 719298a66237d38ea5c05f1547123ad8aacbc237 (diff) | |
| download | external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.zip external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.gz external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.bz2 | |
Merge webkit.org at r61121: Initial merge by git.
Change-Id: Icd6db395c62285be384d137164d95d7466c98760
Diffstat (limited to 'WebCore/dom/Attr.cpp')
| -rw-r--r-- | WebCore/dom/Attr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/dom/Attr.cpp b/WebCore/dom/Attr.cpp index 597f9ba..59daa59 100644 --- a/WebCore/dom/Attr.cpp +++ b/WebCore/dom/Attr.cpp @@ -3,7 +3,7 @@ * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2001 Peter Kelly (pmk@post.com) * (C) 2001 Dirk Mueller (mueller@kde.org) - * Copyright (C) 2004, 2005, 2006, 2007, 2009 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 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 @@ -23,9 +23,9 @@ #include "config.h" #include "Attr.h" -#include "Document.h" #include "Element.h" #include "ExceptionCode.h" +#include "HTMLNames.h" #include "Text.h" #include "XMLNSNames.h" @@ -175,7 +175,7 @@ void Attr::childrenChanged(bool changedByParser, Node* beforeChange, Node* after bool Attr::isId() const { - return qualifiedName().matches(m_element ? m_element->idAttributeName() : idAttr); + return qualifiedName().matches(document()->idAttributeName()); } } |