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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 13:47:18 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8dcf59e69b96eaf50cc47dda1cff7bdaaf7a5090
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 27 08:06:05 2010 +0000

    2010-09-27  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Dirk Schulze.
    
            Bug 46607 -  [WML] Fix a build break when WML is enabled
    
            Fix a build break when WML is enabled.
    
            * wml/WMLElement.cpp: Include HTMLParserIdioms.h
            (WebCore::WMLElement::parseMappedAttribute): Add additional parameter to invoke parseHTMLInteger() function.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68375 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6fa29d9..2549f05 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-27  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Dirk Schulze.
+
+        Bug 46607 -  [WML] Fix a build break when WML is enabled
+
+        Fix a build break when WML is enabled.
+
+        * wml/WMLElement.cpp: Include HTMLParserIdioms.h
+        (WebCore::WMLElement::parseMappedAttribute): Add additional parameter to invoke parseHTMLInteger() function. 
+
 2010-09-26  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/wml/WMLElement.cpp b/WebCore/wml/WMLElement.cpp
index 5c8a94c..9b0be47 100644
--- a/WebCore/wml/WMLElement.cpp
+++ b/WebCore/wml/WMLElement.cpp
@@ -26,6 +26,7 @@
 #include "Attribute.h"
 #include "CSSPropertyNames.h"
 #include "HTMLNames.h"
+#include "HTMLParserIdioms.h"
 #include "RenderObject.h"
 #include "WMLErrorHandling.h"
 #include "WMLNames.h"
@@ -73,7 +74,7 @@ void WMLElement::parseMappedAttribute(Attribute* attr)
     } else if (attr->name() == HTMLNames::tabindexAttr) {
         String indexstring = attr->value();
         int tabindex = 0;
-        if (parseHTMLInteger(tabindex)) {
+        if (parseHTMLInteger(indexstring, tabindex)) {
             // Clamp tabindex to the range of 'short' to match Firefox's behavior.
             setTabIndexExplicitly(max(static_cast<int>(std::numeric_limits<short>::min()), min(tabindex, static_cast<int>(std::numeric_limits<short>::max()))));
         }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list