Changeset 64713 in webkit

Timestamp:

Aug 4, 2010 11:00:19 PM (14 years ago)

Author:

yurys@chromium.org

Message:

2010-08-05 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: serialize DOM storage items to InspectorValues
​https://bugs.webkit.org/show_bug.cgi?id=43486

• inspector/Inspector.idl:
• inspector/InspectorController.cpp: (WebCore::InspectorController::populateScriptObjects): (WebCore::InspectorController::didUseDOMStorage): (WebCore::InspectorController::selectDOMStorage): (WebCore::InspectorController::getDOMStorageEntries): (WebCore::InspectorController::setDOMStorageItem): (WebCore::InspectorController::removeDOMStorageItem):
• inspector/InspectorDOMStorageResource.cpp: (WebCore::InspectorDOMStorageResource::bind):
• inspector/InspectorDOMStorageResource.h:
• inspector/InspectorFrontend.cpp:
• inspector/InspectorFrontend.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/Inspector.idl (modified) (2 diffs)
• inspector/InspectorController.cpp (modified) (7 diffs)
• inspector/InspectorDOMStorageResource.cpp (modified) (2 diffs)
• inspector/InspectorDOMStorageResource.h (modified) (4 diffs)
• inspector/InspectorFrontend.cpp (modified) (1 diff)
• inspector/InspectorFrontend.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-05  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: serialize DOM storage items to InspectorValues
+        https://bugs.webkit.org/show_bug.cgi?id=43486
+
+        * inspector/Inspector.idl:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::populateScriptObjects):
+        (WebCore::InspectorController::didUseDOMStorage):
+        (WebCore::InspectorController::selectDOMStorage):
+        (WebCore::InspectorController::getDOMStorageEntries):
+        (WebCore::InspectorController::setDOMStorageItem):
+        (WebCore::InspectorController::removeDOMStorageItem):
+        * inspector/InspectorDOMStorageResource.cpp:
+        (WebCore::InspectorDOMStorageResource::bind):
+        * inspector/InspectorDOMStorageResource.h:
+        * inspector/InspectorFrontend.cpp:
+        * inspector/InspectorFrontend.h:
+
 2010-08-04  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/inspector/Inspector.idl

@@ -55 +55 @@
         [notify] void addDatabase(out Object database);
         [notify] void selectDatabase(out int databaseId);
+#endif
+#if defined(ENABLE_DOM_STORAGE) && ENABLE_DOM_STORAGE
+        [notify] void addDOMStorage(out Object storage);
+        [notify] void updateDOMStorage(out int storageId);
+        [notify] void selectDOMStorage(out int storageId);
 #endif
 
@@ -165 +170 @@
 
 #if defined(ENABLE_DOM_STORAGE) && ENABLE_DOM_STORAGE
-        [handler=Controller] void getDOMStorageEntries(in long callId, in long storageId);
-        [handler=Controller] void setDOMStorageItem(in long callId, in long storageId, in String key, in String value);
-        [handler=Controller] void removeDOMStorageItem(in long callId, in long storageId, in String key);
+        [handler=Controller] void getDOMStorageEntries(in long callId, in long storageId, out Array entries);
+        [handler=Controller] void setDOMStorageItem(in long callId, in long storageId, in String key, in String value, out boolean success);
+        [handler=Controller] void removeDOMStorageItem(in long callId, in long storageId, in String key, out boolean success);
 #endif
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -677 +677 @@
     DOMStorageResourcesMap::iterator domStorageEnd = m_domStorageResources.end();
     for (DOMStorageResourcesMap::iterator it = m_domStorageResources.begin(); it != domStorageEnd; ++it)
-        it->second->bind(m_frontend.get());
+        it->second->bind(m_remoteFrontend.get());
 #endif
 #if ENABLE(WORKERS)
@@ -1397 +1397 @@
 
     // Resources are only bound while visible.
-    if (m_frontend)
-        resource->bind(m_frontend.get());
+    if (m_remoteFrontend)
+        resource->bind(m_remoteFrontend.get());
 }
 
@@ -1404 +1404 @@
 {
     ASSERT(storage);
-    if (!m_frontend)
+    if (!m_remoteFrontend)
         return;
 
@@ -1419 +1419 @@
     }
     if (storageResourceId)
-        m_frontend->selectDOMStorage(storageResourceId);
+        m_remoteFrontend->selectDOMStorage(storageResourceId);
 }
 
 void InspectorController::getDOMStorageEntries(long callId, long storageId)
 {
-    if (!m_frontend)
-        return;
-
-    ScriptArray jsonArray = m_frontend->newScriptArray();
+    if (!m_remoteFrontend)
+        return;
+
+    RefPtr<InspectorArray> jsonArray = InspectorArray::create();
     InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
     if (storageResource) {
@@ -1435 +1435 @@
             String name(domStorage->key(i));
             String value(domStorage->getItem(name));
-            ScriptArray entry = m_frontend->newScriptArray();
-            entry.set(0, name);
-            entry.set(1, value);
-            jsonArray.set(i, entry);
+            RefPtr<InspectorArray> entry = InspectorArray::create();
+            entry->pushString(name);
+            entry->pushString(value);
+            jsonArray->push(entry);
         }
     }
