From d06194330da2bb8da887d2e1adeacb3a5c1504b2 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 5 Jan 2011 12:15:11 +0000 Subject: Merge WebKit at r72805: Initial merge by Git Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790 --- WebCore/inspector/InspectorCSSAgent.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'WebCore/inspector/InspectorCSSAgent.cpp') diff --git a/WebCore/inspector/InspectorCSSAgent.cpp b/WebCore/inspector/InspectorCSSAgent.cpp index 31d951a..fd1deb5 100644 --- a/WebCore/inspector/InspectorCSSAgent.cpp +++ b/WebCore/inspector/InspectorCSSAgent.cpp @@ -285,16 +285,14 @@ void InspectorCSSAgent::getStyleSheetText2(const String& styleSheetId, String* u inspectorStyleSheet->text(result); } -void InspectorCSSAgent::setStyleSheetText2(const String& styleSheetId, const String& text, bool* success) +void InspectorCSSAgent::setStyleSheetText2(const String& styleSheetId, const String& text) { InspectorStyleSheet* inspectorStyleSheet = styleSheetForId(styleSheetId); - if (!inspectorStyleSheet) { - *success = false; + if (!inspectorStyleSheet) return; - } - *success = inspectorStyleSheet->setText(text); - if (*success) + bool success = inspectorStyleSheet->setText(text); + if (success) inspectorStyleSheet->reparseStyleSheet(text); } -- cgit v1.1