Changeset 160374 in webkit

Timestamp:

Dec 10, 2013 10:53:51 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector-protocol/page/deny-X-FrameOption-expected.txt (added)
• LayoutTests/inspector-protocol/page/deny-X-FrameOption.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/InlineStyleSheetOwner.cpp (modified) (1 diff)
• Source/WebCore/dom/ScriptElement.cpp (modified) (1 diff)
• Source/WebCore/dom/ScriptableDocumentParser.h (modified) (1 diff)
• Source/WebCore/dom/StyledElement.cpp (modified) (1 diff)
• Source/WebCore/html/parser/HTMLDocumentParser.cpp (modified) (5 diffs)
• Source/WebCore/html/parser/HTMLDocumentParser.h (modified) (1 diff)
• Source/WebCore/inspector/InspectorResourceAgent.cpp (modified) (1 diff)
• Source/WebCore/page/Console.cpp (modified) (1 diff)
• Source/WebCore/page/PageConsole.cpp (modified) (3 diffs)
• Source/WebCore/page/PageConsole.h (modified) (1 diff)
• Source/WebCore/xml/parser/XMLDocumentParser.h (modified) (1 diff)
• Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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.
+
 2013-12-10  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2013-12-10  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp

@@ -39 +39 @@
 {
     if (createdByParser && document.scriptableDocumentParser() && !document.isInDocumentWrite())
-        m_startLineNumber = document.scriptableDocumentParser()->lineNumber();
+        m_startLineNumber = document.scriptableDocumentParser()->textPosition().m_line;
 }
 

trunk/Source/WebCore/dom/ScriptElement.cpp

@@ -76 +76 @@
     ASSERT(m_element);
     if (parserInserted && m_element->document().scriptableDocumentParser() && !m_element->document().isInDocumentWrite())
-        m_startLineNumber = m_element->document().scriptableDocumentParser()->lineNumber();
+        m_startLineNumber = m_element->document().scriptableDocumentParser()->textPosition().m_line;
 }
 

trunk/Source/WebCore/dom/ScriptableDocumentParser.h

@@ -45 +45 @@
     virtual bool isWaitingForScripts() const = 0;
 
-    // These are used to expose the current line/column to the scripting system.
-    virtual OrdinalNumber lineNumber() const = 0;
     virtual TextPosition textPosition() const = 0;
 

trunk/Source/WebCore/dom/StyledElement.cpp

@@ -196 +196 @@
     WTF::OrdinalNumber startLineNumber = WTF::OrdinalNumber::beforeFirst();
     if (document().scriptableDocumentParser() && !document().isInDocumentWrite())
-        startLineNumber = document().scriptableDocumentParser()->lineNumber();
+        startLineNumber = document().scriptableDocumentParser()->textPosition().m_line;
 
     if (newStyleString.isNull()) {

trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp

@@ -315 +315 @@
     Ref<HTMLDocumentParser> protect(*this);
 
-    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willWriteHTML(document(), lineNumber().zeroBasedInt());
+    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willWriteHTML(document(), textPosition().m_line.zeroBasedInt());
 
     ASSERT(m_speculations.isEmpty());
@@ -321 +321 @@
     processParsedChunkFromBackgroundParser(chunk);
 
-    InspectorInstrumentation::didWriteHTML(cookie, lineNumber().zeroBasedInt());
+    InspectorInstrumentation::didWriteHTML(cookie, textPosition().m_line.zeroBasedInt());
 }
 
@@ -459 +459 @@
 
     // FIXME: Pass in current input length.
-    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willWriteHTML(document(), lineNumber().zeroBasedInt());
+    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willWriteHTML(document(), textPosition().m_line.zeroBasedInt());
 
     double startTime = monotonicallyIncreasingTime();
@@ -475 +475 @@
     }
 
-    InspectorInstrumentation::didWriteHTML(cookie, lineNumber().zeroBasedInt());
+    InspectorInstrumentation::didWriteHTML(cookie, textPosition().m_line.zeroBasedInt());
 }
 
@@ -829 +829 @@
 }
 
-OrdinalNumber HTMLDocumentParser::lineNumber() const
-{
-#if ENABLE(THREADED_HTML_PARSER)
-    if (m_haveBackgroundParser)
-        return m_textPosition.m_line;
-#endif
-
-    return m_input.current().currentLine();
-}
-
 TextPosition HTMLDocumentParser::textPosition() const
 {

trunk/Source/WebCore/html/parser/HTMLDocumentParser.h

@@ -81 +81 @@
 
     virtual TextPosition textPosition() const;
-    virtual OrdinalNumber lineNumber() const;
 
     virtual void suspendScheduledTasks();

trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

@@ -455 +455 @@
             .setType(TypeBuilder::Network::Initiator::Type::Parser);
         initiatorObject->setUrl(document->url().string());
-        initiatorObject->setLineNumber(document->scriptableDocumentParser()->lineNumber().oneBasedInt());
+        initiatorObject->setLineNumber(document->scriptableDocumentParser()->textPosition().m_line.oneBasedInt());
         return initiatorObject;
     }

