Title: [145612] branches/safari-536.30-branch/Source/WebCore
- Revision
- 145612
- Author
- [email protected]
- Date
- 2013-03-12 16:43:17 -0700 (Tue, 12 Mar 2013)
Log Message
Merged r132462. <rdar://problem/13335022>
Modified Paths
Diff
Modified: branches/safari-536.30-branch/Source/WebCore/ChangeLog (145611 => 145612)
--- branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-12 23:40:25 UTC (rev 145611)
+++ branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-12 23:43:17 UTC (rev 145612)
@@ -1,5 +1,19 @@
2013-03-12 Lucas Forschler <[email protected]>
+ Merge r132462
+
+ 2012-10-25 Alexander Pavlov <[email protected]>
+
+ Web Inspector: Improper out-of-order call on a rule that is being removed from the stylesheet.
+ https://bugs.webkit.org/show_bug.cgi?id=100357
+
+ Reviewed by Vsevolod Vlasov.
+
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyleSheet::deleteRule):
+
+2013-03-12 Lucas Forschler <[email protected]>
+
Merge r132398
2012-10-24 Ami Fischman <[email protected]>
Modified: branches/safari-536.30-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp (145611 => 145612)
--- branches/safari-536.30-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp 2013-03-12 23:40:25 UTC (rev 145611)
+++ branches/safari-536.30-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp 2013-03-12 23:43:17 UTC (rev 145612)
@@ -822,16 +822,18 @@
return false;
}
- styleSheet->deleteRule(id.ordinal(), ec);
- if (ec)
- return false;
-
RefPtr<CSSRuleSourceData> sourceData = ruleSourceDataFor(rule->style());
if (!sourceData) {
ec = NOT_FOUND_ERR;
return false;
}
+ styleSheet->deleteRule(id.ordinal(), ec);
+ // |rule| MAY NOT be addressed after this line!
+
+ if (ec)
+ return false;
+
String sheetText = m_parsedStyleSheet->text();
sheetText.remove(sourceData->selectorListRange.start, sourceData->styleSourceData->styleBodyRange.end - sourceData->selectorListRange.start + 1);
m_parsedStyleSheet->setText(sheetText);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
