summaryrefslogtreecommitdiffstats
path: root/WebCore/inspector/InspectorCSSAgent.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-01-06 21:36:31 +0000
committerBen Murdoch <benm@google.com>2011-01-07 10:36:05 +0000
commit4a156157940f51b91eadd76f6c86f862ec0a1da0 (patch)
treeee905fa007e14522848f571215c1054734db9269 /WebCore/inspector/InspectorCSSAgent.cpp
parent21d8d81a756ca7e60b5131e5f1006f52799179b0 (diff)
downloadexternal_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.zip
external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.gz
external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.bz2
Merge WebKit at Chromium 9.0.597.55: trivial merge by git
Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
Diffstat (limited to 'WebCore/inspector/InspectorCSSAgent.cpp')
-rw-r--r--WebCore/inspector/InspectorCSSAgent.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/WebCore/inspector/InspectorCSSAgent.cpp b/WebCore/inspector/InspectorCSSAgent.cpp
index fd1deb5..31d951a 100644
--- a/WebCore/inspector/InspectorCSSAgent.cpp
+++ b/WebCore/inspector/InspectorCSSAgent.cpp
@@ -285,14 +285,16 @@ void InspectorCSSAgent::getStyleSheetText2(const String& styleSheetId, String* u
inspectorStyleSheet->text(result);
}
-void InspectorCSSAgent::setStyleSheetText2(const String& styleSheetId, const String& text)
+void InspectorCSSAgent::setStyleSheetText2(const String& styleSheetId, const String& text, bool* success)
{
InspectorStyleSheet* inspectorStyleSheet = styleSheetForId(styleSheetId);
- if (!inspectorStyleSheet)
+ if (!inspectorStyleSheet) {
+ *success = false;
return;
+ }
- bool success = inspectorStyleSheet->setText(text);
- if (success)
+ *success = inspectorStyleSheet->setText(text);
+ if (*success)
inspectorStyleSheet->reparseStyleSheet(text);
}