Changeset 16447 in webkit

Timestamp:

Sep 19, 2006 2:48:22 AM (18 years ago)

Author:

eseidel

Message:

2006-09-19 Eric Seidel <​eric@eseidel.com>

Reviewed by hyatt.

Exceptions thrown from <script> tags in XHTML/SVG docs show the wrong line numbers
​http://bugzilla.opendarwin.org/show_bug.cgi?id=10846

No automated test case possible until ​http://bugzilla.opendarwin.org/show_bug.cgi?id=10905 is resolved.

• dom/XMLTokenizer.cpp: (WebCore::XMLTokenizer::XMLTokenizer): (WebCore::XMLTokenizer::startElementNs): (WebCore::XMLTokenizer::endElementNs):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/XMLTokenizer.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-09-19  Eric Seidel  <eric@eseidel.com>
+
+        Reviewed by hyatt.
+
+        Exceptions thrown from <script> tags in XHTML/SVG docs show the wrong line numbers
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10846
+        
+        No automated test case possible until http://bugzilla.opendarwin.org/show_bug.cgi?id=10905 is resolved.
+
+        * dom/XMLTokenizer.cpp:
+        (WebCore::XMLTokenizer::XMLTokenizer):
+        (WebCore::XMLTokenizer::startElementNs):
+        (WebCore::XMLTokenizer::endElementNs):
+
 2006-09-19  Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 

trunk/WebCore/dom/XMLTokenizer.cpp

@@ -144 +144 @@
     CachedScript *m_pendingScript;
     RefPtr<Element> m_scriptElement;
+    int m_scriptStartLine;
     
     bool m_parsingFragment;
@@ -538 +539 @@
     , m_lastErrorColumn(0)
     , m_pendingScript(0)
+    , m_scriptStartLine(0)
     , m_parsingFragment(false)
     , m_pendingCallbacks(new PendingCallbacks)
@@ -560 +562 @@
     , m_lastErrorColumn(0)
     , m_pendingScript(0)
+    , m_scriptStartLine(0)
     , m_parsingFragment(true)
     , m_pendingCallbacks(new PendingCallbacks)
@@ -765 +768 @@
     if (newElement->hasTagName(scriptTag))
         static_cast<HTMLScriptElement *>(newElement.get())->setCreatedByParser(true);
-
+    
+    if (newElement->hasTagName(HTMLNames::scriptTag) || newElement->hasTagName(SVGNames::scriptTag))
+        m_scriptStartLine = lineNumber();
+    
     if (!m_currentNode->addChild(newElement.get())) {
         stopParsing();
@@ -835 +841 @@
                     scriptCode += static_cast<CharacterData*>(child)->data();
             }
-            m_view->frame()->executeScript(0, scriptCode);
+            m_view->frame()->executeScript(m_doc->URL(), m_scriptStartLine - 1, 0, scriptCode);
         }