Merge 72938 - 2010-11-30 Pavel Feldman <pfeldman@chromium.org>...

WebCore/inspector/InspectorCSSAgent.cpp

 /*
  * Copyright (C) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 267 matching lines @@
 
 void InspectorCSSAgent::getStyleSheetText2(const String& styleSheetId, String* url, String* result)
 {
     InspectorStyleSheet* inspectorStyleSheet = styleSheetForId(styleSheetId);
     if (!inspectorStyleSheet)
         return;
     *url = inspectorStyleSheet->finalURL();
     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);
 }
 
 void InspectorCSSAgent::setPropertyText2(const RefPtr<InspectorObject>& fullStyleId, long propertyIndex, const String& text, bool overwrite, RefPtr<InspectorValue>* result)
 {
     InspectorCSSId compoundId(fullStyleId);
     ASSERT(!compoundId.isEmpty());
 
     InspectorStyleSheet* inspectorStyleSheet = styleSheetForId(compoundId.styleSheetId());
     if (!inspectorStyleSheet)
@@ skipping 230 matching lines @@
     if (it == m_nodeToInspectorStyleSheet.end())
         return;
 
     m_idToInspectorStyleSheet.remove(it->second->id());
     m_nodeToInspectorStyleSheet.remove(node);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)