<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162421] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162421">162421</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 18:56:45 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the TimelineRecordTreeElement location subtitle live.
https://bugs.webkit.org/show_bug.cgi?id=127270
Reviewed by Joseph Pecoraro.
* Localizations/en.lproj/localizedStrings.js: Updated.
* UserInterface/SourceCodeLocation.js:
(WebInspector.SourceCodeLocation.prototype.originalLocationString):
(WebInspector.SourceCodeLocation.prototype.formattedLocationString):
(WebInspector.SourceCodeLocation.prototype.displayLocationString):
(WebInspector.SourceCodeLocation.prototype.updateDisplayString):
(WebInspector.SourceCodeLocation.prototype._locationString):
Support for a new nameStyle enum and a prefix for the location string.
Passing the prefix here lets it be italicized with the line number.
Support column number for SourceCode's without a URL too.
* UserInterface/TimelineRecordTreeElement.js:
(WebInspector.TimelineRecordTreeElement):
(WebInspector.TimelineRecordTreeElement.prototype.onattach):
Create a subtitle span to update the location inside. Update the tooltip on attach.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceLayoutTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/LayoutTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceScriptTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/ScriptTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceSourceCodeLocationjs">trunk/Source/WebInspectorUI/UserInterface/SourceCodeLocation.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceSourceCodeTimelineTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/SourceCodeTimelineTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceTimelineRecordTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/TimelineRecordTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (162420 => 162421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-01-21 02:56:36 UTC (rev 162420)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-01-21 02:56:45 UTC (rev 162421)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-01-20 Timothy Hatcher <timothy@apple.com>
+
+ Make the TimelineRecordTreeElement location subtitle live.
+
+ https://bugs.webkit.org/show_bug.cgi?id=127270
+
+ Reviewed by Joseph Pecoraro.
+
+ * Localizations/en.lproj/localizedStrings.js: Updated.
+
+ * UserInterface/SourceCodeLocation.js:
+ (WebInspector.SourceCodeLocation.prototype.originalLocationString):
+ (WebInspector.SourceCodeLocation.prototype.formattedLocationString):
+ (WebInspector.SourceCodeLocation.prototype.displayLocationString):
+ (WebInspector.SourceCodeLocation.prototype.updateDisplayString):
+ (WebInspector.SourceCodeLocation.prototype._locationString):
+ Support for a new nameStyle enum and a prefix for the location string.
+ Passing the prefix here lets it be italicized with the line number.
+ Support column number for SourceCode's without a URL too.
+
+ * UserInterface/TimelineRecordTreeElement.js:
+ (WebInspector.TimelineRecordTreeElement):
+ (WebInspector.TimelineRecordTreeElement.prototype.onattach):
+ Create a subtitle span to update the location inside. Update the tooltip on attach.
+
</ins><span class="cx"> 2014-01-19 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Generate better display names for timer and event Timeline records.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (162420 => 162421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2014-01-21 02:56:36 UTC (rev 162420)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2014-01-21 02:56:45 UTC (rev 162421)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-\xFF\xFEv a r l o c a l i z e d S t r i n g s = n e w O b j e c t ;
</del><ins>+\xFE\xFF v a r l o c a l i z e d S t r i n g s = n e w O b j e c t ;
</ins><span class="cx">
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " ( P r o t o t y p e ) " ] = " ( P r o t o t y p e ) " ;
</span><del>- l o c a l i z e d S t r i n g s [ " ( l i n e % d ) " ] = " ( l i n e % d ) " ;
</del><ins>+ l o c a l i z e d S t r i n g s [ " ( l i n e % s ) " ] = " ( l i n e % s ) " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " % . 0 f B " ] = " % . 0 f B " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " % . 0 f m s " ] = " % . 0 f m s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " % . 1 f K B " ] = " % . 1 f K B " ;
</span><span class="lines">@@ -21,10 +21,7 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " % d m a t c h e s " ] = " % d m a t c h e s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " % f p x " ] = " % f p x " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " % f p x \xB2 " ] = " % f p x \xB2 " ;
</span><del>- l o c a l i z e d S t r i n g s [ " % s ( f r o m c a c h e ) " ] = " % s ( f r o m c a c h e ) " ;
- l o c a l i z e d S t r i n g s [ " % s d o w n l o a d " ] = " % s d o w n l o a d " ;
- l o c a l i z e d S t r i n g s [ " % s l a t e n c y " ] = " % s l a t e n c y " ;
- l o c a l i z e d S t r i n g s [ " % s l a t e n c y , % s d o w n l o a d ( % s t o t a l ) " ] = " % s l a t e n c y , % s d o w n l o a d ( % s t o t a l ) " ;
</del><ins>+ l o c a l i z e d S t r i n g s [ " % s E v e n t D i s p a t c h e d " ] = " % s E v e n t D i s p a t c h e d " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " ( a n o n y m o u s f u n c t i o n ) " ] = " ( a n o n y m o u s f u n c t i o n ) " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " 1 m a t c h " ] = " 1 m a t c h " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " 9 9 9 + " ] = " 9 9 9 + " ;
</span><span class="lines">@@ -38,16 +35,17 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " A l l " ] = " A l l " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " A l l E x c e p t i o n s " ] = " A l l E x c e p t i o n s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " A l l U n c a u g h t E x c e p t i o n s " ] = " A l l U n c a u g h t E x c e p t i o n s " ;
</span><del>- l o c a l i z e d S t r i n g s [ " A n e r r o r o c c u r e d t r y i n g t o \ n r e a d t h e % s t a b l e . " ] = " A n e r r o r o c c u r e d t r y i n g t o \ n r e a d t h e % s t a b l e . " ;
</del><ins>+ l o c a l i z e d S t r i n g s [ " A n e r r o r o c c u r e d t r y i n g t o \ n r e a d t h e % s t a b l e . " ] = " A n e r r o r o c c u r e d t r y i n g t o \ n r e a d t h e % s t a b l e . " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " A n e r r o r o c c u r r e d t r y i n g t o l o a d t h e r e s o u r c e . " ] = " A n e r r o r o c c u r r e d t r y i n g t o l o a d t h e r e s o u r c e . " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " A n u n e x p e c t e d e r r o r % s o c c u r r e d . " ] = " A n u n e x p e c t e d e r r o r % s o c c u r r e d . " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " A n u n e x p e c t e d e r r o r o c c u r r e d . " ] = " A n u n e x p e c t e d e r r o r o c c u r r e d . " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " A n i m a t i o n F r a m e C a n c e l e d " ] = " A n i m a t i o n F r a m e C a n c e l e d " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " A n i m a t i o n F r a m e F i r e d " ] = " A n i m a t i o n F r a m e F i r e d " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " A n i m a t i o n F r a m e R e q u e s t e d " ] = " A n i m a t i o n F r a m e R e q u e s t e d " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " A n o n y m o u s S c r i p t % d " ] = " A n o n y m o u s S c r i p t % d " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " A n o n y m o u s S c r i p t s " ] = " A n o n y m o u s S c r i p t s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " A n o n y m o u s S t y l e S h e e t % d " ] = " A n o n y m o u s S t y l e S h e e t % d " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " A p p l i c a t i o n C a c h e " ] = " A p p l i c a t i o n C a c h e " ;
</span><del>- l o c a l i z e d S t r i n g s [ " A r e a " ] = " A r e a " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " A s s e r t i o n f a i l e d : " ] = " A s s e r t i o n f a i l e d : " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " A t t r i b u t e " ] = " A t t r i b u t e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " A t t r i b u t e s " ] = " A t t r i b u t e s " ;
</span><span class="lines">@@ -99,7 +97,6 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C o p y R o w " ] = " C o p y R o w " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C o p y a s H T M L " ] = " C o p y a s H T M L " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " D O M T r e e " ] = " D O M T r e e " ;
</span><del>- l o c a l i z e d S t r i n g s [ " D O M C o n t e n t e v e n t f i r e d a t % s " ] = " D O M C o n t e n t e v e n t f i r e d a t % s " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " D a t a " ] = " D a t a " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " D a t a r e t u r n e d f r o m t h e d a t a b a s e i s t o o l a r g e . " ] = " D a t a r e t u r n e d f r o m t h e d a t a b a s e i s t o o l a r g e . " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " D a t a b a s e n o l o n g e r h a s e x p e c t e d v e r s i o n . " ] = " D a t a b a s e n o l o n g e r h a s e x p e c t e d v e r s i o n . " ;
</span><span class="lines">@@ -128,10 +125,10 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " D o w n l o a d W e b A r c h i v e " ] = " D o w n l o a d W e b A r c h i v e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " D u r a t i o n " ] = " D u r a t i o n " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E d i t A t t r i b u t e " ] = " E d i t A t t r i b u t e " ;
</span><del>- l o c a l i z e d S t r i n g s [ " E d i t B r e a k p o i n t & " ] = " E d i t B r e a k p o i n t & " ;
</del><ins>+ l o c a l i z e d S t r i n g s [ " E d i t B r e a k p o i n t & " ] = " E d i t B r e a k p o i n t & " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " E d i t T e x t " ] = " E d i t T e x t " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E d i t a s H T M L " ] = " E d i t a s H T M L " ;
</span><del>- l o c a l i z e d S t r i n g s [ " E d i t % s " ] = " E d i t % s " ;
</del><ins>+ l o c a l i z e d S t r i n g s [ " E d i t % s " ] = " E d i t % s " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t " ] = " E l e m e n t " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t c l i p s c o m p o s i t i n g d e s c e n d a n t s " ] = " E l e m e n t c l i p s c o m p o s i t i n g d e s c e n d a n t s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t e s t a b l i s h e s a s t a c k i n g c o n t e x t " ] = " E l e m e n t e s t a b l i s h e s a s t a c k i n g c o n t e x t " ;
</span><span class="lines">@@ -144,12 +141,12 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t h a s c h i l d r e n w i t h a n e g a t i v e z - i n d e x " ] = " E l e m e n t h a s c h i l d r e n w i t h a n e g a t i v e z - i n d e x " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t h a s o p a c i t y a p p l i e d a n d c o m p o s i t e d d e s c e n d a n t s " ] = " E l e m e n t h a s o p a c i t y a p p l i e d a n d c o m p o s i t e d d e s c e n d a n t s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t h a s p e r s p e c t i v e a p p l i e d " ] = " E l e m e n t h a s p e r s p e c t i v e a p p l i e d " ;
</span><del>- l o c a l i z e d S t r i n g s [ " E l e m e n t h a s - w e b k i t - o v e r f l o w - s c r o l l i n g : t o u c h s t y l e " ] = " E l e m e n t h a s - w e b k i t - o v e r f l o w - s c r o l l i n g : t o u c h s t y l e " ;
- l o c a l i z e d S t r i n g s [ " E l e m e n t h a s b a c k f a c e - v i s i b i l i t y : h i d d e n s t y l e " ] = " E l e m e n t h a s b a c k f a c e - v i s i b i l i t y : h i d d e n s t y l e " ;
- l o c a l i z e d S t r i n g s [ " E l e m e n t h a s b l e n d - m o d e s t y l e " ] = " E l e m e n t h a s b l e n d - m o d e s t y l e " ;
- l o c a l i z e d S t r i n g s [ " E l e m e n t h a s p o s i t i o n : f i x e d s t y l e " ] = " E l e m e n t h a s p o s i t i o n : f i x e d s t y l e " ;
- l o c a l i z e d S t r i n g s [ " E l e m e n t h a s p o s i t i o n : s t i c k y s t y l e " ] = " E l e m e n t h a s p o s i t i o n : s t i c k y s t y l e " ;
- l o c a l i z e d S t r i n g s [ " E l e m e n t h a s t r a n s f o r m - s t y l e : p r e s e r v e - 3 d s t y l e " ] = " E l e m e n t h a s t r a n s f o r m - s t y l e : p r e s e r v e - 3 d s t y l e " ;
</del><ins>+ l o c a l i z e d S t r i n g s [ " E l e m e n t h a s - w e b k i t - o v e r f l o w - s c r o l l i n g : t o u c h s t y l e " ] = " E l e m e n t h a s - w e b k i t - o v e r f l o w - s c r o l l i n g : t o u c h s t y l e " ;
+ l o c a l i z e d S t r i n g s [ " E l e m e n t h a s b a c k f a c e - v i s i b i l i t y : h i d d e n s t y l e " ] = " E l e m e n t h a s b a c k f a c e - v i s i b i l i t y : h i d d e n s t y l e " ;
+ l o c a l i z e d S t r i n g s [ " E l e m e n t h a s b l e n d - m o d e s t y l e " ] = " E l e m e n t h a s b l e n d - m o d e s t y l e " ;
+ l o c a l i z e d S t r i n g s [ " E l e m e n t h a s p o s i t i o n : f i x e d s t y l e " ] = " E l e m e n t h a s p o s i t i o n : f i x e d s t y l e " ;
+ l o c a l i z e d S t r i n g s [ " E l e m e n t h a s p o s i t i o n : s t i c k y s t y l e " ] = " E l e m e n t h a s p o s i t i o n : s t i c k y s t y l e " ;
+ l o c a l i z e d S t r i n g s [ " E l e m e n t h a s t r a n s f o r m - s t y l e : p r e s e r v e - 3 d s t y l e " ] = " E l e m e n t h a s t r a n s f o r m - s t y l e : p r e s e r v e - 3 d s t y l e " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t i s < c a n v a s > " ] = " E l e m e n t i s < c a n v a s > " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t i s < i f r a m e > " ] = " E l e m e n t i s < i f r a m e > " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t i s < v i d e o > " ] = " E l e m e n t i s < v i d e o > " ;
</span><span class="lines">@@ -174,9 +171,9 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E x t e n s i o n S c r i p t s " ] = " E x t e n s i o n S c r i p t s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E x t r a S c r i p t s " ] = " E x t r a S c r i p t s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " F i l e n a m e " ] = " F i l e n a m e " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " F i l t e r % s " ] = " F i l t e r % s " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " F i l t e r B r e a k p o i n t L i s t " ] = " F i l t e r B r e a k p o i n t L i s t " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " F i l t e r C o n s o l e L o g " ] = " F i l t e r C o n s o l e L o g " ;
</span><del>- l o c a l i z e d S t r i n g s [ " F i l t e r P r o f i l e L i s t " ] = " F i l t e r P r o f i l e L i s t " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " F i l t e r R e s o u r c e L i s t " ] = " F i l t e r R e s o u r c e L i s t " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " F i l t e r S e a r c h R e s u l t s " ] = " F i l t e r S e a r c h R e s u l t s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " F l o w s " ] = " F l o w s " ;
</span><span class="lines">@@ -212,12 +209,9 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " I n i t i a t o r " ] = " I n i t i a t o r " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " I n p u t : " ] = " I n p u t : " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " I n s p e c t " ] = " I n s p e c t " ;
</span><del>- l o c a l i z e d S t r i n g s [ " I n v a l i d a t e L a y o u t " ] = " I n v a l i d a t e L a y o u t " ;
- l o c a l i z e d S t r i n g s [ " I n v a l i d a t e S t y l e s " ] = " I n v a l i d a t e S t y l e s " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " I n v e r t c a l l t r e e " ] = " I n v e r t c a l l t r e e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " J A V A S C R I P T P R O F I L E S " ] = " J A V A S C R I P T P R O F I L E S " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " J a v a S c r i p t & E v e n t s " ] = " J a v a S c r i p t & E v e n t s " ;
</span><del>- l o c a l i z e d S t r i n g s [ " J a v a S c r i p t P r o f i l e % d " ] = " J a v a S c r i p t P r o f i l e % d " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " J a v a S c r i p t p r o f i l e s s h o w w h e r e t h e e x e c u t i o n t i m e i s s p e n t i n y o u r p a g e ' s J a v a S c r i p t f u n c t i o n s . " ] = " J a v a S c r i p t p r o f i l e s s h o w w h e r e t h e e x e c u t i o n t i m e i s s p e n t i n y o u r p a g e ' s J a v a S c r i p t f u n c t i o n s . " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " K e y " ] = " K e y " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " L a t e n c y " ] = " L a t e n c y " ;
</span><span class="lines">@@ -227,10 +221,10 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " L a y e r s " ] = " L a y e r s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " L a y o u t " ] = " L a y o u t " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " L a y o u t & R e n d e r i n g " ] = " L a y o u t & R e n d e r i n g " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " L a y o u t I n v a l i d a t e d " ] = " L a y o u t I n v a l i d a t e d " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " L i n e % d " ] = " L i n e % d " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " L i n e % d : % d " ] = " L i n e % d : % d " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " L i n e N u m b e r " ] = " L i n e N u m b e r " ;
</span><del>- l o c a l i z e d S t r i n g s [ " L o a d e v e n t f i r e d a t % s " ] = " L o a d e v e n t f i r e d a t % s " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " L o c a l F i l e " ] = " L o c a l F i l e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " L o c a l S t o r a g e " ] = " L o c a l S t o r a g e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " L o c a l V a r i a b l e s " ] = " L o c a l V a r i a b l e s " ;
</span><span class="lines">@@ -265,7 +259,6 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " N o P r o p e r t i e s " ] = " N o P r o p e r t i e s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " N o P r o p e r t i e s \ u 2 0 1 4 C l i c k t o E d i t " ] = " N o P r o p e r t i e s \ u 2 0 1 4 C l i c k t o E d i t " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " N o Q u e r y P a r a m e t e r s " ] = " N o Q u e r y P a r a m e t e r s " ;
</span><del>- l o c a l i z e d S t r i n g s [ " N o R e c o r d e d P r o f i l e s " ] = " N o R e c o r d e d P r o f i l e s " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " N o R e q u e s t H e a d e r s " ] = " N o R e q u e s t H e a d e r s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " N o R e s p o n s e H e a d e r s " ] = " N o R e s p o n s e H e a d e r s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " N o S e a r c h R e s u l t s " ] = " N o S e a r c h R e s u l t s " ;
</span><span class="lines">@@ -291,18 +284,15 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " P r o b e E x p r e s s i o n " ] = " P r o b e E x p r e s s i o n " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " P r o c e s s i n g I n s t r u c t i o n " ] = " P r o c e s s i n g I n s t r u c t i o n " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " P r o f i l e % d " ] = " P r o f i l e % d " ;
</span><del>- l o c a l i z e d S t r i n g s [ " P r o f i l e s " ] = " P r o f i l e s " ;
- l o c a l i z e d S t r i n g s [ " P r o f i l i n g " ] = " P r o f i l i n g " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " P r o p e r t i e s " ] = " P r o p e r t i e s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " Q u e r y P a r a m e t e r s " ] = " Q u e r y P a r a m e t e r s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " Q u e r y S t r i n g " ] = " Q u e r y S t r i n g " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " R a n g e I s s u e " ] = " R a n g e I s s u e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " R e a s o n s f o r c o m p o s i t i n g : " ] = " R e a s o n s f o r c o m p o s i t i n g : " ;
</span><del>- l o c a l i z e d S t r i n g s [ " R e c a l c u l a t e S t y l e s " ] = " R e c a l c u l a t e S t y l e s " ;
- l o c a l i z e d S t r i n g s [ " R e c o r d i n g " ] = " R e c o r d i n g " ;
- l o c a l i z e d S t r i n g s [ " R e c o r d i n g C a n v a s P r o f i l e & " ] = " R e c o r d i n g C a n v a s P r o f i l e & " ;
</del><ins>+ l o c a l i z e d S t r i n g s [ " R e c o r d i n g C a n v a s P r o f i l e & " ] = " R e c o r d i n g C a n v a s P r o f i l e & " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " R e c o r d i n g J a v a S c r i p t P r o f i l e \ u 2 0 2 6 " ] = " R e c o r d i n g J a v a S c r i p t P r o f i l e \ u 2 0 2 6 " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " R e c o r d i n g \ u 2 0 2 6 " ] = " R e c o r d i n g \ u 2 0 2 6 " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " R e c o r d s " ] = " R e c o r d s " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " R e f e r e n c e I s s u e " ] = " R e f e r e n c e I s s u e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " R e f l e c t i o n " ] = " R e f l e c t i o n " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " R e f r e s h " ] = " R e f r e s h " ;
</span><span class="lines">@@ -322,7 +312,6 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " R e v e a l i n D e b u g g e r N a v i g a t i o n S i d e b a r " ] = " R e v e a l i n D e b u g g e r N a v i g a t i o n S i d e b a r " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " R e v e a l i n O r i g i n a l R e s o u r c e " ] = " R e v e a l i n O r i g i n a l R e s o u r c e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " R u l e s " ] = " R u l e s " ;
</span><del>- l o c a l i z e d S t r i n g s [ " R u n % d " ] = " R u n % d " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " S c h e m e " ] = " S c h e m e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S c o p e C h a i n " ] = " S c o p e C h a i n " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S c r i p t " ] = " S c r i p t " ;
</span><span class="lines">@@ -356,12 +345,8 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S o c k e t " ] = " S o c k e t " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S o c k e t s " ] = " S o c k e t s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S o u r c e C o d e " ] = " S o u r c e C o d e " ;
</span><del>- l o c a l i z e d S t r i n g s [ " S t a r t C a n v a s P r o f i l e " ] = " S t a r t C a n v a s P r o f i l e " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " S t a r t C a n v a s p r o f i l i n g . " ] = " S t a r t C a n v a s p r o f i l i n g . " ;
</span><del>- l o c a l i z e d S t r i n g s [ " S t a r t J a v a S c r i p t P r o f i l e " ] = " S t a r t J a v a S c r i p t P r o f i l e " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " S t a r t J a v a S c r i p t p r o f i l i n g . " ] = " S t a r t J a v a S c r i p t p r o f i l i n g . " ;
</span><del>- l o c a l i z e d S t r i n g s [ " S t a r t P r o f i l i n g " ] = " S t a r t P r o f i l i n g " ;
- l o c a l i z e d S t r i n g s [ " S t a r t R e c o r d i n g " ] = " S t a r t R e c o r d i n g " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " S t a r t T i m e " ] = " S t a r t T i m e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S t a t u s " ] = " S t a t u s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S t e p i n t o ( % s o r % s ) " ] = " S t e p i n t o ( % s o r % s ) " ;
</span><span class="lines">@@ -369,30 +354,31 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S t e p o v e r ( % s o r % s ) " ] = " S t e p o v e r ( % s o r % s ) " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S t o p C a n v a s p r o f i l i n g . " ] = " S t o p C a n v a s p r o f i l i n g . " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S t o p J a v a S c r i p t p r o f i l i n g . " ] = " S t o p J a v a S c r i p t p r o f i l i n g . " ;
</span><del>- l o c a l i z e d S t r i n g s [ " S t o p P r o f i l i n g " ] = " S t o p P r o f i l i n g " ;
- l o c a l i z e d S t r i n g s [ " S t o p R e c o r d i n g " ] = " S t o p R e c o r d i n g " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " S t o r a g e " ] = " S t o r a g e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S t y l e " ] = " S t y l e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S t y l e A t t r i b u t e " ] = " S t y l e A t t r i b u t e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S t y l e s " ] = " S t y l e s " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " S t y l e s I n v a l i d a t e d " ] = " S t y l e s I n v a l i d a t e d " ;
+ l o c a l i z e d S t r i n g s [ " S t y l e s R e c a l c u l a t e d " ] = " S t y l e s R e c a l c u l a t e d " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " S t y l e s h e e t " ] = " S t y l e s h e e t " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S t y l e s h e e t s " ] = " S t y l e s h e e t s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " T e x t N o d e " ] = " T e x t N o d e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " T e x t O n l y " ] = " T e x t O n l y " ;
</span><del>- l o c a l i z e d S t r i n g s [ " T h e % s \ n t a b l e i s e m p t y . " ] = " T h e % s \ n t a b l e i s e m p t y . " ;
</del><ins>+ l o c a l i z e d S t r i n g s [ " T h e % s \ n t a b l e i s e m p t y . " ] = " T h e % s \ n t a b l e i s e m p t y . " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " T i m e u n t i l t h e l o a d e v e n t f i r e d , c l i c k t o s h o w t h e N e t w o r k R e q u e s t s t i m e l i n e " ] = " T i m e u n t i l t h e l o a d e v e n t f i r e d , c l i c k t o s h o w t h e N e t w o r k R e q u e s t s t i m e l i n e " ;
</span><del>- l o c a l i z e d S t r i n g s [ " T i m e l i n e " ] = " T i m e l i n e " ;
</del><ins>+ l o c a l i z e d S t r i n g s [ " T i m e l i n e E v e n t s " ] = " T i m e l i n e E v e n t s " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " T i m e l i n e s " ] = " T i m e l i n e s " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " T i m e r % s F i r e d " ] = " T i m e r % s F i r e d " ;
+ l o c a l i z e d S t r i n g s [ " T i m e r % s I n s t a l l e d " ] = " T i m e r % s I n s t a l l e d " ;
+ l o c a l i z e d S t r i n g s [ " T i m e r % s R e m o v e d " ] = " T i m e r % s R e m o v e d " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " T i m e r F i r e d " ] = " T i m e r F i r e d " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " T i m e r I n s t a l l e d " ] = " T i m e r I n s t a l l e d " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " T i m e r R e m o v e d " ] = " T i m e r R e m o v e d " ;
</span><del>- l o c a l i z e d S t r i n g s [ " T i m e s t a m p m a r k e r a t % s " ] = " T i m e s t a m p m a r k e r a t % s " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " T i p : " ] = " T i p : " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " T o t a l " ] = " T o t a l " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " T o t a l n u m b e r o f r e s o u r c e s , c l i c k t o s h o w t h e R e s o u r c e s n a v i g a t i o n s i d e b a r " ] = " T o t a l n u m b e r o f r e s o u r c e s , c l i c k t o s h o w t h e R e s o u r c e s n a v i g a t i o n s i d e b a r " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " T o t a l s i z e o f a l l r e s o u r c e s , c l i c k t o s h o w t h e N e t w o r k R e q u e s t s t i m e l i n e " ] = " T o t a l s i z e o f a l l r e s o u r c e s , c l i c k t o s h o w t h e N e t w o r k R e q u e s t s t i m e l i n e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " T r a n s f e r e d " ] = " T r a n s f e r e d " ;
</span><del>- l o c a l i z e d S t r i n g s [ " T r a n s f e r r e d " ] = " T r a n s f e r r e d " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " T y p e " ] = " T y p e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " T y p e I s s u e " ] = " T y p e I s s u e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " U n k n o w n n o d e " ] = " U n k n o w n n o d e " ;
</span><span class="lines">@@ -409,7 +395,7 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " X H R " ] = " X H R " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " X H R s " ] = " X H R s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " Y e s " ] = " Y e s " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " l i n e " ] = " l i n e " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " o r i g i n a l l y % s " ] = " o r i g i n a l l y % s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " u n d e f i n e d \xD7 % d " ] = " u n d e f i n e d \xD7 % d " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " v i a i n s p e c t o r " ] = " v i a i n s p e c t o r " ;
</span><del>-
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceLayoutTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/LayoutTimelineView.js (162420 => 162421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/LayoutTimelineView.js 2014-01-21 02:56:36 UTC (rev 162420)
+++ trunk/Source/WebInspectorUI/UserInterface/LayoutTimelineView.js 2014-01-21 02:56:45 UTC (rev 162421)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (var layoutTimelineRecord of this._pendingRecords) {
</span><del>- var treeElement = new WebInspector.TimelineRecordTreeElement(layoutTimelineRecord, true);
</del><ins>+ var treeElement = new WebInspector.TimelineRecordTreeElement(layoutTimelineRecord, WebInspector.SourceCodeLocation.NameStyle.Short);
</ins><span class="cx"> var dataGridNode = new WebInspector.LayoutTimelineDataGridNode(layoutTimelineRecord, this.zeroTime);
</span><span class="cx">
</span><span class="cx"> this._dataGrid.addRowInSortOrder(treeElement, dataGridNode);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceScriptTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/ScriptTimelineView.js (162420 => 162421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/ScriptTimelineView.js 2014-01-21 02:56:36 UTC (rev 162420)
+++ trunk/Source/WebInspectorUI/UserInterface/ScriptTimelineView.js 2014-01-21 02:56:45 UTC (rev 162421)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (var scriptTimelineRecord of this._pendingRecords) {
</span><del>- var treeElement = new WebInspector.TimelineRecordTreeElement(scriptTimelineRecord, true, true);
</del><ins>+ var treeElement = new WebInspector.TimelineRecordTreeElement(scriptTimelineRecord, WebInspector.SourceCodeLocation.NameStyle.Short, true);
</ins><span class="cx"> var dataGridNode = new WebInspector.ScriptTimelineDataGridNode(scriptTimelineRecord, this.zeroTime);
</span><span class="cx">
</span><span class="cx"> this._dataGrid.addRowInSortOrder(treeElement, dataGridNode);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceSourceCodeLocationjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/SourceCodeLocation.js (162420 => 162421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/SourceCodeLocation.js 2014-01-21 02:56:36 UTC (rev 162420)
+++ trunk/Source/WebInspectorUI/UserInterface/SourceCodeLocation.js 2014-01-21 02:56:45 UTC (rev 162421)
</span><span class="lines">@@ -48,11 +48,18 @@
</span><span class="cx"> WebInspector.SourceCodeLocation.DisplayLocationClassName = "display-location";
</span><span class="cx">
</span><span class="cx"> WebInspector.SourceCodeLocation.LargeColumnNumber = 80;
</span><ins>+
+WebInspector.SourceCodeLocation.NameStyle = {
+ None: "none", // File name not included.
+ Short: "short", // Only the file name.
+ Full: "full" // Full URL is used.
+};
+
</ins><span class="cx"> WebInspector.SourceCodeLocation.ColumnStyle = {
</span><span class="cx"> Hidden: "hidden", // column numbers are not included.
</span><span class="cx"> OnlyIfLarge: "only-if-large", // column numbers greater than 80 are shown.
</span><span class="cx"> Shown: "shown" // non-zero column numbers are shown.
</span><del>-}
</del><ins>+};
</ins><span class="cx">
</span><span class="cx"> WebInspector.SourceCodeLocation.Event = {
</span><span class="cx"> LocationChanged: "source-code-location-location-changed",
</span><span class="lines">@@ -162,28 +169,28 @@
</span><span class="cx">
</span><span class="cx"> // User presentable location strings: "file:lineNumber:columnNumber".
</span><span class="cx">
</span><del>- originalLocationString: function(columnStyle, fullURL)
</del><ins>+ originalLocationString: function(columnStyle, nameStyle, prefix)
</ins><span class="cx"> {
</span><del>- return this._locationString(this.sourceCode, this.lineNumber, this.columnNumber, columnStyle, fullURL);
</del><ins>+ return this._locationString(this.sourceCode, this.lineNumber, this.columnNumber, columnStyle, nameStyle, prefix);
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- formattedLocationString: function(columnStyle, fullURL)
</del><ins>+ formattedLocationString: function(columnStyle, nameStyle, prefix)
</ins><span class="cx"> {
</span><del>- return this._locationString(this.sourceCode, this.formattedLineNumber, this.formattedColumn, columnStyle, fullURL);
</del><ins>+ return this._locationString(this.sourceCode, this.formattedLineNumber, this.formattedColumn, columnStyle, nameStyle, prefix);
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- displayLocationString: function(columnStyle, fullURL)
</del><ins>+ displayLocationString: function(columnStyle, nameStyle, prefix)
</ins><span class="cx"> {
</span><del>- return this._locationString(this.displaySourceCode, this.displayLineNumber, this.displayColumnNumber, columnStyle, fullURL);
</del><ins>+ return this._locationString(this.displaySourceCode, this.displayLineNumber, this.displayColumnNumber, columnStyle, nameStyle, prefix);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> tooltipString: function()
</span><span class="cx"> {
</span><span class="cx"> if (!this.hasDifferentDisplayLocation())
</span><del>- return this.originalLocationString(WebInspector.SourceCodeLocation.ColumnStyle.Shown, true);
</del><ins>+ return this.originalLocationString(WebInspector.SourceCodeLocation.ColumnStyle.Shown, WebInspector.SourceCodeLocation.NameStyle.Full);
</ins><span class="cx">
</span><del>- var tooltip = WebInspector.UIString("Located at %s").format(this.displayLocationString(WebInspector.SourceCodeLocation.ColumnStyle.Shown, true));
- tooltip += "\n" + WebInspector.UIString("Originally %s").format(this.originalLocationString(WebInspector.SourceCodeLocation.ColumnStyle.Shown, true));
</del><ins>+ var tooltip = WebInspector.UIString("Located at %s").format(this.displayLocationString(WebInspector.SourceCodeLocation.ColumnStyle.Shown, WebInspector.SourceCodeLocation.NameStyle.Full));
+ tooltip += "\n" + WebInspector.UIString("Originally %s").format(this.originalLocationString(WebInspector.SourceCodeLocation.ColumnStyle.Shown, WebInspector.SourceCodeLocation.NameStyle.Full));
</ins><span class="cx"> return tooltip;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -240,7 +247,7 @@
</span><span class="cx"> }, this);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- populateLiveDisplayLocationString: function(element, propertyName)
</del><ins>+ populateLiveDisplayLocationString: function(element, propertyName, columnStyle, nameStyle, prefix)
</ins><span class="cx"> {
</span><span class="cx"> var currentDisplay = undefined;
</span><span class="cx">
</span><span class="lines">@@ -252,17 +259,11 @@
</span><span class="cx"> currentDisplay = showAlternativeLocation;
</span><span class="cx">
</span><span class="cx"> if (!showAlternativeLocation) {
</span><del>- element[propertyName] = this.displayLocationString();
-
- if (this.hasDifferentDisplayLocation())
- element.classList.add(WebInspector.SourceCodeLocation.DisplayLocationClassName);
- else
- element.classList.remove(WebInspector.SourceCodeLocation.DisplayLocationClassName);
- } else {
- if (this.hasDifferentDisplayLocation()) {
- element[propertyName] = this.originalLocationString();
- element.classList.remove(WebInspector.SourceCodeLocation.DisplayLocationClassName);
- }
</del><ins>+ element[propertyName] = this.displayLocationString(columnStyle, nameStyle, prefix);
+ element.classList.toggle(WebInspector.SourceCodeLocation.DisplayLocationClassName, this.hasDifferentDisplayLocation());
+ } else if (this.hasDifferentDisplayLocation()) {
+ element[propertyName] = this.originalLocationString(columnStyle, nameStyle, prefix);
+ element.classList.remove(WebInspector.SourceCodeLocation.DisplayLocationClassName);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -288,25 +289,35 @@
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _locationString: function(sourceCode, lineNumber, columnNumber, columnStyle, fullURL)
</del><ins>+ _locationString: function(sourceCode, lineNumber, columnNumber, columnStyle, nameStyle, prefix)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(sourceCode);
</span><span class="cx"> if (!sourceCode)
</span><span class="cx"> return "";
</span><span class="cx">
</span><span class="cx"> columnStyle = columnStyle || WebInspector.SourceCodeLocation.ColumnStyle.OnlyIfLarge;
</span><ins>+ nameStyle = nameStyle || WebInspector.SourceCodeLocation.NameStyle.Short;
+ prefix = prefix || "";
</ins><span class="cx">
</span><del>- var string = fullURL && sourceCode.url ? sourceCode.url : sourceCode.displayName;
- if (sourceCode.url) {
- string += ":" + (lineNumber + 1); // The user visible line number is 1-based.
- if (columnStyle === WebInspector.SourceCodeLocation.ColumnStyle.Shown && columnNumber > 0)
- string += ":" + (columnNumber + 1); // The user visible column number is 1-based.
- else if (columnStyle === WebInspector.SourceCodeLocation.ColumnStyle.OnlyIfLarge && columnNumber > WebInspector.SourceCodeLocation.LargeColumnNumber)
- string += ":" + (columnNumber + 1); // The user visible column number is 1-based.
- } else
- string += WebInspector.UIString(" (line %d)").format(lineNumber + 1); // The user visible line number is 1-based.
</del><ins>+ var lineString = lineNumber + 1; // The user visible line number is 1-based.
+ if (columnStyle === WebInspector.SourceCodeLocation.ColumnStyle.Shown && columnNumber > 0)
+ lineString += ":" + (columnNumber + 1); // The user visible column number is 1-based.
+ else if (columnStyle === WebInspector.SourceCodeLocation.ColumnStyle.OnlyIfLarge && columnNumber > WebInspector.SourceCodeLocation.LargeColumnNumber)
+ lineString += ":" + (columnNumber + 1); // The user visible column number is 1-based.
</ins><span class="cx">
</span><del>- return string;
</del><ins>+ switch (nameStyle) {
+ case WebInspector.SourceCodeLocation.NameStyle.None:
+ return prefix + lineString;
+
+ case WebInspector.SourceCodeLocation.NameStyle.Short:
+ case WebInspector.SourceCodeLocation.NameStyle.Full:
+ var lineSuffix = sourceCode.url ? ":" + lineString : WebInspector.UIString(" (line %s)").format(lineString);
+ return prefix + (nameStyle === WebInspector.SourceCodeLocation.NameStyle.Full && sourceCode.url ? sourceCode.url : sourceCode.displayName) + lineSuffix;
+
+ default:
+ console.error("Unknown nameStyle: " + nameStyle);
+ return prefix + lineString;
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _resetMappedLocation: function()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceSourceCodeTimelineTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/SourceCodeTimelineTreeElement.js (162420 => 162421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/SourceCodeTimelineTreeElement.js 2014-01-21 02:56:36 UTC (rev 162420)
+++ trunk/Source/WebInspectorUI/UserInterface/SourceCodeTimelineTreeElement.js 2014-01-21 02:56:45 UTC (rev 162421)
</span><span class="lines">@@ -23,13 +23,15 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.SourceCodeTimelineTreeElement = function(sourceCodeTimeline, showFullLocationSubtitle, includeTimerIdentifierInMainTitle)
</del><ins>+WebInspector.SourceCodeTimelineTreeElement = function(sourceCodeTimeline, subtitleNameStyle, includeTimerIdentifierInMainTitle)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(sourceCodeTimeline);
</span><span class="cx">
</span><span class="cx"> this._sourceCodeTimeline = sourceCodeTimeline;
</span><span class="cx">
</span><del>- WebInspector.TimelineRecordTreeElement.call(this, sourceCodeTimeline.records[0], showFullLocationSubtitle, includeTimerIdentifierInMainTitle, sourceCodeTimeline.sourceCodeLocation, sourceCodeTimeline);
</del><ins>+ subtitleNameStyle = subtitleNameStyle || WebInspector.SourceCodeLocation.NameStyle.None;
+
+ WebInspector.TimelineRecordTreeElement.call(this, sourceCodeTimeline.records[0], subtitleNameStyle, includeTimerIdentifierInMainTitle, sourceCodeTimeline.sourceCodeLocation, sourceCodeTimeline);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.SourceCodeTimelineTreeElement.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceTimelineRecordTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/TimelineRecordTreeElement.js (162420 => 162421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/TimelineRecordTreeElement.js 2014-01-21 02:56:36 UTC (rev 162420)
+++ trunk/Source/WebInspectorUI/UserInterface/TimelineRecordTreeElement.js 2014-01-21 02:56:45 UTC (rev 162421)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.TimelineRecordTreeElement = function(timelineRecord, showFullLocationSubtitle, includeTimerIdentifierInMainTitle, sourceCodeLocation, representedObject)
</del><ins>+WebInspector.TimelineRecordTreeElement = function(timelineRecord, subtitleNameStyle, includeTimerIdentifierInMainTitle, sourceCodeLocation, representedObject)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(timelineRecord);
</span><span class="cx">
</span><span class="lines">@@ -34,15 +34,12 @@
</span><span class="cx"> var subtitle = "";
</span><span class="cx">
</span><span class="cx"> if (this._sourceCodeLocation) {
</span><del>- // FIXME: This needs to live update the subtitle in response to the WebInspector.SourceCodeLocation.Event.DisplayLocationChanged event.
</del><ins>+ subtitle = document.createElement("span");
</ins><span class="cx">
</span><del>- if (showFullLocationSubtitle) {
- subtitle = this._sourceCodeLocation.displayLocationString(WebInspector.SourceCodeLocation.ColumnStyle.OnlyIfLarge);
- } else {
- subtitle = WebInspector.UIString("line ") + (this._sourceCodeLocation.displayLineNumber + 1); // The user visible line number is 1-based.
- if (this._sourceCodeLocation.displayColumnNumber > WebInspector.SourceCodeLocation.LargeColumnNumber)
- subtitle += ":" + (this._sourceCodeLocation.displayColumnNumber + 1); // The user visible column number is 1-based.
- }
</del><ins>+ if (subtitleNameStyle !== WebInspector.SourceCodeLocation.NameStyle.None)
+ this._sourceCodeLocation.populateLiveDisplayLocationString(subtitle, "textContent", null, subtitleNameStyle);
+ else
+ this._sourceCodeLocation.populateLiveDisplayLocationString(subtitle, "textContent", null, WebInspector.SourceCodeLocation.NameStyle.None, WebInspector.UIString("line "));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var iconStyleClass = null;
</span><span class="lines">@@ -102,6 +99,9 @@
</span><span class="cx"> WebInspector.GeneralTreeElement.call(this, [iconStyleClass], title, subtitle, representedObject || timelineRecord, false);
</span><span class="cx">
</span><span class="cx"> this.small = true;
</span><ins>+
+ if (this._sourceCodeLocation)
+ this.tooltipHandledSeparately = true;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineRecordTreeElement.StyleRecordIconStyleClass = "style-record";
</span><span class="lines">@@ -127,5 +127,20 @@
</span><span class="cx"> {
</span><span class="cx"> var url = this._sourceCodeLocation ? this._sourceCodeLocation.sourceCode.url : "";
</span><span class="cx"> return {text: [this.mainTitle, url || "", this._record.details || ""]};
</span><ins>+ },
+
+ // Protected
+
+ onattach: function()
+ {
+ WebInspector.GeneralTreeElement.prototype.onattach.call(this);
+
+ console.assert(this.element);
+
+ if (!this.tooltipHandledSeparately)
+ return;
+
+ var tooltipPrefix = this.mainTitle + "\n";
+ this._sourceCodeLocation.populateLiveDisplayLocationTooltip(this.element, tooltipPrefix);
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>