Version 0.8.10.8

dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/dartium/DartiumDebugStackFrame.java

 /*
  * Copyright (c) 2012, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 45 matching lines @@
  */
 public class DartiumDebugStackFrame extends DartiumDebugElement implements IStackFrame,
     IDartStackFrame, IExceptionStackFrame, IVariableResolver, IExpressionEvaluator {
   private IThread thread;
   private WebkitCallFrame webkitFrame;
 
   private boolean isExceptionStackFrame;
 
   private VariableCollector variableCollector = VariableCollector.empty();
 
+  private IValue classValue;
+  private IValue globalScopeValue;
+
   public DartiumDebugStackFrame(IDebugTarget target, IThread thread, WebkitCallFrame webkitFrame) {
     this(target, thread, webkitFrame, null);
   }
 
   public DartiumDebugStackFrame(IDebugTarget target, IThread thread, WebkitCallFrame webkitFrame,
       WebkitRemoteObject exception) {
     super(target);
 
     this.thread = thread;
     this.webkitFrame = webkitFrame;
@@ skipping 85 matching lines @@
     IVariable thisVar = getThisVariable();
 
     if (thisVar != null) {
       IValue thisValue = thisVar.getValue();
 
       for (IVariable var : thisValue.getVariables()) {
         if (var.getName().equals(varName)) {
           return var;
         }
       }
+    }
 
-      // search statics for an instance method
-      if (thisValue instanceof DartiumDebugValue) {
-        IValue classValue = ((DartiumDebugValue) thisValue).getClassValue();
-
-        if (classValue != null) {
-          for (IVariable var : classValue.getVariables()) {
-            if (var.getName().equals(varName)) {
-              return var;
-            }
-          }
+    // search statics
+    if (getClassValue() != null) {
+      for (IVariable var : getClassValue().getVariables()) {
+        if (var.getName().equals(varName)) {
+          return var;
         }
       }
-    } else {
-      // TODO(devoncarew): search in statics in a class function
-      // This will require a change to the WIP protocol.
-
     }
 
     // search globals
-    IVariable globalVar = getGlobalVariable();
-
-    if (globalVar != null) {
-      for (IVariable var : globalVar.getValue().getVariables()) {
+    if (getGlobalsScope() != null) {
+      for (IVariable var : getGlobalsScope().getVariables()) {
         if (var.getName().equals(varName)) {
           return var;
         }
       }
     }
 
     return null;
   }
 
   @SuppressWarnings("rawtypes")
@@ skipping 224 matching lines @@
       } catch (IllegalArgumentException iae) {
         // Dartium can send us bad paths:
         // e:\b\build\slave\dartium-win-full\build ... rt\dart\CanvasRenderingContext2DImpl.dart
         DartDebugCorePlugin.logInfo("Illegal path from Dartium: " + url);
       }
     }
 
     return null;
   }
 
-  protected IVariable getGlobalVariable() throws DebugException {
-    for (IVariable var : getVariables()) {
-      if (var instanceof DartiumDebugVariable) {
-        if (((DartiumDebugVariable) var).isLibraryObject()) {
-          return var;
-        }
+  protected IValue getClassValue() throws DebugException {
+    if (classValue != null) {
+      return classValue;
+    }
+
+    for (WebkitScope scope : webkitFrame.getScopeChain()) {
+      if (scope.isClass()) {
+        classValue = new DartiumDebugValue(getTarget(), null, scope.getObject());
+        break;
       }
     }
 
-    return null;
+    return classValue;
+  }
+
+  protected IValue getGlobalsScope() throws DebugException {
+    if (globalScopeValue != null) {
+      return globalScopeValue;
+    }
+
+    for (WebkitScope scope : webkitFrame.getScopeChain()) {
+      if (scope.isGlobal()) {
+        globalScopeValue = new DartiumDebugValue(getTarget(), null, scope.getObject());
+        break;
+      }
+    }
+
+    return globalScopeValue;
   }
 
   protected String getMappedLocationPath() {
     SourceMapManager.SourceLocation targetLocation = getMappedLocation();
 
     if (DartDebugCorePlugin.LOGGING) {
       WebkitLocation sourceLocation = webkitFrame.getLocation();
       WebkitScript script = getConnection().getDebugger().getScript(sourceLocation.getScriptId());
       String scriptPath = script == null ? "null" : script.getUrl();
 
@@ skipping 77 matching lines @@
       return sourceMapManager.getMappingFor(
           file,
           location.getLineNumber(),
           location.getColumnNumber());
     } else {
       return null;
     }
   }
 
 }