From e14391e94c850b8bd03680c23b38978db68687a8 Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 4 Nov 2010 12:00:17 -0700 Subject: Merge Webkit at r70949: Initial merge by git. Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e --- WebCore/dom/StyledElement.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'WebCore/dom/StyledElement.cpp') diff --git a/WebCore/dom/StyledElement.cpp b/WebCore/dom/StyledElement.cpp index 12744cb..7384c0b 100644 --- a/WebCore/dom/StyledElement.cpp +++ b/WebCore/dom/StyledElement.cpp @@ -25,6 +25,7 @@ #include "StyledElement.h" #include "Attribute.h" +#include "ClassList.h" #include "CSSStyleSelector.h" #include "CSSStyleSheet.h" #include "CSSValueKeywords.h" @@ -222,7 +223,7 @@ void StyledElement::classAttributeChanged(const AtomicString& newClassString) if (hasClass) { attributes()->setClass(newClassString); if (DOMTokenList* classList = optionalClassList()) - classList->reset(newClassString); + static_cast(classList)->reset(newClassString); } else if (attributeMap()) attributeMap()->clearClass(); setNeedsStyleRecalc(); -- cgit v1.1