Title: [145609] branches/safari-536.30-branch/Source/WebCore
- Revision
- 145609
- Author
- [email protected]
- Date
- 2013-03-12 16:25:17 -0700 (Tue, 12 Mar 2013)
Log Message
Merged r131578. <rdar://problem/13334886>
Modified Paths
Diff
Modified: branches/safari-536.30-branch/Source/WebCore/ChangeLog (145608 => 145609)
--- branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-12 23:19:30 UTC (rev 145608)
+++ branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-12 23:25:17 UTC (rev 145609)
@@ -1 +1,17 @@
+2013-03-12 Lucas Forschler <[email protected]>
+
+ Merge r131578
+
+ 2012-10-17 Alexander Pavlov <[email protected]>
+
+ Web Inspector: Avoid style updates when retrieving the inline stylesheet text
+ https://bugs.webkit.org/show_bug.cgi?id=99576
+
+ Reviewed by Vsevolod Vlasov.
+
+ Avoid using innerText() to retrieve inline stylesheet text, which may result in style and layout updates.
+
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyleSheet::inlineStyleSheetText):
+
== Rolled over to ChangeLog-2013-03-12 ==
Modified: branches/safari-536.30-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp (145608 => 145609)
--- branches/safari-536.30-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp 2013-03-12 23:19:30 UTC (rev 145608)
+++ branches/safari-536.30-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp 2013-03-12 23:25:17 UTC (rev 145609)
@@ -1231,7 +1231,7 @@
#endif
)
return false;
- *result = ownerElement->innerText();
+ *result = ownerElement->textContent();
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
