Mercurial Mercurial > oss > FCL > sftools > dev > eclipseenv > wrttools / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
chrome-dev-tools-patches/stack-line-numbers-patch.txt
author paulb
Mon, 29 Mar 2010 16:56:24 -0700
changeset 289 75070492d7b2
parent 116 c60cb2ffbdc1
permissions -rw-r--r--
Fix debug connection startup message
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
116
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
     1
 
Index: src/org/chromium/debug/core/model/DebugTargetImpl.java
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
     2
 
===================================================================
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
     3
 
--- src/org/chromium/debug/core/model/DebugTargetImpl.java	(revision 307)
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
     4
 
+++ src/org/chromium/debug/core/model/DebugTargetImpl.java	(working copy)
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
     5
 
@@ -474,6 +474,10 @@
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
     6
 
   public WorkspaceBridge.JsLabelProvider getLabelProvider() {
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
     7
 
     return workspaceBridgeFactory.getLabelProvider();
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
     8
 
   }
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
     9
 
+
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    10
 
+  public int getLineNumber(CallFrame stackFrame) {
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    11
 
+    return workspaceRelations.getLineNumber(stackFrame);
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    12
 
+  }
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    13
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    14
 
   private static class ListenerBlock {
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    15
 
     private volatile boolean isBlocked = true;
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    16
 
Index: src/org/chromium/debug/core/model/StackFrame.java
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    17
 
===================================================================
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    18
 
--- src/org/chromium/debug/core/model/StackFrame.java	(revision 307)
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    19
 
+++ src/org/chromium/debug/core/model/StackFrame.java	(working copy)
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    20
 
@@ -194,8 +194,7 @@
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    21
 
   }
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    22
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    23
 
   public int getLineNumber() throws DebugException {
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    24
 
-    // convert 0-based to 1-based
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    25
 
-    return stackFrame.getLineNumber() + 1;
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    26
 
+    return getDebugTarget().getLineNumber(stackFrame);
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    27
 
   }
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    28
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    29
 
   public int getCharStart() throws DebugException {
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    30
 
Index: src/org/chromium/debug/core/model/VProjectWorkspaceBridge.java
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    31
 
===================================================================
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    32
 
--- src/org/chromium/debug/core/model/VProjectWorkspaceBridge.java	(revision 307)
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    33
 
+++ src/org/chromium/debug/core/model/VProjectWorkspaceBridge.java	(working copy)
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    34
 
@@ -230,6 +230,11 @@
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    35
 
     }
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    36
 
   };
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    37
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    38
 
+  public int getLineNumber(CallFrame stackFrame) {
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    39
 
+    // convert 0-based to 1-based
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    40
 
+    return stackFrame.getLineNumber() + 1;
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    41
 
+  }
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    42
 
+
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    43
 
   /**
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    44
 
    * This very simple source locator works because we provide our own source files.
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    45
 
    * We'll have to try harder, once we link with resource js files.
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    46
 
@@ -282,4 +287,5 @@
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    47
 
       return name;
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    48
 
     }
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    49
 
   };
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    50
 
+
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    51
 
 }
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    52
 
Index: src/org/chromium/debug/core/model/WorkspaceBridge.java
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    53
 
===================================================================
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    54
 
--- src/org/chromium/debug/core/model/WorkspaceBridge.java	(revision 307)
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    55
 
+++ src/org/chromium/debug/core/model/WorkspaceBridge.java	(working copy)
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    56
 
@@ -7,6 +7,7 @@
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    57
 
 import java.util.Collection;
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    58
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    59
 
 import org.chromium.sdk.Breakpoint;
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    60
 
+import org.chromium.sdk.CallFrame;
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    61
 
 import org.chromium.sdk.JavascriptVm;
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    62
 
 import org.chromium.sdk.Script;
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    63
 
 import org.eclipse.core.resources.IFile;
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    64
 
@@ -86,6 +87,12 @@
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    65
 
   BreakpointHandler getBreakpointHandler();
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    66
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    67
 
   /**
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    68
 
+   * Returns editor line number for the provided call stack frame applying all required
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    69
 
+   * editor-specific translations.
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    70
 
+   */
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    71
 
+  int getLineNumber(CallFrame stackFrame);
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    72
 
+
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    73
 
+  /**
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    74
 
    * Breakpoint-related aspect of {@link WorkspaceBridge} interface.
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    75
 
    */
c60cb2ffbdc1 Bug 1665 (HTML Files Cannot be Debugged) was fixed
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset 
    76
 
   interface BreakpointHandler extends IBreakpointListener {
FCL/sftools/dev/eclipseenv/wrttools