diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
| commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
| tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebCore/inspector/InspectorCSSAgent.cpp | |
| parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
| download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 | |
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
Diffstat (limited to 'WebCore/inspector/InspectorCSSAgent.cpp')
| -rw-r--r-- | WebCore/inspector/InspectorCSSAgent.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
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); } |