<!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>[162136] 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/162136">162136</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2014-01-16 11:06:41 -0800 (Thu, 16 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: add probe breakpoint action to popup breakpoint editor
https://bugs.webkit.org/show_bug.cgi?id=126931
Reviewed by Timothy Hatcher.
Add probes to the breakpoint action dropdown.
Reuse the "evaluate JavaScript" input UI.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/BreakpointAction.js:
* UserInterface/BreakpointActionView.js:
(WebInspector.BreakpointActionView.displayStringForType):
(WebInspector.BreakpointActionView.prototype._updateBody.switch.break):</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="#trunkSourceWebInspectorUIUserInterfaceBreakpointActionjs">trunk/Source/WebInspectorUI/UserInterface/BreakpointAction.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBreakpointActionViewjs">trunk/Source/WebInspectorUI/UserInterface/BreakpointActionView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (162135 => 162136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-01-16 18:47:04 UTC (rev 162135)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-01-16 19:06:41 UTC (rev 162136)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-01-16 Brian Burg <bburg@apple.com>
+
+ Web Inspector: add probe breakpoint action to popup breakpoint editor
+ https://bugs.webkit.org/show_bug.cgi?id=126931
+
+ Reviewed by Timothy Hatcher.
+
+ Add probes to the breakpoint action dropdown.
+ Reuse the "evaluate JavaScript" input UI.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/BreakpointAction.js:
+ * UserInterface/BreakpointActionView.js:
+ (WebInspector.BreakpointActionView.displayStringForType):
+ (WebInspector.BreakpointActionView.prototype._updateBody.switch.break):
+
</ins><span class="cx"> 2014-01-15 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: capture probe samples on the backend
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (162135 => 162136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2014-01-16 18:47:04 UTC (rev 162135)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2014-01-16 19:06:41 UTC (rev 162136)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-\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 ;
</del><ins>+\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 ;
</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><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="lines">@@ -38,7 +38,7 @@
</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><span class="lines">@@ -128,10 +128,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 +144,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">@@ -288,6 +288,7 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " P l a y S o u n d " ] = " P l a y S o u n d " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " P o r t " ] = " P o r t " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " P r e t t y p r i n t " ] = " P r e t t y p r i n t " ;
</span><ins>+ 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 " ;
</ins><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><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 s " ] = " P r o f i l e s " ;
</span><span class="lines">@@ -299,7 +300,7 @@
</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><span class="cx"> 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 " ;
</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 " ] = " R e c o r d i n g " ;
</span><del>- 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><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="lines">@@ -378,7 +379,7 @@
</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><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 " ] = " 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 i m e l i n e s " ] = " T i m e l i n e s " ;
</span><span class="lines">@@ -411,3 +412,4 @@
</span><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><ins>+
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBreakpointActionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/BreakpointAction.js (162135 => 162136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/BreakpointAction.js 2014-01-16 18:47:04 UTC (rev 162135)
+++ trunk/Source/WebInspectorUI/UserInterface/BreakpointAction.js 2014-01-16 19:06:41 UTC (rev 162136)
</span><span class="lines">@@ -47,7 +47,8 @@
</span><span class="cx"> WebInspector.BreakpointAction.Type = {
</span><span class="cx"> Log: "log",
</span><span class="cx"> Evaluate: "evaluate",
</span><del>- Sound: "sound"
</del><ins>+ Sound: "sound",
+ Probe: "probe"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebInspector.BreakpointAction.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBreakpointActionViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/BreakpointActionView.js (162135 => 162136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/BreakpointActionView.js 2014-01-16 18:47:04 UTC (rev 162135)
+++ trunk/Source/WebInspectorUI/UserInterface/BreakpointActionView.js 2014-01-16 19:06:41 UTC (rev 162136)
</span><span class="lines">@@ -77,6 +77,8 @@
</span><span class="cx"> return WebInspector.UIString("Evaluate JavaScript");
</span><span class="cx"> case WebInspector.BreakpointAction.Type.Sound:
</span><span class="cx"> return WebInspector.UIString("Play Sound");
</span><ins>+ case WebInspector.BreakpointAction.Type.Probe:
+ return WebInspector.UIString("Probe Expression");
</ins><span class="cx"> default:
</span><span class="cx"> console.assert(false);
</span><span class="cx"> return "";
</span><span class="lines">@@ -139,6 +141,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebInspector.BreakpointAction.Type.Evaluate:
</span><ins>+ case WebInspector.BreakpointAction.Type.Probe:
</ins><span class="cx"> this._bodyElement.hidden = false;
</span><span class="cx">
</span><span class="cx"> var editorElement = this._bodyElement.appendChild(document.createElement("div"));
</span></span></pre>
</div>
</div>
</body>
</html>