[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[knorton at google.com]

The following commit has been merged in the webkit-1.1 branch:
commit f46abdcea5c3442f2d2875c64e87e3cf884f4a7d
Author: knorton at google.com <knorton at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 23 00:31:07 2010 +0000

    2010-01-22  Kelly Norton  <knorton at google.com>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: JavaScript Error in DOMAgent.js:375 (_attributesUpdated)
            https://bugs.webkit.org/show_bug.cgi?id=33915
    
            Errors were caused by the fact that Element::attributes calls Element::setAttribute to
            synchronized the styleAttr. The fix is to simply check the synchronizing style attribute
            flag.
    
            * dom/Element.cpp:
            (WebCore::Element::setAttribute): Checked for case where styleAttr is being synchronized.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53736 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 46034ef..2c38200 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-22  Kelly Norton  <knorton at google.com>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: JavaScript Error in DOMAgent.js:375 (_attributesUpdated)
+        https://bugs.webkit.org/show_bug.cgi?id=33915
+
+        Errors were caused by the fact that Element::attributes calls Element::setAttribute to
+        synchronized the styleAttr. The fix is to simply check the synchronizing style attribute
+        flag.
+
+        * dom/Element.cpp:
+        (WebCore::Element::setAttribute): Checked for case where styleAttr is being synchronized.
+
 2010-01-22  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/dom/Element.cpp b/WebCore/dom/Element.cpp
index 544532d..27926fb 100644
--- a/WebCore/dom/Element.cpp
+++ b/WebCore/dom/Element.cpp
@@ -532,8 +532,10 @@ void Element::setAttribute(const AtomicString& name, const AtomicString& value,
 
 #if ENABLE(INSPECTOR)
     if (Page* page = document()->page()) {
-        if (InspectorController* inspectorController = page->inspectorController())
-            inspectorController->didModifyDOMAttr(this);
+        if (InspectorController* inspectorController = page->inspectorController()) {
+            if (!m_synchronizingStyleAttribute)
+                inspectorController->didModifyDOMAttr(this);
+        }
     }
 #endif
 }
@@ -559,8 +561,10 @@ void Element::setAttribute(const QualifiedName& name, const AtomicString& value,
 
 #if ENABLE(INSPECTOR)
     if (Page* page = document()->page()) {
-        if (InspectorController* inspectorController = page->inspectorController())
-            inspectorController->didModifyDOMAttr(this);
+        if (InspectorController* inspectorController = page->inspectorController()) {
+            if (!m_synchronizingStyleAttribute)
+                inspectorController->didModifyDOMAttr(this);
+        }
     }
 #endif
 }

-- 
WebKit Debian packaging