Title: [101208] trunk/Source/WebCore
- Revision
- 101208
- Author
- commit-qu...@webkit.org
- Date
- 2011-11-27 12:34:10 -0800 (Sun, 27 Nov 2011)
Log Message
CSSMutableStyleDeclaration: setCssText() mostly duplicates parseDeclaration().
<http://webkit.org/b/73171>
Patch by Andreas Kling <kl...@webkit.org> on 2011-11-27
Reviewed by Antti Koivisto.
Let setCssText() call parseDeclaration() instead of duplicating the functionality.
* css/CSSMutableStyleDeclaration.cpp:
(WebCore::CSSMutableStyleDeclaration::setCssText):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101207 => 101208)
--- trunk/Source/WebCore/ChangeLog 2011-11-27 20:29:11 UTC (rev 101207)
+++ trunk/Source/WebCore/ChangeLog 2011-11-27 20:34:10 UTC (rev 101208)
@@ -1,5 +1,17 @@
2011-11-27 Andreas Kling <kl...@webkit.org>
+ CSSMutableStyleDeclaration: setCssText() mostly duplicates parseDeclaration().
+ <http://webkit.org/b/73171>
+
+ Reviewed by Antti Koivisto.
+
+ Let setCssText() call parseDeclaration() instead of duplicating the functionality.
+
+ * css/CSSMutableStyleDeclaration.cpp:
+ (WebCore::CSSMutableStyleDeclaration::setCssText):
+
+2011-11-27 Andreas Kling <kl...@webkit.org>
+
CSS/XSLStyleSheet: checkLoaded() needn't be virtual.
<http://webkit.org/b/73169>
Modified: trunk/Source/WebCore/css/CSSMutableStyleDeclaration.cpp (101207 => 101208)
--- trunk/Source/WebCore/css/CSSMutableStyleDeclaration.cpp 2011-11-27 20:29:11 UTC (rev 101207)
+++ trunk/Source/WebCore/css/CSSMutableStyleDeclaration.cpp 2011-11-27 20:34:10 UTC (rev 101208)
@@ -894,23 +894,9 @@
void CSSMutableStyleDeclaration::setCssText(const String& text, ExceptionCode& ec)
{
- ASSERT(!m_iteratorCount);
-
-#if ENABLE(MUTATION_OBSERVERS)
- StyleAttributeMutationScope mutationScope(this);
-#endif
-
ec = 0;
- m_properties.clear();
- CSSParser parser(useStrictParsing());
- parser.parseDeclaration(this, text);
-
-#if ENABLE(MUTATION_OBSERVERS)
- mutationScope.enqueueMutationRecord();
-#endif
-
// FIXME: Detect syntax errors and set ec.
- setNeedsStyleRecalc();
+ parseDeclaration(text);
}
void CSSMutableStyleDeclaration::merge(const CSSMutableStyleDeclaration* other, bool argOverridesOnConflict)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
