[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
yurys at chromium.org
yurys at chromium.org
Wed Dec 22 11:43:42 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0edbd630775dd45ae84589d4daf7910854577eac
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 5 06:00:19 2010 +0000
2010-08-05 Yury Semikhatsky <yurys at 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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64713 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1023f0e..85c7f4b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-08-05 Yury Semikhatsky <yurys at 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 at webkit.org>
Reviewed by Adam Barth.
diff --git a/WebCore/inspector/Inspector.idl b/WebCore/inspector/Inspector.idl
index 373dd51..4191780 100644
--- a/WebCore/inspector/Inspector.idl
+++ b/WebCore/inspector/Inspector.idl
@@ -55,6 +55,11 @@ module core {
[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
[handler=Controller] void storeLastActivePanel(in String panelName);
@@ -164,9 +169,9 @@ module core {
#endif
#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
};
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index d2b2df1..ccb0dd4 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -676,7 +676,7 @@ void InspectorController::populateScriptObjects()
#if ENABLE(DOM_STORAGE)
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)
WorkersMap::iterator workersEnd = m_workers.end();
@@ -1396,14 +1396,14 @@ void InspectorController::didUseDOMStorage(StorageArea* storageArea, bool isLoca
m_domStorageResources.set(resource->id(), resource);
// Resources are only bound while visible.
- if (m_frontend)
- resource->bind(m_frontend.get());
+ if (m_remoteFrontend)
+ resource->bind(m_remoteFrontend.get());
}
void InspectorController::selectDOMStorage(Storage* storage)
{
ASSERT(storage);
- if (!m_frontend)
+ if (!m_remoteFrontend)
return;
Frame* frame = storage->frame();
@@ -1418,15 +1418,15 @@ void InspectorController::selectDOMStorage(Storage* storage)
}
}
if (storageResourceId)
- m_frontend->selectDOMStorage(storageResourceId);
+ m_remoteFrontend->selectDOMStorage(storageResourceId);
}
void InspectorController::getDOMStorageEntries(long callId, long storageId)
{
- if (!m_frontend)
+ if (!m_remoteFrontend)
return;
- ScriptArray jsonArray = m_frontend->newScriptArray();
+ RefPtr<InspectorArray> jsonArray = InspectorArray::create();
InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
if (storageResource) {
storageResource->startReportingChangesToFrontend();
@@ -1434,18 +1434,18 @@ void InspectorController::getDOMStorageEntries(long callId, long storageId)
for (unsigned i = 0; i < domStorage->length(); ++i) {
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;
bool success = false;
@@ -1455,12 +1455,12 @@ void InspectorController::setDOMStorageItem(long callId, long storageId, const S
storageResource->domStorage()->setItem(key, value, exception);
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;
bool success = false;
@@ -1469,7 +1469,7 @@ void InspectorController::removeDOMStorageItem(long callId, long storageId, cons
storageResource->domStorage()->removeItem(key);
success = true;
}
- m_frontend->didRemoveDOMStorageItem(callId, success);
+ m_remoteFrontend->didRemoveDOMStorageItem(callId, success);
}
InspectorDOMStorageResource* InspectorController::getDOMStorageResourceForId(long storageId)
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);
}
diff --git a/WebCore/inspector/InspectorDOMStorageResource.h b/WebCore/inspector/InspectorDOMStorageResource.h
index 2b18b24..a47e74c 100644
--- a/WebCore/inspector/InspectorDOMStorageResource.h
+++ b/WebCore/inspector/InspectorDOMStorageResource.h
@@ -34,8 +34,6 @@
#if ENABLE(DOM_STORAGE)
#include "EventListener.h"
-#include "ScriptObject.h"
-#include "ScriptState.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -45,7 +43,7 @@ namespace WebCore {
class Storage;
class Frame;
- class InspectorFrontend;
+ class RemoteInspectorFrontend;
class InspectorDOMStorageResource : public EventListener {
public:
@@ -58,7 +56,7 @@ namespace WebCore {
return listener->type() == InspectorDOMStorageResourceType ? static_cast<const InspectorDOMStorageResource*>(listener) : 0;
}
- void bind(InspectorFrontend* frontend);
+ void bind(RemoteInspectorFrontend* frontend);
void unbind();
void startReportingChangesToFrontend();
@@ -76,7 +74,7 @@ namespace WebCore {
RefPtr<Storage> m_domStorage;
bool m_isLocalStorage;
RefPtr<Frame> m_frame;
- InspectorFrontend* m_frontend;
+ RemoteInspectorFrontend* m_frontend;
int m_id;
bool m_reportingChangesToFrontend;
diff --git a/WebCore/inspector/InspectorFrontend.cpp b/WebCore/inspector/InspectorFrontend.cpp
index 94f7db5..2e925c0 100644
--- a/WebCore/inspector/InspectorFrontend.cpp
+++ b/WebCore/inspector/InspectorFrontend.cpp
@@ -352,61 +352,6 @@ void InspectorFrontend::didGetCookies(long callId, const ScriptArray& cookies, c
function.call();
}
-#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)
{
diff --git a/WebCore/inspector/InspectorFrontend.h b/WebCore/inspector/InspectorFrontend.h
index 630c582..629a40b 100644
--- a/WebCore/inspector/InspectorFrontend.h
+++ b/WebCore/inspector/InspectorFrontend.h
@@ -102,15 +102,6 @@ namespace WebCore {
void didGetProfile(long callId, const ScriptValue& profile);
#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);
void updateNetworkState(bool isNowOnline);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list