trunk/Source/WebCore/page/Console.cpp

@@ -93 +93 @@
         return;
 
-    PageConsole::printSourceURLAndLine(lastCaller.sourceURL(), lastCaller.lineNumber());
+    PageConsole::printSourceURLAndPosition(lastCaller.sourceURL(), lastCaller.lineNumber());
     PageConsole::printMessageSourceAndLevelPrefix(ConsoleAPIMessageSource, level);
 

trunk/Source/WebCore/page/PageConsole.cpp

@@ -65 +65 @@
 }
 
-void PageConsole::printSourceURLAndLine(const String& sourceURL, unsigned lineNumber)
+void PageConsole::printSourceURLAndPosition(const String& sourceURL, unsigned lineNumber, unsigned columnNumber)
 {
     if (!sourceURL.isEmpty()) {
-        if (lineNumber > 0)
-            printf("%s:%d: ", sourceURL.utf8().data(), lineNumber);
+        if (lineNumber > 0 && columnNumber > 0)
+            printf("%s:%u:%u: ", sourceURL.utf8().data(), lineNumber, columnNumber);
         else
             printf("%s: ", sourceURL.utf8().data());
@@ -143 +143 @@
     if (document)
         url = document->url().string();
-    // FIXME: <http://webkit.org/b/114319> PageConsole::addMessage should automatically determine column number alongside line number.
     // 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.
     // 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.
     // Also, we should determine line numbers for script generated messages (e.g. calling getImageData on a canvas).
     // We probably need to split this function into multiple ones, as appropriate for different call sites. Or maybe decide based on MessageSource.
+    // https://bugs.webkit.org/show_bug.cgi?id=125340
     unsigned line = 0;
+    unsigned column = 0;
     if (document && document->parsing() && !document->isInDocumentWrite() && document->scriptableDocumentParser()) {
         ScriptableDocumentParser* parser = document->scriptableDocumentParser();
-        if (!parser->isWaitingForScripts() && !JSMainThreadExecState::currentState())
-            line = parser->lineNumber().oneBasedInt();
-    }
-    addMessage(source, level, message, url, line, 0, 0, 0, requestIdentifier);
+        if (!parser->isWaitingForScripts() && !JSMainThreadExecState::currentState()) {
+            TextPosition position = parser->textPosition();
+            line = position.m_line.oneBasedInt();
+            column = position.m_column.oneBasedInt();
+        }
+    }
+    addMessage(source, level, message, url, line, column, 0, 0, requestIdentifier);
 }
 
@@ -183 +187 @@
         return;
 
-    printSourceURLAndLine(url, lineNumber);
+    printSourceURLAndPosition(url, lineNumber, columnNumber);
     printMessageSourceAndLevelPrefix(source, level);
 

trunk/Source/WebCore/page/PageConsole.h

@@ -49 +49 @@
     ~PageConsole();
 
-    static void printSourceURLAndLine(const String& sourceURL, unsigned lineNumber);
+    static void printSourceURLAndPosition(const String& sourceURL, unsigned lineNumber, unsigned columnNumber = 0);
     static void printMessageSourceAndLevelPrefix(MessageSource, MessageLevel);
 

trunk/Source/WebCore/xml/parser/XMLDocumentParser.h

@@ -106 +106 @@
         virtual void stopParsing();
         virtual void detach();
-        virtual OrdinalNumber lineNumber() const;
-        OrdinalNumber columnNumber() const;
 
         // from CachedResourceClient

trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp

@@ -973 +973 @@
 #endif
 
+    TextPosition position = textPosition();
     if (m_parserPaused)
-        m_pendingCallbacks->appendErrorCallback(type, reinterpret_cast<const xmlChar*>(m), lineNumber(), columnNumber());
+        m_pendingCallbacks->appendErrorCallback(type, reinterpret_cast<const xmlChar*>(m), position.m_line, position.m_column);
     else
         handleError(type, m, textPosition());
@@ -1427 +1428 @@
 #endif
 
-OrdinalNumber XMLDocumentParser::lineNumber() const
-{
-    return OrdinalNumber::fromOneBasedInt(context() ? context()->input->line : 1);
-}
-
-OrdinalNumber XMLDocumentParser::columnNumber() const
-{
-    return OrdinalNumber::fromOneBasedInt(context() ? context()->input->col : 1);
-}
-
 TextPosition XMLDocumentParser::textPosition() const
 {