[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
loislo at chromium.org
loislo at chromium.org
Wed Dec 22 13:28:47 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d230d0b077360e0c3991f9db1d7bd97df6f12bae
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 16 19:13:05 2010 +0000
2010-09-16 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: move resourceTracking flag under control of BackendSettings.
Four Inspector API methods about resourceTracking flag were removed.
Actual state of the flag is transfered as the response of setResourceTracking request.
Initial state of the flag on the frontend side is obtained from settings.backend.
https://bugs.webkit.org/show_bug.cgi?id=45887
WebCore:
* inspector/Inspector.idl:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::getBackendSettings):
(WebCore::InspectorController::populateScriptObjects):
(WebCore::InspectorController::setResourceTracking):
* inspector/InspectorController.h:
* inspector/front-end/ResourcesPanel.js:
(WebInspector.ResourcesPanel.prototype._toggleResourceTracking):
* inspector/front-end/Settings.js:
(WebInspector.Settings.initialize.populateBackendSettings):
(WebInspector.Settings.initialize):
* inspector/front-end/inspector.js:
WebKit/chromium:
* src/WebDevToolsAgentImpl.cpp:
(WebKit::WebDevToolsAgentImpl::setRuntimeProperty):
(WebKit::WebDevToolsAgentImpl::setApuAgentEnabled):
LayoutTests:
* http/tests/inspector/inspector-test2.js:
(initialize_InspectorTest.InspectorTest.enableResourceTracking):
(initialize_InspectorTest.InspectorTest.disableResourceTracking):
* http/tests/inspector/resource-parameters.html:
* inspector/audits-panel-functional.html:
* inspector/report-API-errors-expected.txt:
* inspector/report-API-errors.html:
* inspector/styles-source-offsets.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67647 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 208943d..c999b0e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2010-09-16 Ilya Tikhonovsky <loislo at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: move resourceTracking flag under control of BackendSettings.
+
+ Four Inspector API methods about resourceTracking flag were removed.
+ Actual state of the flag is transfered as the response of setResourceTracking request.
+ Initial state of the flag on the frontend side is obtained from settings.backend.
+
+ https://bugs.webkit.org/show_bug.cgi?id=45887
+
+ * http/tests/inspector/inspector-test2.js:
+ (initialize_InspectorTest.InspectorTest.enableResourceTracking):
+ (initialize_InspectorTest.InspectorTest.disableResourceTracking):
+ * http/tests/inspector/resource-parameters.html:
+ * inspector/audits-panel-functional.html:
+ * inspector/report-API-errors-expected.txt:
+ * inspector/report-API-errors.html:
+ * inspector/styles-source-offsets.html:
+
2010-09-16 Jian Li <jianli at chromium.org>
Reviewed by David Levin.
diff --git a/LayoutTests/http/tests/inspector/inspector-test2.js b/LayoutTests/http/tests/inspector/inspector-test2.js
index ea2c2c0..13f3b25 100644
--- a/LayoutTests/http/tests/inspector/inspector-test2.js
+++ b/LayoutTests/http/tests/inspector/inspector-test2.js
@@ -94,13 +94,14 @@ InspectorTest.enableResourceTracking = function(callback)
callback();
else {
InspectorTest._reloadPageCallback = callback;
- InspectorBackend.enableResourceTracking(false);
+ WebInspector.panels.resources._toggleResourceTracking();
}
};
InspectorTest.disableResourceTracking = function()
{
- InspectorBackend.disableResourceTracking(false);
+ if (WebInspector.panels.resources.resourceTrackingEnabled)
+ WebInspector.panels.resources._toggleResourceTracking();
};
InspectorTest.findDOMNode = function(root, filter, callback)
diff --git a/LayoutTests/http/tests/inspector/resource-parameters.html b/LayoutTests/http/tests/inspector/resource-parameters.html
index 31fbd88..1b28bf2 100644
--- a/LayoutTests/http/tests/inspector/resource-parameters.html
+++ b/LayoutTests/http/tests/inspector/resource-parameters.html
@@ -33,7 +33,7 @@ function onIframeLoad()
function frontend_enableResourceTracking(testController)
{
if (!WebInspector.panels.resources.resourceTrackingEnabled) {
- InspectorBackend.enableResourceTracking(false);
+ WebInspector.panels.resources._toggleResourceTracking();
return "enabling";
}
return "enabled";
@@ -43,7 +43,7 @@ function frontend_dumpFormData(testController)
{
var resource = WebInspector.resourceURLMap["http://localhost:8000/inspector/resources/post-target.cgi?queryParam1=queryValue1&queryParam2="];
- InspectorBackend.disableResourceTracking(false);
+ WebInspector.panels.resources._toggleResourceTracking();
if (!resource) {
testController.notifyDone("No resource found");
diff --git a/LayoutTests/inspector/audits-panel-functional.html b/LayoutTests/inspector/audits-panel-functional.html
index e7a2804..23fa491 100644
--- a/LayoutTests/inspector/audits-panel-functional.html
+++ b/LayoutTests/inspector/audits-panel-functional.html
@@ -34,7 +34,7 @@ function doit()
function frontend_runAudits(testController)
{
if (!WebInspector.panels.resources.resourceTrackingEnabled) {
- InspectorBackend.enableResourceTracking(false);
+ WebInspector.panels.resources._toggleResourceTracking();
return "refreshing";
}
@@ -52,7 +52,7 @@ function frontend_runAudits(testController)
// Audits are done, check results.
var output = frontend_collectAuditResults();
// Avoid influencing tests that require resource tracking to be disabled.
- InspectorBackend.disableResourceTracking(false);
+ WebInspector.panels.resources._toggleResourceTracking();
testController.runAfterPendingDispatches(function() {
testController.notifyDone(output.join("\n"));
});
diff --git a/LayoutTests/inspector/report-API-errors-expected.txt b/LayoutTests/inspector/report-API-errors-expected.txt
index d3e5072..a2c5043 100644
--- a/LayoutTests/inspector/report-API-errors-expected.txt
+++ b/LayoutTests/inspector/report-API-errors-expected.txt
@@ -1,7 +1,7 @@
Tests that InspectorBackendStub is catching incorrect arguments.
-Protocol Error: Invalid type of argument 'always' for 'InspectorBackend.enableResourceTracking' call. It should be 'boolean' but it is 'number'.
-Protocol Error: Invalid number of arguments for 'InspectorBackend.enableResourceTracking' call. It should have the next arguments '{"always":"boolean"}'.
-Protocol Error: Optional callback argument for 'InspectorBackend.enableResourceTracking' call should be a function but its type is 'string'.
+Protocol Error: Invalid type of argument 'enable' for 'InspectorBackend.setMonitoringXHR' call. It should be 'boolean' but it is 'number'.
+Protocol Error: Invalid number of arguments for 'InspectorBackend.setMonitoringXHR' call. It should have the next arguments '{"enable":"boolean"}'.
+Protocol Error: Optional callback argument for 'InspectorBackend.setMonitoringXHR' call should be a function but its type is 'string'.
Protocol Error: Attempted to dispatch an unimplemented WebInspector method 'something-strange'
diff --git a/LayoutTests/inspector/report-API-errors.html b/LayoutTests/inspector/report-API-errors.html
index c5dcf1a..edd2dfe 100644
--- a/LayoutTests/inspector/report-API-errors.html
+++ b/LayoutTests/inspector/report-API-errors.html
@@ -11,9 +11,9 @@ function test()
InspectorTest.addResult(String.sprintf.apply(this, arguments));
}
- InspectorBackend.enableResourceTracking(1);
- InspectorBackend.enableResourceTracking();
- InspectorBackend.enableResourceTracking(true, "not a function");
+ InspectorBackend.setMonitoringXHR(1);
+ InspectorBackend.setMonitoringXHR();
+ InspectorBackend.setMonitoringXHR(true, "not a function");
InspectorBackend.setMonitoringXHR(true, undefined);
InspectorBackend.setMonitoringXHR(false, undefined);
WebInspector_syncDispatch('{"type": "event", "domain": "dom", "event": "something-strange", "data": {}}');
diff --git a/LayoutTests/inspector/styles-source-offsets.html b/LayoutTests/inspector/styles-source-offsets.html
index 0533611..d840f43 100644
--- a/LayoutTests/inspector/styles-source-offsets.html
+++ b/LayoutTests/inspector/styles-source-offsets.html
@@ -25,7 +25,7 @@ function doit()
function frontend_runTest(testController)
{
if (!WebInspector.panels.resources.resourceTrackingEnabled) {
- InspectorBackend.enableResourceTracking(false);
+ WebInspector.panels.resources._toggleResourceTracking();
return "refreshing";
}
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0763542..e0140c6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,28 @@
+2010-09-16 Ilya Tikhonovsky <loislo at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: move resourceTracking flag under control of BackendSettings.
+
+ Four Inspector API methods about resourceTracking flag were removed.
+ Actual state of the flag is transfered as the response of setResourceTracking request.
+ Initial state of the flag on the frontend side is obtained from settings.backend.
+
+ https://bugs.webkit.org/show_bug.cgi?id=45887
+
+ * inspector/Inspector.idl:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::getBackendSettings):
+ (WebCore::InspectorController::populateScriptObjects):
+ (WebCore::InspectorController::setResourceTracking):
+ * inspector/InspectorController.h:
+ * inspector/front-end/ResourcesPanel.js:
+ (WebInspector.ResourcesPanel.prototype._toggleResourceTracking):
+ * inspector/front-end/Settings.js:
+ (WebInspector.Settings.initialize.populateBackendSettings):
+ (WebInspector.Settings.initialize):
+ * inspector/front-end/inspector.js:
+
2010-09-16 Jian Li <jianli at chromium.org>
Reviewed by David Levin.
diff --git a/WebCore/inspector/Inspector.idl b/WebCore/inspector/Inspector.idl
index 26f2653..05c53ad 100644
--- a/WebCore/inspector/Inspector.idl
+++ b/WebCore/inspector/Inspector.idl
@@ -47,8 +47,6 @@ module core {
[notify] void removeResource(out unsigned long identifier);
[notify] void reset();
[notify] void resetProfilesPanel();
- [notify] void resourceTrackingWasEnabled();
- [notify] void resourceTrackingWasDisabled();
[notify] void searchingForNodeWasEnabled();
[notify] void searchingForNodeWasDisabled();
[notify] void setChildNodes(out long parentId, out Array nodes);
@@ -110,8 +108,7 @@ module core {
[handler=Controller] void setMonitoringXHR(in boolean enable, out boolean newState);
- [handler=Controller] void enableResourceTracking(in boolean always);
- [handler=Controller] void disableResourceTracking(in boolean always);
+ [handler=Controller] void setResourceTracking(in boolean enable, in boolean always, out boolean newState);
[handler=Controller] void getResourceContent(in unsigned long identifier, out String content);
[handler=Controller] void reloadPage();
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 6e1e94a..7cba325 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -252,6 +252,7 @@ String InspectorController::getBackendSettings()
{
RefPtr<InspectorObject> runtimeSettings = InspectorObject::create();
runtimeSettings->setBoolean(monitoringXHRSettingName, m_monitoringXHR);
+ runtimeSettings->setBoolean(resourceTrackingEnabledSettingName, m_resourceTrackingEnabled);
return runtimeSettings->toJSONString();
}
@@ -617,9 +618,6 @@ void InspectorController::populateScriptObjects()
showPanel(m_showAfterVisible);
- if (m_resourceTrackingEnabled)
- m_frontend->resourceTrackingWasEnabled();
-
if (m_searchingForNode)
m_frontend->searchingForNodeWasEnabled();
@@ -1122,40 +1120,33 @@ void InspectorController::scriptImported(unsigned long identifier, const String&
resource->updateScriptObject(m_frontend.get());
}
-void InspectorController::enableResourceTracking(bool always, bool reload)
+void InspectorController::setResourceTracking(bool enable, bool always, bool* newState)
{
- if (!enabled())
- return;
+ *newState = enable;
if (always)
- setSetting(resourceTrackingEnabledSettingName, "true");
+ setSetting(resourceTrackingEnabledSettingName, enable ? "true" : "false");
- if (m_resourceTrackingEnabled)
+ if (m_resourceTrackingEnabled == enable)
return;
ASSERT(m_inspectedPage);
- m_resourceTrackingEnabled = true;
- if (m_frontend)
- m_frontend->resourceTrackingWasEnabled();
- m_client->resourceTrackingWasEnabled();
+ m_resourceTrackingEnabled = enable;
- if (reload)
+ if (enable) {
+ m_client->resourceTrackingWasEnabled();
m_inspectedPage->mainFrame()->redirectScheduler()->scheduleRefresh(true);
+ } else
+ m_client->resourceTrackingWasDisabled();
}
-void InspectorController::disableResourceTracking(bool always)
+void InspectorController::setResourceTracking(bool enable)
{
if (!enabled())
return;
- if (always)
- setSetting(resourceTrackingEnabledSettingName, "false");
-
ASSERT(m_inspectedPage);
- m_resourceTrackingEnabled = false;
- if (m_frontend)
- m_frontend->resourceTrackingWasDisabled();
- m_client->resourceTrackingWasDisabled();
+ m_resourceTrackingEnabled = enable;
}
void InspectorController::ensureSettingsLoaded()
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index bce1bf5..35aae89 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -171,8 +171,8 @@ public:
void resourceRetrievedByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber);
void scriptImported(unsigned long identifier, const String& sourceString);
- void enableResourceTracking(bool always = false, bool reload = true);
- void disableResourceTracking(bool always = false);
+ void setResourceTracking(bool enable);
+ void setResourceTracking(bool enable, bool always, bool* newState);
bool resourceTrackingEnabled() const { return m_resourceTrackingEnabled; }
void ensureSettingsLoaded();
diff --git a/WebCore/inspector/front-end/ResourcesPanel.js b/WebCore/inspector/front-end/ResourcesPanel.js
index 8fa8229..0c6abe0 100644
--- a/WebCore/inspector/front-end/ResourcesPanel.js
+++ b/WebCore/inspector/front-end/ResourcesPanel.js
@@ -753,16 +753,23 @@ WebInspector.ResourcesPanel.prototype = {
_toggleResourceTracking: function(optionalAlways)
{
+ function callback(newState) {
+ if (newState)
+ WebInspector.panels.resources.resourceTrackingWasEnabled();
+ else
+ WebInspector.panels.resources.resourceTrackingWasDisabled();
+ }
+
if (this._resourceTrackingEnabled) {
this.largerResourcesButton.visible = false;
this.sortingSelectElement.visible = false;
WebInspector.resources = {};
WebInspector.resourceURLMap = {};
- InspectorBackend.disableResourceTracking(true);
+ InspectorBackend.setResourceTracking(false, true, callback);
} else {
this.largerResourcesButton.visible = true;
this.sortingSelectElement.visible = true;
- InspectorBackend.enableResourceTracking(!!optionalAlways);
+ InspectorBackend.setResourceTracking(true, !!optionalAlways, callback);
}
},
diff --git a/WebCore/inspector/front-end/Settings.js b/WebCore/inspector/front-end/Settings.js
index 05fd25e..52a8bd0 100644
--- a/WebCore/inspector/front-end/Settings.js
+++ b/WebCore/inspector/front-end/Settings.js
@@ -87,6 +87,10 @@ WebInspector.Settings.initialize = function()
var settings = JSON.parse(settingsString);
WebInspector.monitoringXHREnabled = settings.monitoringXHREnabled;
+ if (settings.resourceTrackingEnabled)
+ WebInspector.panels.resources.resourceTrackingWasEnabled();
+ else
+ WebInspector.panels.resources.resourceTrackingWasDisabled();
}
InspectorBackend.getSettings(function(settings) {
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index da77de3..704f16a 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1373,16 +1373,6 @@ WebInspector.updateNetworkState = function(isNowOnline)
this.panels.storage.updateNetworkState(isNowOnline);
}
-WebInspector.resourceTrackingWasEnabled = function()
-{
- this.panels.resources.resourceTrackingWasEnabled();
-}
-
-WebInspector.resourceTrackingWasDisabled = function()
-{
- this.panels.resources.resourceTrackingWasDisabled();
-}
-
WebInspector.searchingForNodeWasEnabled = function()
{
this.panels.elements.searchingForNodeWasEnabled();
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 71fe5f7..6b0607f 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-16 Ilya Tikhonovsky <loislo at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: move resourceTracking flag under control of BackendSettings.
+
+ Four Inspector API methods about resourceTracking flag were removed.
+ Actual state of the flag is transfered as the response of setResourceTracking request.
+ Initial state of the flag on the frontend side is obtained from settings.backend.
+
+ https://bugs.webkit.org/show_bug.cgi?id=45887
+
+ * src/WebDevToolsAgentImpl.cpp:
+ (WebKit::WebDevToolsAgentImpl::setRuntimeProperty):
+ (WebKit::WebDevToolsAgentImpl::setApuAgentEnabled):
+
2010-09-16 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index 4cf496a..9ba63ec 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -256,10 +256,7 @@ void WebDevToolsAgentImpl::setRuntimeProperty(const WebString& name, const WebSt
setTimelineProfilingEnabled(value == "true");
else if (name == kResourceTrackingFeatureName) {
InspectorController* ic = inspectorController();
- if (value == "true")
- ic->enableResourceTracking(false /* not sticky */, false /* no reload */);
- else
- ic->disableResourceTracking(false /* not sticky */);
+ ic->setResourceTracking(value == "true");
} else if (name == kFrontendConnectedFeatureName && !inspectorController()->hasFrontend()) {
inspectorController()->injectedScriptHost()->setInjectedScriptSource(value);
connectFrontend(true);
@@ -278,13 +275,13 @@ void WebDevToolsAgentImpl::setApuAgentEnabled(bool enabled)
if (!m_resourceTrackingWasEnabled) {
// TODO(knorton): Introduce some kind of agents dependency here so that
// user could turn off resource tracking while apu agent is on.
- ic->enableResourceTracking(false, false);
+ ic->setResourceTracking(true);
}
m_debuggerAgentImpl->setAutoContinueOnException(true);
} else {
ic->stopTimelineProfiler();
if (!m_resourceTrackingWasEnabled)
- ic->disableResourceTracking(false);
+ ic->setResourceTracking(false);
m_resourceTrackingWasEnabled = false;
}
m_client->runtimePropertyChanged(
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list