<!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>[168494] 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/168494">168494</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-08 14:07:56 -0700 (Thu, 08 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Console error when launching Web Inspector "Mode htmlmixed failed to advance stream"
https://bugs.webkit.org/show_bug.cgi?id=132703
Patch by Jono Wells <jonowells@apple.com> on 2014-05-08
Reviewed by Timothy Hatcher.
The CodeMirror 4 update brought with it a change in the XML mode that
causes our XML mode extension to fail to consume empty paired quotes
correctly.
* UserInterface/Views/CodeMirrorAdditions.js:
Updated extendedXMLToken() to properly handle empty paired quotes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCodeMirrorAdditionsjs">trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (168493 => 168494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-05-08 20:56:37 UTC (rev 168493)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-05-08 21:07:56 UTC (rev 168494)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-05-08 Jono Wells <jonowells@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Console error when launching Web Inspector "Mode htmlmixed failed to advance stream"
+ https://bugs.webkit.org/show_bug.cgi?id=132703
+
+ Reviewed by Timothy Hatcher.
+
+ The CodeMirror 4 update brought with it a change in the XML mode that
+ causes our XML mode extension to fail to consume empty paired quotes
+ correctly.
+
+ * UserInterface/Views/CodeMirrorAdditions.js:
+ Updated extendedXMLToken() to properly handle empty paired quotes.
+
+2014-05-08 Jono Wells <jonowells@apple.com>
+
</ins><span class="cx"> Web Inspector: Selecting frame in debugger sidebar doesn't reveal code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132112
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCodeMirrorAdditionsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js (168493 => 168494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2014-05-08 20:56:37 UTC (rev 168493)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2014-05-08 21:07:56 UTC (rev 168494)
</span><span class="lines">@@ -80,7 +80,6 @@
</span><span class="cx"> // Remember the start position so we can rewind if needed.
</span><span class="cx"> var startPosition = stream.pos;
</span><span class="cx"> var style = this._token(stream, state);
</span><del>-
</del><span class="cx"> if (style === "attribute") {
</span><span class="cx"> // Look for "href" or "src" attributes. If found then we should
</span><span class="cx"> // expect a string later that should get the "link" style instead.
</span><span class="lines">@@ -90,23 +89,30 @@
</span><span class="cx"> else
</span><span class="cx"> delete state._expectLink;
</span><span class="cx"> } else if (state._expectLink && style === "string") {
</span><del>- delete state._expectLink;
</del><ins>+ var current = stream.current();
</ins><span class="cx">
</span><del>- // This is a link, so setup the state to process it next.
- state._linkTokenize = tokenizeLinkString;
- state._linkBaseStyle = style;
</del><ins>+ // Unless current token is empty quotes, consume quote character
+ // and tokenize link next.
+ if (current !== "\"\"" && current !== "''") {
+ delete state._expectLink;
</ins><span class="cx">
</span><del>- // The attribute may or may not be quoted.
- var quote = stream.current()[0];
- state._linkQuoteCharacter = quote === "'" || quote === "\"" ? quote : null;
</del><ins>+ // This is a link, so setup the state to process it next.
+ state._linkTokenize = tokenizeLinkString;
+ state._linkBaseStyle = style;
</ins><span class="cx">
</span><del>- // Rewind the steam to the start of this token.
- stream.pos = startPosition;
</del><ins>+ // The attribute may or may not be quoted.
+ var quote = current[0];
</ins><span class="cx">
</span><del>- // Eat the open quote of the string so the string style
- // will be used for the quote character.
- if (state._linkQuoteCharacter)
- stream.eat(state._linkQuoteCharacter);
</del><ins>+ state._linkQuoteCharacter = quote === "'" || quote === "\"" ? quote : null;
+
+ // Rewind the steam to the start of this token.
+ stream.pos = startPosition;
+
+ // Eat the open quote of the string so the string style
+ // will be used for the quote character.
+ if (state._linkQuoteCharacter)
+ stream.eat(state._linkQuoteCharacter);
+ }
</ins><span class="cx"> } else if (style) {
</span><span class="cx"> // We don't expect other tokens between attribute and string since
</span><span class="cx"> // spaces and the equal character are not tokenized. So if we get
</span></span></pre>
</div>
</div>
</body>
</html>