Title: [135428] trunk/Source/WebCore
- Revision
- 135428
- Author
- [email protected]
- Date
- 2012-11-21 13:29:40 -0800 (Wed, 21 Nov 2012)
Log Message
Update incorrect assertion in ImmutableElementAttributeData(MutableElementAttributeData).
<http://webkit.org/b/102972>
Reviewed by Antti Koivisto.
Manipulation by editing code may cause an element to have mutable inline style, and this is fine.
Change the assertion to confirm that the inline style doesn't have a CSSOM wrapper attached,
which is where real problems would happen.
Fixes an assertion on editing/undo/replace-by-span-then-remove.html
* dom/ElementAttributeData.cpp:
(WebCore::ImmutableElementAttributeData::ImmutableElementAttributeData):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135427 => 135428)
--- trunk/Source/WebCore/ChangeLog 2012-11-21 20:37:10 UTC (rev 135427)
+++ trunk/Source/WebCore/ChangeLog 2012-11-21 21:29:40 UTC (rev 135428)
@@ -1,3 +1,20 @@
+2012-11-21 Andreas Kling <[email protected]>
+
+ Update incorrect assertion in ImmutableElementAttributeData(MutableElementAttributeData).
+ <http://webkit.org/b/102972>
+
+ Reviewed by Antti Koivisto.
+
+ Manipulation by editing code may cause an element to have mutable inline style, and this is fine.
+
+ Change the assertion to confirm that the inline style doesn't have a CSSOM wrapper attached,
+ which is where real problems would happen.
+
+ Fixes an assertion on editing/undo/replace-by-span-then-remove.html
+
+ * dom/ElementAttributeData.cpp:
+ (WebCore::ImmutableElementAttributeData::ImmutableElementAttributeData):
+
2012-11-21 Kentaro Hara <[email protected]>
Remove $outputDir and $outputHeadersDir from global variables of code generators
Modified: trunk/Source/WebCore/dom/ElementAttributeData.cpp (135427 => 135428)
--- trunk/Source/WebCore/dom/ElementAttributeData.cpp 2012-11-21 20:37:10 UTC (rev 135427)
+++ trunk/Source/WebCore/dom/ElementAttributeData.cpp 2012-11-21 21:29:40 UTC (rev 135428)
@@ -73,7 +73,7 @@
ASSERT(!other.m_presentationAttributeStyle);
if (other.m_inlineStyle) {
- ASSERT(!other.m_inlineStyle->isMutable());
+ ASSERT(!other.m_inlineStyle->hasCSSOMWrapper());
m_inlineStyle = other.m_inlineStyle->immutableCopyIfNeeded();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
