[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:53 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8b1b198accddc11fc724fa7fd6158f117b78bdbd
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 5 08:31:18 2010 +0000
2010-08-05 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: forbid InspectorController to create script objects directly in the frontend
https://bugs.webkit.org/show_bug.cgi?id=43541
Cookie and AppCache data are now serialized into InspectorValues instead of
ScriptObjects. These were last usages of InspectorFrontend::newScript{Object,Array}
so we can remove them now and use only InspectorValues to pass data to the inspector
frontend.
* inspector/Inspector.idl:
* inspector/InspectorApplicationCacheAgent.cpp:
(WebCore::InspectorApplicationCacheAgent::InspectorApplicationCacheAgent):
(WebCore::InspectorApplicationCacheAgent::getApplicationCaches):
(WebCore::InspectorApplicationCacheAgent::buildObjectForApplicationCache):
(WebCore::InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources):
(WebCore::InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource):
* inspector/InspectorApplicationCacheAgent.h:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::connectFrontend):
(WebCore::InspectorController::getCookies):
(WebCore::InspectorController::buildArrayForCookies):
(WebCore::InspectorController::buildObjectForCookie):
* inspector/InspectorController.h:
* inspector/InspectorFrontend.cpp:
(WebCore::InspectorFrontend::setRecordingProfile):
* inspector/InspectorFrontend.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64722 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bd5b1a1..4948ab0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,33 @@
+2010-08-05 Yury Semikhatsky <yurys at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: forbid InspectorController to create script objects directly in the frontend
+ https://bugs.webkit.org/show_bug.cgi?id=43541
+
+ Cookie and AppCache data are now serialized into InspectorValues instead of
+ ScriptObjects. These were last usages of InspectorFrontend::newScript{Object,Array}
+ so we can remove them now and use only InspectorValues to pass data to the inspector
+ frontend.
+
+ * inspector/Inspector.idl:
+ * inspector/InspectorApplicationCacheAgent.cpp:
+ (WebCore::InspectorApplicationCacheAgent::InspectorApplicationCacheAgent):
+ (WebCore::InspectorApplicationCacheAgent::getApplicationCaches):
+ (WebCore::InspectorApplicationCacheAgent::buildObjectForApplicationCache):
+ (WebCore::InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources):
+ (WebCore::InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource):
+ * inspector/InspectorApplicationCacheAgent.h:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::connectFrontend):
+ (WebCore::InspectorController::getCookies):
+ (WebCore::InspectorController::buildArrayForCookies):
+ (WebCore::InspectorController::buildObjectForCookie):
+ * inspector/InspectorController.h:
+ * inspector/InspectorFrontend.cpp:
+ (WebCore::InspectorFrontend::setRecordingProfile):
+ * inspector/InspectorFrontend.h:
+
2010-08-05 Mario Sanchez Prada <msanchez at igalia.com>
Reviewed by Xan Lopez.
diff --git a/WebCore/inspector/ConsoleMessage.cpp b/WebCore/inspector/ConsoleMessage.cpp
index 9c0b783..8985cb7 100644
--- a/WebCore/inspector/ConsoleMessage.cpp
+++ b/WebCore/inspector/ConsoleMessage.cpp
@@ -36,7 +36,7 @@
#include "InspectorFrontend.h"
#include "InspectorValues.h"
#include "ScriptCallStack.h"
-#include "ScriptObject.h"
+#include "ScriptValue.h"
#if ENABLE(INSPECTOR)
#include "RemoteInspectorFrontend.h"
diff --git a/WebCore/inspector/ConsoleMessage.h b/WebCore/inspector/ConsoleMessage.h
index cb5e6f0..e286f0a 100644
--- a/WebCore/inspector/ConsoleMessage.h
+++ b/WebCore/inspector/ConsoleMessage.h
@@ -33,7 +33,6 @@
#include "Console.h"
#include "KURL.h"
-#include "ScriptObject.h"
#include "ScriptState.h"
#include <wtf/Vector.h>
@@ -44,7 +43,7 @@ class InspectorObject;
class RemoteInspectorFrontend;
class ScriptCallFrame;
class ScriptCallStack;
-class ScriptString;
+class ScriptValue;
class ConsoleMessage : public Noncopyable {
public:
diff --git a/WebCore/inspector/Inspector.idl b/WebCore/inspector/Inspector.idl
index 4191780..cea683b 100644
--- a/WebCore/inspector/Inspector.idl
+++ b/WebCore/inspector/Inspector.idl
@@ -60,6 +60,10 @@ module core {
[notify] void updateDOMStorage(out int storageId);
[notify] void selectDOMStorage(out int storageId);
#endif
+#if defined(ENABLE_OFFLINE_WEB_APPLICATIONS) && ENABLE_OFFLINE_WEB_APPLICATIONS
+ [notify] void updateApplicationCacheStatus(out int status);
+ [notify] void updateNetworkState(out boolean isNowOnline);
+#endif
[handler=Controller] void storeLastActivePanel(in String panelName);
@@ -154,11 +158,11 @@ module core {
[handler=DOM] void setRuleSelector(in long callId, in long ruleId, in String selector, in long selectedNodeId, out Value rule, out boolean selectorAffectsNode);
[handler=DOM] void addRule(in long callId, in String selector, in long selectedNodeId, out Value rule, out boolean selectorAffectsNode);
- [handler=Controller] void getCookies(in long callId);
+ [handler=Controller] void getCookies(in long callId, out Array cookies, out String cookiesString);
[handler=Controller] void deleteCookie(in String cookieName, in String domain);
#if defined(ENABLE_OFFLINE_WEB_APPLICATIONS) && ENABLE_OFFLINE_WEB_APPLICATIONS
- [handler=ApplicationCache] void getApplicationCaches(in long callId);
+ [handler=ApplicationCache] void getApplicationCaches(in long callId, out Value applicationCaches);
#endif
[handler=Backend] void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
diff --git a/WebCore/inspector/InspectorApplicationCacheAgent.cpp b/WebCore/inspector/InspectorApplicationCacheAgent.cpp
index 1ea7556..e4392f5 100644
--- a/WebCore/inspector/InspectorApplicationCacheAgent.cpp
+++ b/WebCore/inspector/InspectorApplicationCacheAgent.cpp
@@ -33,15 +33,14 @@
#include "Frame.h"
#include "FrameLoader.h"
#include "InspectorController.h"
-#include "InspectorFrontend.h"
+#include "InspectorValues.h"
#include "Page.h"
+#include "RemoteInspectorFrontend.h"
#include "ResourceResponse.h"
-#include "ScriptArray.h"
-#include "ScriptObject.h"
namespace WebCore {
-InspectorApplicationCacheAgent::InspectorApplicationCacheAgent(InspectorController* inspectorController, InspectorFrontend* frontend)
+InspectorApplicationCacheAgent::InspectorApplicationCacheAgent(InspectorController* inspectorController, RemoteInspectorFrontend* frontend)
: m_inspectorController(inspectorController)
, m_frontend(frontend)
{
@@ -65,49 +64,49 @@ void InspectorApplicationCacheAgent::updateNetworkState(bool isNowOnline)
void InspectorApplicationCacheAgent::getApplicationCaches(long callId)
{
DocumentLoader* documentLoader = m_inspectorController->inspectedPage()->mainFrame()->loader()->documentLoader();
- if (!documentLoader) {
- m_frontend->didGetApplicationCaches(callId, ScriptValue::undefined());
- return;
- }
-
- ApplicationCacheHost* host = documentLoader->applicationCacheHost();
- ApplicationCacheHost::CacheInfo info = host->applicationCacheInfo();
-
- ApplicationCacheHost::ResourceInfoList resources;
- host->fillResourceList(&resources);
-
- m_frontend->didGetApplicationCaches(callId, buildObjectForApplicationCache(resources, info));
+ RefPtr<InspectorValue> applicationCaches;
+ if (documentLoader) {
+ ApplicationCacheHost* host = documentLoader->applicationCacheHost();
+ ApplicationCacheHost::CacheInfo info = host->applicationCacheInfo();
+
+ ApplicationCacheHost::ResourceInfoList resources;
+ host->fillResourceList(&resources);
+ applicationCaches = buildObjectForApplicationCache(resources, info);
+ } else
+ applicationCaches = InspectorValue::null();
+
+ m_frontend->didGetApplicationCaches(callId, applicationCaches);
}
-ScriptObject InspectorApplicationCacheAgent::buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
+PassRefPtr<InspectorObject> InspectorApplicationCacheAgent::buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
{
- ScriptObject value = m_frontend->newScriptObject();
- value.set("size", applicationCacheInfo.m_size);
- value.set("manifest", applicationCacheInfo.m_manifest.string());
- value.set("lastPathComponent", applicationCacheInfo.m_manifest.lastPathComponent());
- value.set("creationTime", applicationCacheInfo.m_creationTime);
- value.set("updateTime", applicationCacheInfo.m_updateTime);
- value.set("resources", buildArrayForApplicationCacheResources(applicationCacheResources));
+ RefPtr<InspectorObject> value = InspectorObject::create();
+ value->setNumber("size", applicationCacheInfo.m_size);
+ value->setString("manifest", applicationCacheInfo.m_manifest.string());
+ value->setString("lastPathComponent", applicationCacheInfo.m_manifest.lastPathComponent());
+ value->setNumber("creationTime", applicationCacheInfo.m_creationTime);
+ value->setNumber("updateTime", applicationCacheInfo.m_updateTime);
+ value->set("resources", buildArrayForApplicationCacheResources(applicationCacheResources));
return value;
}
-ScriptArray InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources)
+PassRefPtr<InspectorArray> InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources)
{
- ScriptArray resources = m_frontend->newScriptArray();
+ RefPtr<InspectorArray> resources = InspectorArray::create();
ApplicationCacheHost::ResourceInfoList::const_iterator end = applicationCacheResources.end();
ApplicationCacheHost::ResourceInfoList::const_iterator it = applicationCacheResources.begin();
for (int i = 0; it != end; ++it, i++)
- resources.set(i, buildObjectForApplicationCacheResource(*it));
+ resources->push(buildObjectForApplicationCacheResource(*it));
return resources;
}
-ScriptObject InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo& resourceInfo)
+PassRefPtr<InspectorObject> InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo& resourceInfo)
{
- ScriptObject value = m_frontend->newScriptObject();
- value.set("name", resourceInfo.m_resource.string());
- value.set("size", resourceInfo.m_size);
+ RefPtr<InspectorObject> value = InspectorObject::create();
+ value->setString("name", resourceInfo.m_resource.string());
+ value->setNumber("size", resourceInfo.m_size);
String types;
if (resourceInfo.m_isMaster)
@@ -125,7 +124,7 @@ ScriptObject InspectorApplicationCacheAgent::buildObjectForApplicationCacheResou
if (resourceInfo.m_isExplicit)
types.append("Explicit ");
- value.set("type", types);
+ value->setString("type", types);
return value;
}
diff --git a/WebCore/inspector/InspectorApplicationCacheAgent.h b/WebCore/inspector/InspectorApplicationCacheAgent.h
index 33cc2ed..e03ba4c 100644
--- a/WebCore/inspector/InspectorApplicationCacheAgent.h
+++ b/WebCore/inspector/InspectorApplicationCacheAgent.h
@@ -29,18 +29,19 @@
#include "ApplicationCacheHost.h"
#include <wtf/Noncopyable.h>
+#include <wtf/PassRefPtr.h>
namespace WebCore {
+class InspectorArray;
class InspectorController;
-class InspectorFrontend;
+class InspectorObject;
+class RemoteInspectorFrontend;
class ResourceResponse;
-class ScriptArray;
-class ScriptObject;
class InspectorApplicationCacheAgent : public Noncopyable {
public:
- InspectorApplicationCacheAgent(InspectorController* inspectorController, InspectorFrontend* frontend);
+ InspectorApplicationCacheAgent(InspectorController* inspectorController, RemoteInspectorFrontend* frontend);
~InspectorApplicationCacheAgent() { }
// Backend to Frontend
@@ -52,12 +53,12 @@ public:
void getApplicationCaches(long callId);
private:
- ScriptObject buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList&, const ApplicationCacheHost::CacheInfo&);
- ScriptArray buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList&);
- ScriptObject buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo&);
+ PassRefPtr<InspectorObject> buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList&, const ApplicationCacheHost::CacheInfo&);
+ PassRefPtr<InspectorArray> buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList&);
+ PassRefPtr<InspectorObject> buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo&);
InspectorController* m_inspectorController;
- InspectorFrontend* m_frontend;
+ RemoteInspectorFrontend* m_frontend;
};
} // namespace WebCore
diff --git a/WebCore/inspector/InspectorBackend.cpp b/WebCore/inspector/InspectorBackend.cpp
index cffff41..48ef602 100644
--- a/WebCore/inspector/InspectorBackend.cpp
+++ b/WebCore/inspector/InspectorBackend.cpp
@@ -42,7 +42,6 @@
#include "InspectorDOMAgent.h"
#include "InspectorFrontend.h"
#include "RemoteInspectorFrontend.h"
-#include "ScriptArray.h"
#include "ScriptBreakpoint.h"
#include "ScriptProfiler.h"
#include "SerializedScriptValue.h"
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index ccb0dd4..2052adb 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -533,7 +533,7 @@ void InspectorController::connectFrontend(const ScriptObject& webInspector)
showPanel(m_showAfterVisible);
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
- m_applicationCacheAgent = new InspectorApplicationCacheAgent(this, m_frontend.get());
+ m_applicationCacheAgent = new InspectorApplicationCacheAgent(this, m_remoteFrontend.get());
#endif
if (!connectedFrontendCount)
@@ -1300,7 +1300,7 @@ void InspectorController::didOpenDatabase(PassRefPtr<Database> database, const S
void InspectorController::getCookies(long callId)
{
- if (!m_frontend)
+ if (!m_remoteFrontend)
return;
// If we can get raw cookies.
@@ -1336,36 +1336,41 @@ void InspectorController::getCookies(long callId)
}
}
- if (!rawCookiesImplemented)
- m_frontend->didGetCookies(callId, m_frontend->newScriptArray(), stringCookiesList);
- else
- m_frontend->didGetCookies(callId, buildArrayForCookies(rawCookiesList), String());
+ RefPtr<InspectorArray> cookies;
+ String cookiesString;
+ if (rawCookiesImplemented)
+ cookies = buildArrayForCookies(rawCookiesList);
+ else {
+ cookies = InspectorArray::create();
+ cookiesString = stringCookiesList;
+ }
+ m_remoteFrontend->didGetCookies(callId, cookies, cookiesString);
}
-ScriptArray InspectorController::buildArrayForCookies(ListHashSet<Cookie>& cookiesList)
+PassRefPtr<InspectorArray> InspectorController::buildArrayForCookies(ListHashSet<Cookie>& cookiesList)
{
- ScriptArray cookies = m_frontend->newScriptArray();
+ RefPtr<InspectorArray> cookies = InspectorArray::create();
ListHashSet<Cookie>::iterator end = cookiesList.end();
ListHashSet<Cookie>::iterator it = cookiesList.begin();
for (int i = 0; it != end; ++it, i++)
- cookies.set(i, buildObjectForCookie(*it));
+ cookies->push(buildObjectForCookie(*it));
return cookies;
}
-ScriptObject InspectorController::buildObjectForCookie(const Cookie& cookie)
+PassRefPtr<InspectorObject> InspectorController::buildObjectForCookie(const Cookie& cookie)
{
- ScriptObject value = m_frontend->newScriptObject();
- value.set("name", cookie.name);
- value.set("value", cookie.value);
- value.set("domain", cookie.domain);
- value.set("path", cookie.path);
- value.set("expires", cookie.expires);
- value.set("size", (cookie.name.length() + cookie.value.length()));
- value.set("httpOnly", cookie.httpOnly);
- value.set("secure", cookie.secure);
- value.set("session", cookie.session);
+ RefPtr<InspectorObject> value = InspectorObject::create();
+ value->setString("name", cookie.name);
+ value->setString("value", cookie.value);
+ value->setString("domain", cookie.domain);
+ value->setString("path", cookie.path);
+ value->setNumber("expires", cookie.expires);
+ value->setNumber("size", (cookie.name.length() + cookie.value.length()));
+ value->setBool("httpOnly", cookie.httpOnly);
+ value->setBool("secure", cookie.secure);
+ value->setBool("session", cookie.session);
return value;
}
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 6265ad2..07a40eb 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -33,9 +33,7 @@
#include "Cookie.h"
#include "InspectorDOMAgent.h"
#include "PlatformString.h"
-#include "ScriptArray.h"
#include "ScriptBreakpoint.h"
-#include "ScriptObject.h"
#include "ScriptProfile.h"
#include "ScriptState.h"
#include "StringHash.h"
@@ -82,6 +80,7 @@ class ResourceRequest;
class ResourceResponse;
class ResourceError;
class ScriptCallStack;
+class ScriptObject;
class ScriptString;
class SharedBuffer;
class Storage;
@@ -328,8 +327,8 @@ private:
InspectorDOMStorageResource* getDOMStorageResourceForId(long storageId);
#endif
- ScriptObject buildObjectForCookie(const Cookie&);
- ScriptArray buildArrayForCookies(ListHashSet<Cookie>&);
+ PassRefPtr<InspectorObject> buildObjectForCookie(const Cookie&);
+ PassRefPtr<InspectorArray> buildArrayForCookies(ListHashSet<Cookie>&);
void focusNode();
diff --git a/WebCore/inspector/InspectorFrontend.cpp b/WebCore/inspector/InspectorFrontend.cpp
index 2e925c0..994f4dc 100644
--- a/WebCore/inspector/InspectorFrontend.cpp
+++ b/WebCore/inspector/InspectorFrontend.cpp
@@ -32,19 +32,11 @@
#if ENABLE(INSPECTOR)
-#include "Frame.h"
-#include "InjectedScript.h"
-#include "InjectedScriptHost.h"
#include "InspectorClient.h"
#include "InspectorController.h"
#include "InspectorWorkerResource.h"
-#include "Node.h"
#include "ScriptFunctionCall.h"
-#include "ScriptObject.h"
#include "ScriptState.h"
-#include "ScriptString.h"
-#include "ScriptValue.h"
-#include <wtf/OwnPtr.h>
namespace WebCore {
@@ -71,16 +63,6 @@ void InspectorFrontend::inspectedPageDestroyed()
function.call();
}
-ScriptArray InspectorFrontend::newScriptArray()
-{
- return ScriptArray::createNew(scriptState());
-}
-
-ScriptObject InspectorFrontend::newScriptObject()
-{
- return ScriptObject::createNew(scriptState());
-}
-
void InspectorFrontend::didCommitLoad()
{
callSimpleFunction("didCommitLoad");
@@ -302,15 +284,6 @@ void InspectorFrontend::setRecordingProfile(bool isProfiling)
function.appendArgument(isProfiling);
function.call();
}
-
-void InspectorFrontend::didGetProfile(long callId, const ScriptValue& profile)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument("didGetProfile");
- function.appendArgument(callId);
- function.appendArgument(profile);
- function.call();
-}
#endif
void InspectorFrontend::didPushNodeByPathToFrontend(long callId, long nodeId)
@@ -342,43 +315,6 @@ void InspectorFrontend::didDestroyWorker(const InspectorWorkerResource& worker)
}
#endif // ENABLE(WORKERS)
-void InspectorFrontend::didGetCookies(long callId, const ScriptArray& cookies, const String& cookiesString)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument("didGetCookies");
- function.appendArgument(callId);
- function.appendArgument(cookies);
- function.appendArgument(cookiesString);
- function.call();
-}
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-void InspectorFrontend::didGetApplicationCaches(long callId, const ScriptValue& applicationCaches)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument("didGetApplicationCaches");
- function.appendArgument(callId);
- function.appendArgument(applicationCaches);
- function.call();
-}
-
-void InspectorFrontend::updateApplicationCacheStatus(int status)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument("updateApplicationCacheStatus");
- function.appendArgument(status);
- function.call();
-}
-
-void InspectorFrontend::updateNetworkState(bool isNowOnline)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument("updateNetworkState");
- function.appendArgument(isNowOnline);
- function.call();
-}
-#endif
-
void InspectorFrontend::contextMenuItemSelected(int itemId)
{
ScriptFunctionCall function(m_webInspector, "dispatch");
diff --git a/WebCore/inspector/InspectorFrontend.h b/WebCore/inspector/InspectorFrontend.h
index 629a40b..d7cef04 100644
--- a/WebCore/inspector/InspectorFrontend.h
+++ b/WebCore/inspector/InspectorFrontend.h
@@ -30,21 +30,13 @@
#ifndef InspectorFrontend_h
#define InspectorFrontend_h
-#include "InspectorValues.h"
-#include "ScriptArray.h"
#include "ScriptObject.h"
#include "ScriptState.h"
#include <wtf/PassOwnPtr.h>
namespace WebCore {
- class ConsoleMessage;
- class Frame;
class InspectorClient;
- class InspectorResource;
class InspectorWorkerResource;
- class Node;
- class ScriptString;
- class Storage;
class InspectorFrontend : public Noncopyable {
public:
@@ -57,9 +49,6 @@ namespace WebCore {
void close();
void inspectedPageDestroyed();
- ScriptArray newScriptArray();
- ScriptObject newScriptObject();
-
void didCommitLoad();
void populateApplicationSettings(const String& settings);
@@ -99,13 +88,6 @@ namespace WebCore {
void profilerWasEnabled();
void profilerWasDisabled();
void setRecordingProfile(bool isProfiling);
- void didGetProfile(long callId, const ScriptValue& profile);
-#endif
-
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
- void updateApplicationCacheStatus(int status);
- void updateNetworkState(bool isNowOnline);
- void didGetApplicationCaches(long callId, const ScriptValue& applicationCaches);
#endif
void didPushNodeByPathToFrontend(long callId, long nodeId);
@@ -118,8 +100,6 @@ namespace WebCore {
void didDestroyWorker(const InspectorWorkerResource&);
#endif // ENABLE(WORKER)
- void didGetCookies(long callId, const ScriptArray& cookies, const String& cookiesString);
-
void contextMenuItemSelected(int itemId);
void contextMenuCleared();
diff --git a/WebCore/inspector/TimelineRecordFactory.cpp b/WebCore/inspector/TimelineRecordFactory.cpp
index 8b4a97f..87622ce 100644
--- a/WebCore/inspector/TimelineRecordFactory.cpp
+++ b/WebCore/inspector/TimelineRecordFactory.cpp
@@ -39,7 +39,6 @@
#include "IntRect.h"
#include "ResourceRequest.h"
#include "ResourceResponse.h"
-#include "ScriptArray.h"
#include "ScriptCallStack.h"
namespace WebCore {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list