1 files changed, 9 insertions, 9 deletions
diff --git a/src/3rdparty/webkit/WebCore/inspector/InspectorFrontend.cpp b/src/3rdparty/webkit/WebCore/inspector/InspectorFrontend.cpp
index aacbb90..255f1d8 100644
--- a/src/3rdparty/webkit/WebCore/inspector/InspectorFrontend.cpp
+++ b/src/3rdparty/webkit/WebCore/inspector/InspectorFrontend.cpp
@@ -33,7 +33,7 @@
 #include "ConsoleMessage.h"
 #include "Frame.h"
 #include "InspectorController.h"  // TODO(pfeldman): Extract SpecialPanels to remove include.
-#include "JSONObject.h"
+#include "InspectorJSONObject.h"
 #include "Node.h"
 #include "ScriptFunctionCall.h"
 #include "ScriptObject.h"
@@ -61,11 +61,11 @@ InspectorFrontend::~InspectorFrontend()
     m_webInspector = ScriptObject();
 }
 
-JSONObject InspectorFrontend::newJSONObject() {
-    return JSONObject::createNew(m_scriptState);
+InspectorJSONObject InspectorFrontend::newInspectorJSONObject() {
+    return InspectorJSONObject::createNew(m_scriptState);
 }
 
-void InspectorFrontend::addMessageToConsole(const JSONObject& messageObj, const Vector<ScriptString>& frames, const Vector<ScriptValue> wrappedArguments, const String& message)
+void InspectorFrontend::addMessageToConsole(const InspectorJSONObject& messageObj, const Vector<ScriptString>& frames, const Vector<ScriptValue> wrappedArguments, const String& message)
 {
     OwnPtr<ScriptFunctionCall> function(newFunctionCall("addMessageToConsole"));
     function->appendArgument(messageObj.scriptObject());
@@ -80,7 +80,7 @@ void InspectorFrontend::addMessageToConsole(const JSONObject& messageObj, const
     function->call();
 }
 
-bool InspectorFrontend::addResource(long long identifier, const JSONObject& resourceObj)
+bool InspectorFrontend::addResource(long long identifier, const InspectorJSONObject& resourceObj)
 {
     OwnPtr<ScriptFunctionCall> function(newFunctionCall("addResource"));
     function->appendArgument(identifier);
@@ -90,7 +90,7 @@ bool InspectorFrontend::addResource(long long identifier, const JSONObject& reso
     return !hadException;
 }
 
-bool InspectorFrontend::updateResource(long long identifier, const JSONObject& resourceObj)
+bool InspectorFrontend::updateResource(long long identifier, const InspectorJSONObject& resourceObj)
 {
     OwnPtr<ScriptFunctionCall> function(newFunctionCall("updateResource"));
     function->appendArgument(identifier);
@@ -216,7 +216,7 @@ void InspectorFrontend::profilerWasDisabled()
 void InspectorFrontend::parsedScriptSource(const JSC::SourceCode& source)
 {
     OwnPtr<ScriptFunctionCall> function(newFunctionCall("parsedScriptSource"));
-    function->appendArgument(static_cast<long long>(source.provider()->asID()));
+    function->appendArgument(JSC::UString(JSC::UString::from(source.provider()->asID())));
     function->appendArgument(source.provider()->url());
     function->appendArgument(JSC::UString(source.data(), source.length()));
     function->appendArgument(source.firstLine());
@@ -260,7 +260,7 @@ void InspectorFrontend::resumedScript()
 #endif
 
 #if ENABLE(DATABASE)
-bool InspectorFrontend::addDatabase(const JSONObject& dbObject)
+bool InspectorFrontend::addDatabase(const InspectorJSONObject& dbObject)
 {
     OwnPtr<ScriptFunctionCall> function(newFunctionCall("addDatabase"));
     function->appendArgument(dbObject.scriptObject());
@@ -271,7 +271,7 @@ bool InspectorFrontend::addDatabase(const JSONObject& dbObject)
 #endif
 
 #if ENABLE(DOM_STORAGE)
-bool InspectorFrontend::addDOMStorage(const JSONObject& domStorageObj)
+bool InspectorFrontend::addDOMStorage(const InspectorJSONObject& domStorageObj)
 {
     OwnPtr<ScriptFunctionCall> function(newFunctionCall("addDOMStorage"));
     function->appendArgument(domStorageObj.scriptObject());