Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 101 deletions

diff --git a/WebCore/inspector/InjectedScript.cpp b/WebCore/inspector/InjectedScript.cpp
deleted file mode 100644
index 3f4d819..0000000
--- a/WebCore/inspector/InjectedScript.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "InjectedScript.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorValues.h"
-#include "PlatformString.h"
-#include "ScriptFunctionCall.h"
-
-namespace WebCore {
-
-InjectedScript::InjectedScript(ScriptObject injectedScriptObject)
-    : m_injectedScriptObject(injectedScriptObject)
-{
-}
-
-void InjectedScript::dispatch(const String& methodName, const String& arguments, RefPtr<InspectorValue>* result, bool* hadException) 
-{
-    ASSERT(!hasNoValue());
-    if (!canAccessInspectedWindow()) {
-        *hadException = true;
-        return;
-    }
-
-    ScriptFunctionCall function(m_injectedScriptObject, "dispatch");
-    function.appendArgument(methodName);
-    function.appendArgument(arguments);
-    *hadException = false;
-    ScriptValue resultValue = function.call(*hadException);
-    if (!*hadException)
-        *result = resultValue.toInspectorValue(m_injectedScriptObject.scriptState());
-}
-
-#if ENABLE(JAVASCRIPT_DEBUGGER)
-PassRefPtr<InspectorValue> InjectedScript::callFrames()
-{
-    ASSERT(!hasNoValue());
-    ScriptFunctionCall function(m_injectedScriptObject, "callFrames");
-    ScriptValue callFramesValue = function.call();
-    return callFramesValue.toInspectorValue(m_injectedScriptObject.scriptState());
-}
-#endif
-
-PassRefPtr<InspectorValue> InjectedScript::wrapForConsole(ScriptValue value)
-{
-    ASSERT(!hasNoValue());
-    ScriptFunctionCall wrapFunction(m_injectedScriptObject, "wrapObjectForConsole");
-    wrapFunction.appendArgument(value);
-    wrapFunction.appendArgument(canAccessInspectedWindow());
-    bool hadException = false;
-    ScriptValue r = wrapFunction.call(hadException);
-    if (hadException)
-        return InspectorString::create("<exception>");
-    return r.toInspectorValue(m_injectedScriptObject.scriptState());
-}
-
-void InjectedScript::releaseWrapperObjectGroup(const String& objectGroup)
-{
-    ASSERT(!hasNoValue());
-    ScriptFunctionCall releaseFunction(m_injectedScriptObject, "releaseWrapperObjectGroup");
-    releaseFunction.appendArgument(objectGroup);
-    releaseFunction.call();
-}
-bool InjectedScript::canAccessInspectedWindow()
-{
-    return InjectedScriptHost::canAccessInspectedWindow(m_injectedScriptObject.scriptState());
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)