-    m_frontend->didGetDOMStorageEntries(callId, jsonArray);
+    m_remoteFrontend->didGetDOMStorageEntries(callId, jsonArray);
 }
 
 void InspectorController::setDOMStorageItem(long callId, long storageId, const String& key, const String& value)
 {
-    if (!m_frontend)
+    if (!m_remoteFrontend)
         return;
 
@@ -1456 +1456 @@
         success = !exception;
     }
-    m_frontend->didSetDOMStorageItem(callId, success);
+    m_remoteFrontend->didSetDOMStorageItem(callId, success);
 }
 
 void InspectorController::removeDOMStorageItem(long callId, long storageId, const String& key)
 {
-    if (!m_frontend)
+    if (!m_remoteFrontend)
         return;
 
@@ -1470 +1470 @@
         success = true;
     }
-    m_frontend->didRemoveDOMStorageItem(callId, success);
+    m_remoteFrontend->didRemoveDOMStorageItem(callId, success);
 }
 

trunk/WebCore/inspector/InspectorDOMStorageResource.cpp

@@ -35 +35 @@
 #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"
@@ -66 +65 @@
 }
 
-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);
 }

trunk/WebCore/inspector/InspectorDOMStorageResource.h

@@ -35 +35 @@
 
 #include "EventListener.h"
-#include "ScriptObject.h"
-#include "ScriptState.h"
 
 #include <wtf/PassRefPtr.h>
@@ -46 +44 @@
     class Storage;
     class Frame;
-    class InspectorFrontend;
+    class RemoteInspectorFrontend;
 
     class InspectorDOMStorageResource : public EventListener {
@@ -59 +57 @@
         }
 
-        void bind(InspectorFrontend* frontend);
+        void bind(RemoteInspectorFrontend* frontend);
         void unbind();
         void startReportingChangesToFrontend();
@@ -77 +75 @@
         bool m_isLocalStorage;
         RefPtr<Frame> m_frame;
-        InspectorFrontend* m_frontend;
+        RemoteInspectorFrontend* m_frontend;
         int m_id;
         bool m_reportingChangesToFrontend;

trunk/WebCore/inspector/InspectorFrontend.cpp

@@ -353 +353 @@
 }
 
-#if ENABLE(DOM_STORAGE)
-bool InspectorFrontend::addDOMStorage(const ScriptObject& domStorageObj)
-{
-    ScriptFunctionCall function(m_webInspector, "dispatch"); 
-    function.appendArgument("addDOMStorage");
-    function.appendArgument(domStorageObj);
-    bool hadException = false;
-    function.call(hadException);
-    return !hadException;
-}
-
-void InspectorFrontend::selectDOMStorage(long storageId)
-{
-    ScriptFunctionCall function(m_webInspector, "dispatch"); 
-    function.appendArgument("selectDOMStorage");
-    function.appendArgument(storageId);
-    function.call();
-}
-
-void InspectorFrontend::didGetDOMStorageEntries(long callId, const ScriptArray& entries)
-{
-    ScriptFunctionCall function(m_webInspector, "dispatch"); 
-    function.appendArgument("didGetDOMStorageEntries");
-    function.appendArgument(callId);
-    function.appendArgument(entries);
-    function.call();
-}
-
-void InspectorFrontend::didSetDOMStorageItem(long callId, bool success)
-{
-    ScriptFunctionCall function(m_webInspector, "dispatch"); 
-    function.appendArgument("didSetDOMStorageItem");
-    function.appendArgument(callId);
-    function.appendArgument(success);
-    function.call();
-}
-
-void InspectorFrontend::didRemoveDOMStorageItem(long callId, bool success)
-{
-    ScriptFunctionCall function(m_webInspector, "dispatch"); 
-    function.appendArgument("didRemoveDOMStorageItem");
-    function.appendArgument(callId);
-    function.appendArgument(success);
-    function.call();
-}
-
-void InspectorFrontend::updateDOMStorage(long storageId)
-{
-    ScriptFunctionCall function(m_webInspector, "dispatch");
-    function.appendArgument("updateDOMStorage");
-    function.appendArgument(storageId);
-    function.call();
-}
-#endif
-
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
 void InspectorFrontend::didGetApplicationCaches(long callId, const ScriptValue& applicationCaches)

trunk/WebCore/inspector/InspectorFrontend.h

@@ -103 +103 @@
 #endif
 
-#if ENABLE(DOM_STORAGE)
-        bool addDOMStorage(const ScriptObject& domStorageObj);
-        void selectDOMStorage(long storageId);
-        void didGetDOMStorageEntries(long callId, const ScriptArray& entries);
-        void didSetDOMStorageItem(long callId, bool success);
-        void didRemoveDOMStorageItem(long callId, bool success);
-        void updateDOMStorage(long storageId);
-#endif
-
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
         void updateApplicationCacheStatus(int status);