Merge 76680 - 2011-01-26 Pavel Feldman <pfeldman@chromium.org>...

Source/WebCore/inspector/InjectedScript.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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 26 matching lines @@
 #include "PlatformString.h"
 #include "ScriptFunctionCall.h"
 
 namespace WebCore {
 
 InjectedScript::InjectedScript(ScriptObject injectedScriptObject)
     : m_injectedScriptObject(injectedScriptObject)
 {
 }
 
-void InjectedScript::evaluate(const String& expression, const String& objectGroup, RefPtr<InspectorValue>* result)
+void InjectedScript::evaluate(const String& expression, const String& objectGroup, bool includeCommandLineAPI, RefPtr<InspectorValue>* result)
 {
     ScriptFunctionCall function(m_injectedScriptObject, "evaluate");
     function.appendArgument(expression);
     function.appendArgument(objectGroup);
+    function.appendArgument(includeCommandLineAPI);
     makeCall(function, result);
 }
 
-void InjectedScript::evaluateOnCallFrame(PassRefPtr<InspectorObject> callFrameId, const String& expression, const String& objectGroup, RefPtr<InspectorValue>* result)
+void InjectedScript::evaluateOnCallFrame(PassRefPtr<InspectorObject> callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, RefPtr<InspectorValue>* result)
 {
     ScriptFunctionCall function(m_injectedScriptObject, "evaluateOnCallFrame");
     function.appendArgument(callFrameId->toJSONString());
     function.appendArgument(expression);
     function.appendArgument(objectGroup);
+    function.appendArgument(includeCommandLineAPI);
     makeCall(function, result);
 }
 
 void InjectedScript::evaluateOnSelf(const String& functionBody, PassRefPtr<InspectorArray> argumentsArray, RefPtr<InspectorValue>* result)
 {
     ScriptFunctionCall function(m_injectedScriptObject, "evaluateOnSelf");
     function.appendArgument(functionBody);
     function.appendArgument(argumentsArray->toJSONString());
     makeCall(function, result);
 }
 
-void InjectedScript::getCompletions(const String& expression, bool includeInspectorCommandLineAPI, RefPtr<InspectorValue>* result)
+void InjectedScript::getCompletions(const String& expression, bool includeCommandLineAPI, RefPtr<InspectorValue>* result)
 {
     ScriptFunctionCall function(m_injectedScriptObject, "getCompletions");
     function.appendArgument(expression);
-    function.appendArgument(includeInspectorCommandLineAPI);
+    function.appendArgument(includeCommandLineAPI);
     makeCall(function, result);
 }
 
-void InjectedScript::getCompletionsOnCallFrame(PassRefPtr<InspectorObject> callFrameId, const String& expression, bool includeInspectorCommandLineAPI, RefPtr<InspectorValue>* result)
+void InjectedScript::getCompletionsOnCallFrame(PassRefPtr<InspectorObject> callFrameId, const String& expression, bool includeCommandLineAPI, RefPtr<InspectorValue>* result)
 {
     ScriptFunctionCall function(m_injectedScriptObject, "getCompletionsOnCallFrame");
     function.appendArgument(callFrameId->toJSONString());
     function.appendArgument(expression);
-    function.appendArgument(includeInspectorCommandLineAPI);
+    function.appendArgument(includeCommandLineAPI);
     makeCall(function, result);
 }
 
 void InjectedScript::getProperties(PassRefPtr<InspectorObject> objectId, bool ignoreHasOwnProperty, bool abbreviate, RefPtr<InspectorValue>* result)
 {
     ScriptFunctionCall function(m_injectedScriptObject, "getProperties");
     String objectIdString = objectId->toJSONString();
     function.appendArgument(objectIdString);
     function.appendArgument(ignoreHasOwnProperty);
     function.appendArgument(abbreviate);
@@ skipping 87 matching lines @@
     ASSERT(!hadException);
     if (!hadException)
         *result = resultValue.toInspectorValue(m_injectedScriptObject.scriptState());
     else
         *result = InspectorValue::null();
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)