Title: [108032] trunk/Source/WebCore
- Revision
- 108032
- Author
- [email protected]
- Date
- 2012-02-16 22:20:38 -0800 (Thu, 16 Feb 2012)
Log Message
Another fix for viewport tests
No new tests.
* dom/ViewportArguments.cpp:
(WebCore::numericPrefix): When we don't parse a number, we could either be
trying to parse junk, which returns NaN, or we could get an empty string,
which returns 0, so we need to account for that in the assert.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108031 => 108032)
--- trunk/Source/WebCore/ChangeLog 2012-02-17 05:58:38 UTC (rev 108031)
+++ trunk/Source/WebCore/ChangeLog 2012-02-17 06:20:38 UTC (rev 108032)
@@ -1,3 +1,25 @@
+2012-02-16 Mark Hahnenberg <[email protected]>
+
+ Another fix for viewport tests
+
+ No new tests.
+
+ * dom/ViewportArguments.cpp:
+ (WebCore::numericPrefix): When we don't parse a number, we could either be
+ trying to parse junk, which returns NaN, or we could get an empty string,
+ which returns 0, so we need to account for that in the assert.
+
+2012-02-16 Mark Hahnenberg <[email protected]>
+
+ Another build fix for viewport tests
+
+ No new tests.
+
+ * dom/ViewportArguments.cpp:
+ (WebCore::numericPrefix): We now return NaN instead of 0 when we fail to
+ parse a number using charactersToFloatIgnoringJunk, so we need to assert that
+ we have NaN rather than 0.
+
2012-02-16 Alexandre Elias <[email protected]>
[chromium] Bundle page scale factor and limits in CCLayerTreeHost
Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (108031 => 108032)
--- trunk/Source/WebCore/dom/ViewportArguments.cpp 2012-02-17 05:58:38 UTC (rev 108031)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp 2012-02-17 06:20:38 UTC (rev 108032)
@@ -219,7 +219,7 @@
value = WTF::charactersToFloatIgnoringJunk(valueString.characters16(), valueString.length(), ok, &didReadNumber);
if (!*ok) {
if (!didReadNumber) {
- ASSERT(isnan(value));
+ ASSERT(isnan(value) || !value);
reportViewportWarning(document, UnrecognizedViewportArgumentValueError, valueString, keyString);
return value;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
