Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849

* changes:
  Merge WebKit at r65072 : Update WebKit revision number.
  Merge WebKit at r65072 : Update test_expectations.
  Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
  Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
  Merge WebKit at r65072: JSC build fix in InspectorController.h
  Merge WebKit at r65072: Fix V8 code generator.
  Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
  Merge WebKit at r65072: String class has moved to the WTF namespace.
  Merge Webkit at r65072 : Fix conflicts.
  Merge Webkit at r65072 : Fix Makefiles.
  Merge WebKit at r65072 : Initial merge by git.

1 files changed, 7 insertions, 8 deletions

diff --git a/WebCore/inspector/InspectorDOMStorageResource.cpp b/WebCore/inspector/InspectorDOMStorageResource.cpp
index af0530a..61095a0 100644
--- a/WebCore/inspector/InspectorDOMStorageResource.cpp
+++ b/WebCore/inspector/InspectorDOMStorageResource.cpp
@@ -34,12 +34,11 @@
 
 #include "InspectorDOMStorageResource.h"
 
-#include "Document.h"
 #include "DOMWindow.h"
 #include "EventNames.h"
 #include "Frame.h"
-#include "InspectorFrontend.h"
-#include "ScriptObject.h"
+#include "InspectorValues.h"
+#include "RemoteInspectorFrontend.h"
 #include "Storage.h"
 #include "StorageEvent.h"
 
@@ -65,15 +64,15 @@ bool InspectorDOMStorageResource::isSameHostAndType(Frame* frame, bool isLocalSt
     return equalIgnoringCase(m_frame->document()->securityOrigin()->host(), frame->document()->securityOrigin()->host()) && m_isLocalStorage == isLocalStorage;
 }
 
-void InspectorDOMStorageResource::bind(InspectorFrontend* frontend)
+void InspectorDOMStorageResource::bind(RemoteInspectorFrontend* frontend)
 {
     ASSERT(!m_frontend);
     m_frontend = frontend;
 
-    ScriptObject jsonObject = frontend->newScriptObject();
-    jsonObject.set("host", m_frame->document()->securityOrigin()->host());
-    jsonObject.set("isLocalStorage", m_isLocalStorage);
-    jsonObject.set("id", m_id);
+    RefPtr<InspectorObject> jsonObject = InspectorObject::create();
+    jsonObject->setString("host", m_frame->document()->securityOrigin()->host());
+    jsonObject->setBool("isLocalStorage", m_isLocalStorage);
+    jsonObject->setNumber("id", m_id);
     frontend->addDOMStorage(jsonObject);
 }