diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-30 15:42:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-07 10:59:29 +0100 |
| commit | bec39347bb3bb5bf1187ccaf471d26247f28b585 (patch) | |
| tree | 56bdc4c2978fbfd3d79d0d36d5d6c640ecc09cc8 /WebCore/wml | |
| parent | 90b7966e7815b262cd19ac25f03aaad9b21fdc06 (diff) | |
| download | external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.zip external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.gz external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.bz2 | |
Merge WebKit at r68651 : Initial merge by git.
Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
Diffstat (limited to 'WebCore/wml')
| -rw-r--r-- | WebCore/wml/WMLElement.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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())))); } |