From bec39347bb3bb5bf1187ccaf471d26247f28b585 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Thu, 30 Sep 2010 15:42:16 +0100
Subject: Merge WebKit at r68651 : Initial merge by git.

Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
---
 WebCore/dom/StyledElement.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'WebCore/dom/StyledElement.cpp')

diff --git a/WebCore/dom/StyledElement.cpp b/WebCore/dom/StyledElement.cpp
index a158e2e..f07fda9 100644
--- a/WebCore/dom/StyledElement.cpp
+++ b/WebCore/dom/StyledElement.cpp
@@ -28,6 +28,7 @@
 #include "CSSStyleSelector.h"
 #include "CSSStyleSheet.h"
 #include "CSSValueKeywords.h"
+#include "DOMTokenList.h"
 #include "Document.h"
 #include "HTMLNames.h"
 #include <wtf/HashFunctions.h>
@@ -217,12 +218,12 @@ void StyledElement::classAttributeChanged(const AtomicString& newClassString)
     }
     bool hasClass = i < length;
     setHasClass(hasClass);
-    if (hasClass)
+    if (hasClass) {
         attributes()->setClass(newClassString);
-    else {
-        if (attributeMap())    
-            attributeMap()->clearClass();
-    }
+        if (DOMTokenList* classList = optionalClassList())
+            classList->reset(newClassString);
+    } else if (attributeMap())
+        attributeMap()->clearClass();
     setNeedsStyleRecalc();
     dispatchSubtreeModifiedEvent();
 }
-- 
cgit v1.1