Title: [100925] trunk/Source/WebCore
- Revision
- 100925
- Author
- commit-qu...@webkit.org
- Date
- 2011-11-21 09:24:35 -0800 (Mon, 21 Nov 2011)
Log Message
JSC/CSSOM: Merge root() for style declaration objects.
<http://webkit.org/b/72881>
Patch by Andreas Kling <kl...@webkit.org> on 2011-11-21
Reviewed by Antti Koivisto.
Fold root(CSSMutableStyleDeclaration*) into root(CSSStyleDeclaration*),
removing a duplicated chunk and making it a little easier on the eyes.
* bindings/js/JSDOMBinding.h:
(WebCore::root):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (100924 => 100925)
--- trunk/Source/WebCore/ChangeLog 2011-11-21 17:18:09 UTC (rev 100924)
+++ trunk/Source/WebCore/ChangeLog 2011-11-21 17:24:35 UTC (rev 100925)
@@ -1,3 +1,16 @@
+2011-11-21 Andreas Kling <kl...@webkit.org>
+
+ JSC/CSSOM: Merge root() for style declaration objects.
+ <http://webkit.org/b/72881>
+
+ Reviewed by Antti Koivisto.
+
+ Fold root(CSSMutableStyleDeclaration*) into root(CSSStyleDeclaration*),
+ removing a duplicated chunk and making it a little easier on the eyes.
+
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::root):
+
2011-11-21 Igor Oliveira <igor.olive...@openbossa.org>
[WK2][Qt] Move Accelerated Composite animations to UIProcess
Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (100924 => 100925)
--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2011-11-21 17:18:09 UTC (rev 100924)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2011-11-21 17:24:35 UTC (rev 100925)
@@ -205,20 +205,13 @@
return root(parentRule);
if (CSSStyleSheet* styleSheet = style->parentStyleSheet())
return root(styleSheet);
+ if (style->isMutableStyleDeclaration()) {
+ if (Node* node = static_cast<CSSMutableStyleDeclaration*>(style)->node())
+ return root(node);
+ }
return style;
}
- inline void* root(CSSMutableStyleDeclaration* style)
- {
- if (CSSRule* parentRule = style->parentRule())
- return root(parentRule);
- if (CSSStyleSheet* styleSheet = style->parentStyleSheet())
- return root(styleSheet);
- if (Node* node = style->node())
- return root(node);
- return style;
- }
-
inline void* root(MediaList* mediaList)
{
if (CSSStyleSheet* parentStyleSheet = mediaList->parentStyleSheet())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
