Title: [101310] trunk/Source/WebCore
Revision
101310
Author
[email protected]
Date
2011-11-28 17:31:36 -0800 (Mon, 28 Nov 2011)

Log Message

[MutationObservers] Fix build breakage after CSSInlineDeclaration refactor
https://bugs.webkit.org/show_bug.cgi?id=73243

Patch by Rafael Weinstein <[email protected]> on 2011-11-28
Reviewed by Ryosuke Niwa.

No tests needed. This patch only contains compile fixes.

* css/CSSMutableStyleDeclaration.cpp:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (101309 => 101310)


--- trunk/Source/WebCore/ChangeLog	2011-11-29 01:25:27 UTC (rev 101309)
+++ trunk/Source/WebCore/ChangeLog	2011-11-29 01:31:36 UTC (rev 101310)
@@ -1,3 +1,14 @@
+2011-11-28  Rafael Weinstein  <[email protected]>
+
+        [MutationObservers] Fix build breakage after CSSInlineDeclaration refactor
+        https://bugs.webkit.org/show_bug.cgi?id=73243
+
+        Reviewed by Ryosuke Niwa.
+
+        No tests needed. This patch only contains compile fixes.
+
+        * css/CSSMutableStyleDeclaration.cpp:
+
 2011-11-28  Jon Lee  <[email protected]>
 
         Fix Chromium bot build error related to b73253.

Modified: trunk/Source/WebCore/css/CSSInlineStyleDeclaration.h (101309 => 101310)


--- trunk/Source/WebCore/css/CSSInlineStyleDeclaration.h	2011-11-29 01:25:27 UTC (rev 101309)
+++ trunk/Source/WebCore/css/CSSInlineStyleDeclaration.h	2011-11-29 01:31:36 UTC (rev 101310)
@@ -47,6 +47,12 @@
     }
 };
 
+inline CSSInlineStyleDeclaration* toCSSInlineStyleDeclaration(CSSMutableStyleDeclaration* decl)
+{
+    ASSERT(!decl || decl->isInlineStyleDeclaration());
+    return static_cast<CSSInlineStyleDeclaration*>(decl);
+}
+
 } // namespace WebCore
 
 #endif // CSSInlineStyleDeclaration_h

Modified: trunk/Source/WebCore/css/CSSMutableStyleDeclaration.cpp (101309 => 101310)


--- trunk/Source/WebCore/css/CSSMutableStyleDeclaration.cpp	2011-11-29 01:25:27 UTC (rev 101309)
+++ trunk/Source/WebCore/css/CSSMutableStyleDeclaration.cpp	2011-11-29 01:31:36 UTC (rev 101310)
@@ -23,6 +23,7 @@
 #include "CSSMutableStyleDeclaration.h"
 
 #include "CSSImageValue.h"
+#include "CSSInlineStyleDeclaration.h"
 #include "CSSParser.h"
 #include "CSSPropertyLonghand.h"
 #include "CSSPropertyNames.h"
@@ -65,14 +66,15 @@
         if (!s_currentDecl->isInlineStyleDeclaration())
             return;
 
-        s_mutationRecipients = MutationObserverInterestGroup::createForAttributesMutation(s_currentDecl->element(), HTMLNames::styleAttr);
+        CSSInlineStyleDeclaration* inlineDecl = toCSSInlineStyleDeclaration(s_currentDecl);
+        s_mutationRecipients = MutationObserverInterestGroup::createForAttributesMutation(inlineDecl->element(), HTMLNames::styleAttr);
         if (s_mutationRecipients->isEmpty()) {
             s_mutationRecipients.clear();
             return;
         }
 
-        AtomicString oldValue = s_mutationRecipients->isOldValueRequested() ? s_currentDecl->element()->getAttribute(HTMLNames::styleAttr) : nullAtom;
-        s_mutation = MutationRecord::createAttributes(s_currentDecl->element(), HTMLNames::styleAttr, oldValue);
+        AtomicString oldValue = s_mutationRecipients->isOldValueRequested() ? inlineDecl->element()->getAttribute(HTMLNames::styleAttr) : nullAtom;
+        s_mutation = MutationRecord::createAttributes(inlineDecl->element(), HTMLNames::styleAttr, oldValue);
     }
 
     ~StyleAttributeMutationScope()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to