[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9ed5052c99f2c07d46fc3009a4156c354c348977
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 23:20:55 2010 +0000

    2010-12-13  Joone Hur  <joone at 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().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73975 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d32089b..a323230 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-13  Joone Hur  <joone at 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 at apple.com>
 
         Reviewed by Beth Dakin.
diff --git a/WebCore/dom/XMLDocumentParser.h b/WebCore/dom/XMLDocumentParser.h
index e3d3cc2..11370fa 100644
--- a/WebCore/dom/XMLDocumentParser.h
+++ b/WebCore/dom/XMLDocumentParser.h
@@ -101,7 +101,6 @@ namespace WebCore {
 
         // WMLErrorHandling uses these functions.
         virtual bool wellFormed() const { return !m_sawError; }
-        virtual int lineNumber() const;
         TextPosition0 textPosition() const;
 
         static bool supportsXMLVersion(const String&);
@@ -118,6 +117,8 @@ namespace WebCore {
         virtual bool isWaitingForScripts() const;
         virtual void stopParsing();
         virtual void detach();
+        virtual int lineNumber() const;
+        int columnNumber() const;
 
         // from CachedResourceClient
         virtual void notifyFinished(CachedResource*);
@@ -129,7 +130,6 @@ namespace WebCore {
 
         bool appendFragmentSource(const String&);
 
-        int columnNumber() const;
 
         // This method is introduced to temporary legalize existing line/column
         // coordinate bug: it is believed that numbers that originally were zero-based
diff --git a/WebCore/wml/WMLErrorHandling.cpp b/WebCore/wml/WMLErrorHandling.cpp
index 8532822..dc0b8df 100644
--- a/WebCore/wml/WMLErrorHandling.cpp
+++ b/WebCore/wml/WMLErrorHandling.cpp
@@ -48,7 +48,7 @@ void reportWMLError(Document* doc, WMLErrorCode error)
         if (!parser->wellFormed())
             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();
         if (!frame)

-- 
WebKit Debian packaging