<!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>[178648] trunk</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/178648">178648</a></dd>

<dt>Author</dt> <dd>ap@apple.com</dd>

<dt>Date</dt> <dd>2015-01-19 09:25:23 -0800 (Mon, 19 Jan 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Console log sometimes prefixed with line number

https://bugs.webkit.org/show_bug.cgi?id=105280

Reviewed by Darin Adler.

Source/WebCore:

Improve the logic for determining whether a console message should be associated

with a source code location.

* dom/ScriptableDocumentParser.h:

* html/parser/HTMLDocumentParser.cpp:

(WebCore::HTMLDocumentParser::shouldAssociateConsoleMessagesWithTextPosition):

* html/parser/HTMLDocumentParser.h:

* page/PageConsoleClient.cpp:

(WebCore::getParserLocationForConsoleMessage):

(WebCore::PageConsoleClient::addMessage):

* xml/parser/XMLDocumentParser.cpp:

(WebCore::XMLDocumentParser::pauseParsing):

* xml/parser/XMLDocumentParser.h:

* xml/parser/XMLDocumentParserLibxml2.cpp:

(WebCore::XMLDocumentParser::shouldAssociateConsoleMessagesWithTextPosition):

LayoutTests:

Some messages lost line numbers now. Some of these were definitely wrong, others

were roughly right. Unfortunately, it is not currently possible to figure out whether

ScriptController actually executes a script after passing control to it. So the cases

where it refuses to execute the script and logs a message are handled like those

where it does.

I think that it shouldn't be a big obstacle in practice, it is easy enough to find

a script in a page when Web Inspector tells you that scripts were not allowed.

* fast/frames/sandboxed-iframe-attribute-parsing-06-expected.txt:

* fast/frames/sandboxed-iframe-attribute-parsing-07-expected.txt:

* fast/frames/sandboxed-iframe-attribute-parsing-08-expected.txt:

* fast/frames/sandboxed-iframe-attribute-parsing-09-expected.txt:

* fast/frames/sandboxed-iframe-attribute-parsing-10-expected.txt:

* fast/frames/sandboxed-iframe-attribute-parsing-11-expected.txt:

* fast/frames/sandboxed-iframe-attribute-parsing-12-expected.txt:

* fast/frames/sandboxed-iframe-attribute-parsing-13-expected.txt:

* fast/frames/sandboxed-iframe-attribute-parsing-14-expected.txt:

* fast/frames/sandboxed-iframe-parsing-space-characters-expected.txt:

* fast/frames/sandboxed-iframe-scripting-04-expected.txt:

* http/tests/security/contentSecurityPolicy/sandbox-empty-expected.txt:

* http/tests/security/contentSecurityPolicy/sandbox-empty-subframe-expected.txt:

* http/tests/security/contentSecurityPolicy/sandbox-in-http-header-control-expected.txt:

* http/tests/security/contentSecurityPolicy/sandbox-in-http-header-expected.txt:

* http/tests/security/contentSecurityPolicy/sandbox-invalid-header-expected.txt:

* http/tests/security/isolatedWorld/sandboxed-iframe-expected.txt:

* http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt:

* http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt:

* http/tests/security/no-javascript-refresh-expected.txt:

* http/tests/security/no-javascript-refresh-spaces-expected.txt:

* platform/efl/TestExpectations:

* platform/gtk/TestExpectations:

Unmark tests that were broken by this.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkLayoutTestsfastframessandboxediframeattributeparsing06expectedtxt">trunk/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing-06-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastframessandboxediframeattributeparsing07expectedtxt">trunk/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing-07-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastframessandboxediframeattributeparsing08expectedtxt">trunk/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing-08-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastframessandboxediframeattributeparsing09expectedtxt">trunk/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing-09-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastframessandboxediframeattributeparsing10expectedtxt">trunk/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing-10-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastframessandboxediframeattributeparsing11expectedtxt">trunk/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing-11-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastframessandboxediframeattributeparsing12expectedtxt">trunk/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing-12-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastframessandboxediframeattributeparsing13expectedtxt">trunk/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing-13-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastframessandboxediframeattributeparsing14expectedtxt">trunk/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing-14-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastframessandboxediframeparsingspacecharactersexpectedtxt">trunk/LayoutTests/fast/frames/sandboxed-iframe-parsing-space-characters-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastframessandboxediframescripting04expectedtxt">trunk/LayoutTests/fast/frames/sandboxed-iframe-scripting-04-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicysandboxemptyexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/sandbox-empty-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicysandboxemptysubframeexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/sandbox-empty-subframe-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicysandboxinhttpheadercontrolexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/sandbox-in-http-header-control-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicysandboxinhttpheaderexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/sandbox-in-http-header-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicysandboxinvalidheaderexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/sandbox-invalid-header-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecurityisolatedWorldsandboxediframeexpectedtxt">trunk/LayoutTests/http/tests/security/isolatedWorld/sandboxed-iframe-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritymixedContentinsecurescriptiniframeexpectedtxt">trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritymixedContentredirecthttptohttpsscriptiniframeexpectedtxt">trunk/LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritynojavascriptrefreshexpectedtxt">trunk/LayoutTests/http/tests/security/no-javascript-refresh-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritynojavascriptrefreshspacesexpectedtxt">trunk/LayoutTests/http/tests/security/no-javascript-refresh-spaces-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>

<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoredomScriptableDocumentParserh">trunk/Source/WebCore/dom/ScriptableDocumentParser.h</a></li>

<li><a href="#trunkSourceWebCorehtmlparserHTMLDocumentParsercpp">trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp</a></li>

<li><a href="#trunkSourceWebCorehtmlparserHTMLDocumentParserh">trunk/Source/WebCore/html/parser/HTMLDocumentParser.h</a></li>

<li><a href="#trunkSourceWebCorepagePageConsoleClientcpp">trunk/Source/WebCore/page/PageConsoleClient.cpp</a></li>

<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParsercpp">trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp</a></li>

<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserh">trunk/Source/WebCore/xml/parser/XMLDocumentParser.h</a></li>

<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp">trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178647 => 178648)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2015-01-19 16:32:26 UTC (rev 178647)

+++ trunk/LayoutTests/ChangeLog        2015-01-19 17:25:23 UTC (rev 178648)

</span><span class="lines">@@ -1,3 +1,45 @@

</span><ins>+2015-01-16  Alexey Proskuryakov  &lt;ap@apple.com&gt;

+

+        Console log sometimes prefixed with line number

+        https://bugs.webkit.org/show_bug.cgi?id=105280

+

+        Reviewed by Darin Adler.

+

+        Some messages lost line numbers now. Some of these were definitely wrong, others

+        were roughly right. Unfortunately, it is not currently possible to figure out whether

+        ScriptController actually executes a script after passing control to it. So the cases

+        where it refuses to execute the script and logs a message are handled like those

+        where it does.

+

+        I think that it shouldn't be a big obstacle in practice, it is easy enough to find

+        a script in a page when Web Inspector tells you that scripts were not allowed.

+

+        * fast/frames/sandboxed-iframe-attribute-parsing-06-expected.txt:

+        * fast/frames/sandboxed-iframe-attribute-parsing-07-expected.txt:

+        * fast/frames/sandboxed-iframe-attribute-parsing-08-expected.txt:

+        * fast/frames/sandboxed-iframe-attribute-parsing-09-expected.txt:

+        * fast/frames/sandboxed-iframe-attribute-parsing-10-expected.txt:

+        * fast/frames/sandboxed-iframe-attribute-parsing-11-expected.txt:

+        * fast/frames/sandboxed-iframe-attribute-parsing-12-expected.txt:

+        * fast/frames/sandboxed-iframe-attribute-parsing-13-expected.txt:

+        * fast/frames/sandboxed-iframe-attribute-parsing-14-expected.txt:

+        * fast/frames/sandboxed-iframe-parsing-space-characters-expected.txt:

+        * fast/frames/sandboxed-iframe-scripting-04-expected.txt:

+        * http/tests/security/contentSecurityPolicy/sandbox-empty-expected.txt:

+        * http/tests/security/contentSecurityPolicy/sandbox-empty-subframe-expected.txt:

+        * http/tests/security/contentSecurityPolicy/sandbox-in-http-header-control-expected.txt:

+        * http/tests/security/contentSecurityPolicy/sandbox-in-http-header-expected.txt:

+        * http/tests/security/contentSecurityPolicy/sandbox-invalid-header-expected.txt:

+        * http/tests/security/isolatedWorld/sandboxed-iframe-expected.txt:

+        * http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt:

+        * http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe-expected.txt:

+        * http/tests/security/no-javascript-refresh-expected.txt:

+        * http/tests/security/no-javascript-refresh-spaces-expected.txt:

+

+        * platform/efl/TestExpectations:

+        * platform/gtk/TestExpectations:

+        Unmark tests that were broken by this.

+

</ins><span class="cx"> 2015-01-19  Csaba Osztrogonác  &lt;ossy@webkit.org&gt;

</span><span class="cx"> 

</span><span class="cx">         [Win] REGRESSION(r177542 or r177613): svg/W3C tests are broken

</span></span></pre></div>

<a id="trunkLayoutTestsfastframessandboxediframeattributeparsing06expectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing-06-expected.txt (178647 => 178648)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing-06-expected.txt        2015-01-19 16:32:26 UTC (rev 178647)

+++ trunk/LayoutTests/fast/frames/sandboxed-iframe-attribute-parsing-06-expected.txt        2015-01-19 17:25:23 UTC (rev 178648)

</span><span class="lines">@@ -1,5 +1,5 @@

<span class="cx"> CONSOLE MESSAGE: line 9: Error while parsing the 'sandbox' attribute: 'allowscripts' is an invalid sandbox flag.