<!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>[160374] 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/160374">160374</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-10 10:53:51 -0800 (Tue, 10 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>PageConsole::addMessage should automatically determine column number alongside line number
https://bugs.webkit.org/show_bug.cgi?id=114319
Patch by László Langó <lango@inf.u-szeged.hu> on 2013-12-10
Reviewed by Joseph Pecoraro.
Source/WebCore:
* dom/InlineStyleSheetOwner.cpp:
(WebCore::InlineStyleSheetOwner::InlineStyleSheetOwner):
* dom/ScriptElement.cpp:
(WebCore::ScriptElement::ScriptElement):
* dom/ScriptableDocumentParser.h:
* dom/StyledElement.cpp:
(WebCore::StyledElement::styleAttributeChanged):
* html/parser/HTMLDocumentParser.cpp:
(WebCore::HTMLDocumentParser::didReceiveParsedChunkFromBackgroundParser):
(WebCore::HTMLDocumentParser::pumpPendingSpeculations):
* html/parser/HTMLDocumentParser.h:
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::buildInitiatorObject):
* page/Console.cpp:
(WebCore::internalAddMessage):
* page/PageConsole.cpp:
(WebCore::PageConsole::printSourceURLAndPosition):
(WebCore::PageConsole::addMessage):
* page/PageConsole.h:
* xml/parser/XMLDocumentParser.h:
* xml/parser/XMLDocumentParserLibxml2.cpp:
(WebCore::XMLDocumentParser::error):
LayoutTests:
* inspector-protocol/page/deny-X-FrameOption-expected.txt: Added.
* inspector-protocol/page/deny-X-FrameOption.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomInlineStyleSheetOwnercpp">trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptElementcpp">trunk/Source/WebCore/dom/ScriptElement.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptableDocumentParserh">trunk/Source/WebCore/dom/ScriptableDocumentParser.h</a></li>
<li><a href="#trunkSourceWebCoredomStyledElementcpp">trunk/Source/WebCore/dom/StyledElement.cpp</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="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorepageConsolecpp">trunk/Source/WebCore/page/Console.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageConsolecpp">trunk/Source/WebCore/page/PageConsole.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageConsoleh">trunk/Source/WebCore/page/PageConsole.h</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorprotocolpagedenyXFrameOptionexpectedtxt">trunk/LayoutTests/inspector-protocol/page/deny-X-FrameOption-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocolpagedenyXFrameOptionhtml">trunk/LayoutTests/inspector-protocol/page/deny-X-FrameOption.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/LayoutTests/ChangeLog 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-10 László Langó <lango@inf.u-szeged.hu>
+
+ PageConsole::addMessage should automatically determine column number alongside line number
+ https://bugs.webkit.org/show_bug.cgi?id=114319
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector-protocol/page/deny-X-FrameOption-expected.txt: Added.
+ * inspector-protocol/page/deny-X-FrameOption.html: Added.
+
</ins><span class="cx"> 2013-12-10 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gardening
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolpagedenyXFrameOptionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector-protocol/page/deny-X-FrameOption-expected.txt (0 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/page/deny-X-FrameOption-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector-protocol/page/deny-X-FrameOption-expected.txt 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+CONSOLE MESSAGE: Refused to display 'deny-X-FrameOption.html' in a frame because it set 'X-Frame-Options' to 'deny'.
+
+deny-X-FrameOption.html:0:0
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolpagedenyXFrameOptionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector-protocol/page/deny-X-FrameOption.html (0 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/page/deny-X-FrameOption.html (rev 0)
+++ trunk/LayoutTests/inspector-protocol/page/deny-X-FrameOption.html 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<html>
+<head>
+<script type="text/javascript" src="../../http/tests/inspector-protocol/resources/protocol-test.js"></script>
+<script>
+function test()
+{
+ InspectorTest.importScript("../../../../inspector-protocol/resources/console-helper.js");
+ InspectorTest.sendCommand("Console.enable", {});
+
+ InspectorTest.eventHandler["Console.messageAdded"] = function(messageObject)
+ {
+ var simplifiedMessage = ConsoleHelper.simplifiedConsoleMessage(messageObject);
+ // FIXME The line and column values will be zeros until this fix:
+ // https://bugs.webkit.org/show_bug.cgi?id=125340
+ // After this probably we should update the expected.txt.
+ InspectorTest.log(simplifiedMessage.location);
+
+ InspectorTest.completeTest();
+ }
+}
+</script>
+</head>
+<body onload="runTest()">
+ <iframe id=foo></iframe>
+ <script>
+ var fooFrame = document.getElementById('foo');
+ var fooDoc = fooFrame.contentWindow.document;
+ fooDoc.write('<meta http-equiv="X-Frame-Options" content="deny"/>');
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/Source/WebCore/ChangeLog 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2013-12-10 László Langó <lango@inf.u-szeged.hu>
+
+ PageConsole::addMessage should automatically determine column number alongside line number
+ https://bugs.webkit.org/show_bug.cgi?id=114319
+
+ Reviewed by Joseph Pecoraro.
+
+ * dom/InlineStyleSheetOwner.cpp:
+ (WebCore::InlineStyleSheetOwner::InlineStyleSheetOwner):
+ * dom/ScriptElement.cpp:
+ (WebCore::ScriptElement::ScriptElement):
+ * dom/ScriptableDocumentParser.h:
+ * dom/StyledElement.cpp:
+ (WebCore::StyledElement::styleAttributeChanged):
+ * html/parser/HTMLDocumentParser.cpp:
+ (WebCore::HTMLDocumentParser::didReceiveParsedChunkFromBackgroundParser):
+ (WebCore::HTMLDocumentParser::pumpPendingSpeculations):
+ * html/parser/HTMLDocumentParser.h:
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::buildInitiatorObject):
+ * page/Console.cpp:
+ (WebCore::internalAddMessage):
+ * page/PageConsole.cpp:
+ (WebCore::PageConsole::printSourceURLAndPosition):
+ (WebCore::PageConsole::addMessage):
+ * page/PageConsole.h:
+ * xml/parser/XMLDocumentParser.h:
+ * xml/parser/XMLDocumentParserLibxml2.cpp:
+ (WebCore::XMLDocumentParser::error):
+
</ins><span class="cx"> 2013-12-10 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Jettison all StyleResolver data on memory pressure.
</span></span></pre></div>
<a id="trunkSourceWebCoredomInlineStyleSheetOwnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> , m_startLineNumber(WTF::OrdinalNumber::beforeFirst())
</span><span class="cx"> {
</span><span class="cx"> if (createdByParser && document.scriptableDocumentParser() && !document.isInDocumentWrite())
</span><del>- m_startLineNumber = document.scriptableDocumentParser()->lineNumber();
</del><ins>+ m_startLineNumber = document.scriptableDocumentParser()->textPosition().m_line;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InlineStyleSheetOwner::~InlineStyleSheetOwner()
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptElement.cpp (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptElement.cpp 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/Source/WebCore/dom/ScriptElement.cpp 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_element);
</span><span class="cx"> if (parserInserted && m_element->document().scriptableDocumentParser() && !m_element->document().isInDocumentWrite())
</span><del>- m_startLineNumber = m_element->document().scriptableDocumentParser()->lineNumber();
</del><ins>+ m_startLineNumber = m_element->document().scriptableDocumentParser()->textPosition().m_line;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScriptElement::~ScriptElement()
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptableDocumentParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptableDocumentParser.h (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptableDocumentParser.h 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/Source/WebCore/dom/ScriptableDocumentParser.h 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -44,8 +44,6 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isWaitingForScripts() const = 0;
</span><span class="cx">
</span><del>- // These are used to expose the current line/column to the scripting system.
- virtual OrdinalNumber lineNumber() const = 0;
</del><span class="cx"> virtual TextPosition textPosition() const = 0;
</span><span class="cx">
</span><span class="cx"> void setWasCreatedByScript(bool wasCreatedByScript) { m_wasCreatedByScript = wasCreatedByScript; }
</span></span></pre></div>
<a id="trunkSourceWebCoredomStyledElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StyledElement.cpp (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StyledElement.cpp 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/Source/WebCore/dom/StyledElement.cpp 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> {
</span><span class="cx"> WTF::OrdinalNumber startLineNumber = WTF::OrdinalNumber::beforeFirst();
</span><span class="cx"> if (document().scriptableDocumentParser() && !document().isInDocumentWrite())
</span><del>- startLineNumber = document().scriptableDocumentParser()->lineNumber();
</del><ins>+ startLineNumber = document().scriptableDocumentParser()->textPosition().m_line;
</ins><span class="cx">
</span><span class="cx"> if (newStyleString.isNull()) {
</span><span class="cx"> if (PropertySetCSSStyleDeclaration* cssomWrapper = inlineStyleCSSOMWrapper())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLDocumentParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -314,13 +314,13 @@
</span><span class="cx"> // but we need to ensure it isn't deleted yet.
</span><span class="cx"> Ref<HTMLDocumentParser> protect(*this);
</span><span class="cx">
</span><del>- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willWriteHTML(document(), lineNumber().zeroBasedInt());
</del><ins>+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willWriteHTML(document(), textPosition().m_line.zeroBasedInt());
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_speculations.isEmpty());
</span><span class="cx"> chunk->preloads.clear(); // We don't need to preload because we're going to parse immediately.
</span><span class="cx"> processParsedChunkFromBackgroundParser(chunk);
</span><span class="cx">
</span><del>- InspectorInstrumentation::didWriteHTML(cookie, lineNumber().zeroBasedInt());
</del><ins>+ InspectorInstrumentation::didWriteHTML(cookie, textPosition().m_line.zeroBasedInt());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLDocumentParser::validateSpeculations(OwnPtr<ParsedChunk> chunk)
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> ASSERT(!m_lastChunkBeforeScript);
</span><span class="cx">
</span><span class="cx"> // FIXME: Pass in current input length.
</span><del>- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willWriteHTML(document(), lineNumber().zeroBasedInt());
</del><ins>+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willWriteHTML(document(), textPosition().m_line.zeroBasedInt());
</ins><span class="cx">
</span><span class="cx"> double startTime = monotonicallyIncreasingTime();
</span><span class="cx">
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorInstrumentation::didWriteHTML(cookie, lineNumber().zeroBasedInt());
</del><ins>+ InspectorInstrumentation::didWriteHTML(cookie, textPosition().m_line.zeroBasedInt());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(THREADED_HTML_PARSER)
</span><span class="lines">@@ -828,16 +828,6 @@
</span><span class="cx"> return m_scriptRunner->isExecutingScript();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-OrdinalNumber HTMLDocumentParser::lineNumber() const
-{
-#if ENABLE(THREADED_HTML_PARSER)
- if (m_haveBackgroundParser)
- return m_textPosition.m_line;
-#endif
-
- return m_input.current().currentLine();
-}
-
</del><span class="cx"> TextPosition HTMLDocumentParser::textPosition() const
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(THREADED_HTML_PARSER)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLDocumentParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLDocumentParser.h (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLDocumentParser.h 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/Source/WebCore/html/parser/HTMLDocumentParser.h 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -80,7 +80,6 @@
</span><span class="cx"> HTMLTokenizer* tokenizer() const { return m_tokenizer.get(); }
</span><span class="cx">
</span><span class="cx"> virtual TextPosition textPosition() const;
</span><del>- virtual OrdinalNumber lineNumber() const;
</del><span class="cx">
</span><span class="cx"> virtual void suspendScheduledTasks();
</span><span class="cx"> virtual void resumeScheduledTasks();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> RefPtr<TypeBuilder::Network::Initiator> initiatorObject = TypeBuilder::Network::Initiator::create()
</span><span class="cx"> .setType(TypeBuilder::Network::Initiator::Type::Parser);
</span><span class="cx"> initiatorObject->setUrl(document->url().string());
</span><del>- initiatorObject->setLineNumber(document->scriptableDocumentParser()->lineNumber().oneBasedInt());
</del><ins>+ initiatorObject->setLineNumber(document->scriptableDocumentParser()->textPosition().m_line.oneBasedInt());
</ins><span class="cx"> return initiatorObject;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageConsolecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Console.cpp (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Console.cpp 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/Source/WebCore/page/Console.cpp 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> if (!page->settings().logsPageMessagesToSystemConsoleEnabled() && !PageConsole::shouldPrintExceptions())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- PageConsole::printSourceURLAndLine(lastCaller.sourceURL(), lastCaller.lineNumber());
</del><ins>+ PageConsole::printSourceURLAndPosition(lastCaller.sourceURL(), lastCaller.lineNumber());
</ins><span class="cx"> PageConsole::printMessageSourceAndLevelPrefix(ConsoleAPIMessageSource, level);
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < arguments->argumentCount(); ++i) {
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConsolecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConsole.cpp (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConsole.cpp 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/Source/WebCore/page/PageConsole.cpp 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -64,11 +64,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageConsole::printSourceURLAndLine(const String& sourceURL, unsigned lineNumber)
</del><ins>+void PageConsole::printSourceURLAndPosition(const String& sourceURL, unsigned lineNumber, unsigned columnNumber)
</ins><span class="cx"> {
</span><span class="cx"> if (!sourceURL.isEmpty()) {
</span><del>- if (lineNumber > 0)
- printf("%s:%d: ", sourceURL.utf8().data(), lineNumber);
</del><ins>+ if (lineNumber > 0 && columnNumber > 0)
+ printf("%s:%u:%u: ", sourceURL.utf8().data(), lineNumber, columnNumber);
</ins><span class="cx"> else
</span><span class="cx"> printf("%s: ", sourceURL.utf8().data());
</span><span class="cx"> }
</span><span class="lines">@@ -142,18 +142,22 @@
</span><span class="cx"> String url;
</span><span class="cx"> if (document)
</span><span class="cx"> url = document->url().string();
</span><del>- // FIXME: <http://webkit.org/b/114319> PageConsole::addMessage should automatically determine column number alongside line number.
</del><span class="cx"> // FIXME: The below code attempts to determine line numbers for parser generated errors, but this is not the only reason why we can get here.
</span><span class="cx"> // For example, if we are still parsing and get a WebSocket network error, it will be erroneously attributed to a line where parsing was paused.
</span><span class="cx"> // Also, we should determine line numbers for script generated messages (e.g. calling getImageData on a canvas).
</span><span class="cx"> // We probably need to split this function into multiple ones, as appropriate for different call sites. Or maybe decide based on MessageSource.
</span><ins>+ // https://bugs.webkit.org/show_bug.cgi?id=125340
</ins><span class="cx"> unsigned line = 0;
</span><ins>+ unsigned column = 0;
</ins><span class="cx"> if (document && document->parsing() && !document->isInDocumentWrite() && document->scriptableDocumentParser()) {
</span><span class="cx"> ScriptableDocumentParser* parser = document->scriptableDocumentParser();
</span><del>- if (!parser->isWaitingForScripts() && !JSMainThreadExecState::currentState())
- line = parser->lineNumber().oneBasedInt();
</del><ins>+ if (!parser->isWaitingForScripts() && !JSMainThreadExecState::currentState()) {
+ TextPosition position = parser->textPosition();
+ line = position.m_line.oneBasedInt();
+ column = position.m_column.oneBasedInt();
+ }
</ins><span class="cx"> }
</span><del>- addMessage(source, level, message, url, line, 0, 0, 0, requestIdentifier);
</del><ins>+ addMessage(source, level, message, url, line, column, 0, 0, requestIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageConsole::addMessage(MessageSource source, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack)
</span><span class="lines">@@ -182,7 +186,7 @@
</span><span class="cx"> if (!m_page.settings().logsPageMessagesToSystemConsoleEnabled() && !shouldPrintExceptions())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- printSourceURLAndLine(url, lineNumber);
</del><ins>+ printSourceURLAndPosition(url, lineNumber, columnNumber);
</ins><span class="cx"> printMessageSourceAndLevelPrefix(source, level);
</span><span class="cx">
</span><span class="cx"> printf(" %s\n", message.utf8().data());
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConsoleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConsole.h (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConsole.h 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/Source/WebCore/page/PageConsole.h 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> PageConsole(Page&);
</span><span class="cx"> ~PageConsole();
</span><span class="cx">
</span><del>- static void printSourceURLAndLine(const String& sourceURL, unsigned lineNumber);
</del><ins>+ static void printSourceURLAndPosition(const String& sourceURL, unsigned lineNumber, unsigned columnNumber = 0);
</ins><span class="cx"> static void printMessageSourceAndLevelPrefix(MessageSource, MessageLevel);
</span><span class="cx">
</span><span class="cx"> void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> = 0, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParser.h (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParser.h 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParser.h 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -105,8 +105,6 @@
</span><span class="cx"> virtual bool isWaitingForScripts() const;
</span><span class="cx"> virtual void stopParsing();
</span><span class="cx"> virtual void detach();
</span><del>- virtual OrdinalNumber lineNumber() const;
- OrdinalNumber columnNumber() const;
</del><span class="cx">
</span><span class="cx"> // from CachedResourceClient
</span><span class="cx"> virtual void notifyFinished(CachedResource*);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (160373 => 160374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2013-12-10 18:49:42 UTC (rev 160373)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2013-12-10 18:53:51 UTC (rev 160374)
</span><span class="lines">@@ -972,8 +972,9 @@
</span><span class="cx"> vsnprintf(m, sizeof(m) - 1, message, args);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ TextPosition position = textPosition();
</ins><span class="cx"> if (m_parserPaused)
</span><del>- m_pendingCallbacks->appendErrorCallback(type, reinterpret_cast<const xmlChar*>(m), lineNumber(), columnNumber());
</del><ins>+ m_pendingCallbacks->appendErrorCallback(type, reinterpret_cast<const xmlChar*>(m), position.m_line, position.m_column);
</ins><span class="cx"> else
</span><span class="cx"> handleError(type, m, textPosition());
</span><span class="cx">
</span><span class="lines">@@ -1426,16 +1427,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-OrdinalNumber XMLDocumentParser::lineNumber() const
-{
- return OrdinalNumber::fromOneBasedInt(context() ? context()->input->line : 1);
-}
-
-OrdinalNumber XMLDocumentParser::columnNumber() const
-{
- return OrdinalNumber::fromOneBasedInt(context() ? context()->input->col : 1);
-}
-
</del><span class="cx"> TextPosition XMLDocumentParser::textPosition() const
</span><span class="cx"> {
</span><span class="cx"> xmlParserCtxtPtr context = this->context();
</span></span></pre>
</div>
</div>
</body>
</html>