plugins/org.chromium.debug.core/src/org/chromium/debug/core/model/Variable.java - Issue 11602013: Redesign scope API, separate declarative and object scopes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: plugins/org.chromium.debug.core/src/org/chromium/debug/core/model/Variable.java

Issue 11602013: Redesign scope API, separate declarative and object scopes. (Closed) Base URL: https://chromedevtools.googlecode.com/svn/trunk

Patch Set: patching other backends Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « plugins/org.chromium.debug.core/src/org/chromium/debug/core/model/ValueBase.java ('k') | plugins/org.chromium.sdk.wipbackend.dev/src/org/chromium/sdk/internal/wip/WipContextBuilder.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: plugins/org.chromium.debug.core/src/org/chromium/debug/core/model/Variable.java

diff --git a/plugins/org.chromium.debug.core/src/org/chromium/debug/core/model/Variable.java b/plugins/org.chromium.debug.core/src/org/chromium/debug/core/model/Variable.java

index dc13ddda4e19eeed1b3c45acd5e4f12a8aa5655d..d7998d70e48671283dde1ba25c248716a089b2f9 100755

--- a/plugins/org.chromium.debug.core/src/org/chromium/debug/core/model/Variable.java

+++ b/plugins/org.chromium.debug.core/src/org/chromium/debug/core/model/Variable.java

@@ -9,14 +9,12 @@ import java.util.List;

import org.chromium.debug.core.ChromiumDebugPlugin;

import org.chromium.sdk.CallbackSemaphore;

-import org.chromium.sdk.ExceptionData;

import org.chromium.sdk.FunctionScopeExtension;

import org.chromium.sdk.JsEvaluateContext;

import org.chromium.sdk.JsEvaluateContext.ResultOrException;

import org.chromium.sdk.JsFunction;

import org.chromium.sdk.JsObjectProperty;

import org.chromium.sdk.JsScope;

-import org.chromium.sdk.JsScope.WithScope;

import org.chromium.sdk.JsValue;

import org.chromium.sdk.JsVariable;

import org.chromium.sdk.RelayOk;

@@ -106,17 +104,11 @@ public abstract class Variable extends DebugElementImpl.WithEvaluate implements

value, null);

}

- public static Variable forScope(EvaluateContext evaluateContext, JsScope scope,

- ExpressionTracker.Node expressionNode) {

+ public static Variable forObjectScope(EvaluateContext evaluateContext,

+ JsScope.ObjectBased scope, ExpressionTracker.Node expressionNode) {

String scopeVariableName = "<" + scope.getType() + ">";

- ValueBase scopeValue = new ValueBase.ScopeValue(evaluateContext, scope, expressionNode);

- return forScopeImpl(evaluateContext, scopeVariableName, scopeValue);

- }

- public static Variable forWithScope(EvaluateContext evaluateContext,

- WithScope withScope, ExpressionTracker.Node expressionNode) {

- Value value = Value.create(evaluateContext, withScope.getWithArgument(), expressionNode);

- return forScopeImpl(evaluateContext, "<with>", value);

+ Value value = Value.create(evaluateContext, scope.getScopeObject(), expressionNode);

+ return forScopeImpl(evaluateContext, scopeVariableName, value);

}

private static Variable forScopeImpl(EvaluateContext evaluateContext, String scopeName,