Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(579)

Unified Diff: runtime/bin/vmservice/client/deployed/web/index_devtools.html

Issue 216883008: Use tokenPos instead of line/col in the vm service. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: gen js / handle multiple reloads Created 6 years, 9 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
Index: runtime/bin/vmservice/client/deployed/web/index_devtools.html
diff --git a/runtime/bin/vmservice/client/deployed/web/index_devtools.html b/runtime/bin/vmservice/client/deployed/web/index_devtools.html
index 3248f06adebc069bf6c615a8b1a6ddadb5e9f6e5..da3c47cb4d0005b4a47094e8966b82bdb6d0d615 100644
--- a/runtime/bin/vmservice/client/deployed/web/index_devtools.html
+++ b/runtime/bin/vmservice/client/deployed/web/index_devtools.html
@@ -530,7 +530,7 @@
<div class="memberItem">
<div class="memberName">script</div>
<div class="memberValue">
- <script-ref ref="{{ cls['script'] }}" line="{{ cls['line'] }}">
+ <script-ref ref="{{ cls['script'] }}" pos="{{ cls['tokenPos'] }}">
</script-ref>
</div>
</div>
@@ -933,7 +933,8 @@
<div class="memberItem">
<div class="memberName">script</div>
<div class="memberValue">
- <script-ref ref="{{ function['script'] }}"></script-ref>
+ <script-ref ref="{{ function['script'] }}" pos="{{ function['tokenPos'] }}">
+ </script-ref>
</div>
</div>
@@ -1006,6 +1007,37 @@
</template>
</polymer-element>
+<polymer-element name="script-inset" extends="observatory-element">
+ <template>
+ <style>
+ .sourceInset {
+ padding-left: 15%;
+ padding-right: 15%;
+ }
+ .grayBox {
+ width: 100%;
+ background-color: #f5f5f5;
+ border: 1px solid #ccc;
+ padding: 10px;
+ }
+ </style>
+ <div class="sourceInset">
+ <content></content>
+ <div class="grayBox">
+ <table>
+ <tbody>
+ <tr template="" repeat="{{ line in lines }}">
+ <td style="font-family: consolas, courier, monospace;font-size: 1em;line-height: 1.2em;white-space: nowrap;">{{line.line}}</td>
+ <td>&nbsp;</td>
+ <td width="99%" style="font-family: consolas, courier, monospace;font-size: 1em;line-height: 1.2em;white-space: pre;">{{line.text}}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </template>
+
+</polymer-element>
<polymer-element name="isolate-summary" extends="observatory-element">
<template>
<div class="row">
@@ -1074,20 +1106,12 @@
( <a href="{{ isolate.relativeHashLink('stacktrace') }}">stack trace</a> )
</div>
</div>
- <div class="row">
- <div class="col-md-3">
- </div>
- <div class="col-md-6">
- <template if="{{ isolate.topFrame != null }}">
- <function-ref ref="{{ isolate.topFrame['function'] }}"></function-ref>
- (<script-ref ref="{{ isolate.topFrame['script'] }}" line="{{ isolate.topFrame['line'] }}"></script-ref>)
- <br>
- <pre>{{ isolate.topFrame['line'] }} &nbsp; {{ isolate.topFrame['lineString'] }}</pre>
- </template>
- </div>
- <div class="col-md-3">
- </div>
- </div>
+ <template if="{{ isolate.topFrame != null }}">
+ <script-inset script="{{ isolate.topFrame['script'] }}" pos="{{ isolate.topFrame['tokenPos'] }}">
+ <function-ref ref="{{ isolate.topFrame['function'] }}"></function-ref>
+ (<script-ref ref="{{ isolate.topFrame['script'] }}" pos="{{ isolate.topFrame['tokenPos'] }}"></script-ref>)
+ </script-inset>
+ </template>
</template>
</polymer-element>
@@ -1193,11 +1217,11 @@
<hr>
</template>
+ <br>
+
<template if="{{ isolate.topFrame != null }}">
- <br>
- <div class="sourceInset">
- <pre> {{ isolate.topFrame['line'] }} &nbsp; {{ isolate.topFrame['lineString'] }}</pre>
- </div>
+ <script-inset script="{{ isolate.topFrame['script'] }}" pos="{{ isolate.topFrame['tokenPos'] }}">
+ </script-inset>
</template>
<br>
@@ -1911,7 +1935,7 @@
</div>
<div class="col-md-9">
<function-ref ref="{{ frame['function'] }}"></function-ref>
- ( <script-ref ref="{{ frame['script'] }}" line="{{ frame['line'] }}">
+ ( <script-ref ref="{{ frame['script'] }}" pos="{{ frame['tokenPos'] }}">
</script-ref> )
<curly-block>

Powered by Google App Engine
This is Rietveld 408576698