[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
podivilov at chromium.org
podivilov at chromium.org
Sun Feb 20 23:59:14 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 5fb5bb12bddc7fdd50a088b2b1384f10a9cc4ac1
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 27 14:22:11 2011 +0000
2011-01-27 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: Closure and Global variable details automatically collapsing on each step through JavaScript code.
https://bugs.webkit.org/show_bug.cgi?id=53234
* inspector/debugger-expand-scope.html:
* inspector/debugger-proto-property.html:
2011-01-27 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: Closure and Global variable details automatically collapsing on each step through JavaScript code.
https://bugs.webkit.org/show_bug.cgi?id=53234
* inspector/front-end/ScopeChainSidebarPane.js:
(WebInspector.ScopeChainSidebarPane):
(WebInspector.ScopeChainSidebarPane.prototype.update):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76795 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4933cb7..c416bf7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-27 Pavel Podivilov <podivilov at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: Closure and Global variable details automatically collapsing on each step through JavaScript code.
+ https://bugs.webkit.org/show_bug.cgi?id=53234
+
+ * inspector/debugger-expand-scope.html:
+ * inspector/debugger-proto-property.html:
+
2011-01-27 Philippe Normand <pnormand at igalia.com>
Unreviewed, fix typo introduced in r76783.
diff --git a/LayoutTests/inspector/debugger-expand-scope.html b/LayoutTests/inspector/debugger-expand-scope.html
index 2ddc71c..cf7a751 100755
--- a/LayoutTests/inspector/debugger-expand-scope.html
+++ b/LayoutTests/inspector/debugger-expand-scope.html
@@ -35,7 +35,7 @@ function test()
{
// Expand all but global scopes. Expanding global scope takes for too long
// so we keep it collapsed.
- var sections = WebInspector.currentPanel.sidebarPanes.scopechain.sections;
+ var sections = WebInspector.currentPanel.sidebarPanes.scopechain._sections;
// global scope is always the last one.
for (var i = 0; i < sections.length - 1; i++)
sections[i].expand();
@@ -44,7 +44,7 @@ function test()
function step3()
{
- var sections = WebInspector.currentPanel.sidebarPanes.scopechain.sections;
+ var sections = WebInspector.currentPanel.sidebarPanes.scopechain._sections;
InspectorTest.addResult("");
InspectorTest.addResult("Dump scope sections:");
for (var i = 0; i < sections.length; i++) {
diff --git a/LayoutTests/inspector/debugger-proto-property.html b/LayoutTests/inspector/debugger-proto-property.html
index 28ef10a..c4f4fbe 100644
--- a/LayoutTests/inspector/debugger-proto-property.html
+++ b/LayoutTests/inspector/debugger-proto-property.html
@@ -30,7 +30,7 @@ var test = function()
function step2(callFrames)
{
- var sections = WebInspector.currentPanel.sidebarPanes.scopechain.sections;
+ var sections = WebInspector.currentPanel.sidebarPanes.scopechain._sections;
var localScope = sections[0].propertiesTreeOutline;
var properties = [
localScope, ["o", "__proto__", "__proto__"],
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f6ced11..b149dce 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-27 Pavel Podivilov <podivilov at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: Closure and Global variable details automatically collapsing on each step through JavaScript code.
+ https://bugs.webkit.org/show_bug.cgi?id=53234
+
+ * inspector/front-end/ScopeChainSidebarPane.js:
+ (WebInspector.ScopeChainSidebarPane):
+ (WebInspector.ScopeChainSidebarPane.prototype.update):
+
2011-01-27 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r76789.
diff --git a/Source/WebCore/inspector/front-end/ScopeChainSidebarPane.js b/Source/WebCore/inspector/front-end/ScopeChainSidebarPane.js
index d3190a9..bdbb0cf 100644
--- a/Source/WebCore/inspector/front-end/ScopeChainSidebarPane.js
+++ b/Source/WebCore/inspector/front-end/ScopeChainSidebarPane.js
@@ -26,6 +26,8 @@
WebInspector.ScopeChainSidebarPane = function()
{
WebInspector.SidebarPane.call(this, WebInspector.UIString("Scope Variables"));
+ this._sections = [];
+ this._expandedSections = {};
this._expandedProperties = [];
}
@@ -34,9 +36,6 @@ WebInspector.ScopeChainSidebarPane.prototype = {
{
this.bodyElement.removeChildren();
- this.sections = [];
- this.callFrame = callFrame;
-
if (!callFrame) {
var infoElement = document.createElement("div");
infoElement.className = "info";
@@ -45,6 +44,18 @@ WebInspector.ScopeChainSidebarPane.prototype = {
return;
}
+ for (var i = 0; i < this._sections.length; ++i) {
+ var section = this._sections[i];
+ if (!section.title)
+ continue;
+ if (section.expanded)
+ this._expandedSections[section.title] = true;
+ else
+ delete this._expandedSections[section.title];
+ }
+
+ this._sections = [];
+
var foundLocalScope = false;
var scopeChain = callFrame.scopeChain;
for (var i = 0; i < scopeChain.length; ++i) {
@@ -81,10 +92,10 @@ WebInspector.ScopeChainSidebarPane.prototype = {
section.editInSelectedCallFrameWhenPaused = true;
section.pane = this;
- if (!foundLocalScope || scopeObjectProxy.isLocal)
+ if (!foundLocalScope || scopeObjectProxy.isLocal || title in this._expandedSections)
section.expanded = true;
- this.sections.push(section);
+ this._sections.push(section);
this.bodyElement.appendChild(section.element);
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list