Changeset 73975 in webkit

Timestamp:

Dec 13, 2010 3:20:55 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-13 Joone Hur <​joone@kldp.org>

Reviewed by Eric Seidel.

WebKit fails to compile when building with WML support enabled
​https://bugs.webkit.org/show_bug.cgi?id=42943

Use TextPosition instead of lineNumber() and columNumber().

No new tests are added, because this is just a build fix.

• dom/XMLDocumentParser.h: Make lineNumber() private.
• wml/WMLErrorHandling.cpp: (WebCore::reportWMLError): Use TextPosition instead of lineNumber() and columnNumber().

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/XMLDocumentParser.h (modified) (3 diffs)
• wml/WMLErrorHandling.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-13  Joone Hur  <joone@kldp.org>
+
+        Reviewed by Eric Seidel.
+
+        WebKit fails to compile when building with WML support enabled
+        https://bugs.webkit.org/show_bug.cgi?id=42943
+
+        Use TextPosition instead of lineNumber() and columNumber().
+
+        No new tests are added, because this is just a build fix.
+
+        * dom/XMLDocumentParser.h: Make lineNumber() private.
+        * wml/WMLErrorHandling.cpp:
+        (WebCore::reportWMLError): Use TextPosition instead of lineNumber() and columnNumber().
+
 2010-12-13  Chris Fleizach  <cfleizach@apple.com>
 

trunk/WebCore/dom/XMLDocumentParser.h

@@ -102 +102 @@
         // WMLErrorHandling uses these functions.
         virtual bool wellFormed() const { return !m_sawError; }
-        virtual int lineNumber() const;
         TextPosition0 textPosition() const;
 
@@ -119 +118 @@
         virtual void stopParsing();
         virtual void detach();
+        virtual int lineNumber() const;
+        int columnNumber() const;
 
         // from CachedResourceClient
@@ -130 +131 @@
         bool appendFragmentSource(const String&);
 
-        int columnNumber() const;
 
         // This method is introduced to temporary legalize existing line/column

trunk/WebCore/wml/WMLErrorHandling.cpp

@@ -49 +49 @@
             return;
 
-        parser->handleError(XMLDocumentParser::fatal, errorMessage.latin1().data(), parser->lineNumber(), parser->columnNumber());
+        parser->handleError(XMLDocumentParser::fatal, errorMessage.latin1().data(), parser->textPosition().m_line.zeroBasedInt(), parser->textPosition().m_column.zeroBasedInt());
     } else {
         Frame* frame = doc->frame();