Title: [108018] trunk/Source/WebCore
Revision
108018
Author
[email protected]
Date
2012-02-16 19:46:48 -0800 (Thu, 16 Feb 2012)

Log Message

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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (108017 => 108018)


--- trunk/Source/WebCore/ChangeLog	2012-02-17 03:32:05 UTC (rev 108017)
+++ trunk/Source/WebCore/ChangeLog	2012-02-17 03:46:48 UTC (rev 108018)
@@ -1,3 +1,14 @@
+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-15  Michael Nordman  <[email protected]>
 
         [chromium] Fix bugs in the implementation of WebDatabase::closeDatabaseImmediately.

Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (108017 => 108018)


--- trunk/Source/WebCore/dom/ViewportArguments.cpp	2012-02-17 03:32:05 UTC (rev 108017)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp	2012-02-17 03:46:48 UTC (rev 108018)
@@ -219,7 +219,7 @@
         value = WTF::charactersToFloatIgnoringJunk(valueString.characters16(), valueString.length(), ok, &didReadNumber);
     if (!*ok) {
         if (!didReadNumber) {
-            ASSERT(!value);
+            ASSERT(isnan(value));
             reportViewportWarning(document, UnrecognizedViewportArgumentValueError, valueString, keyString);
             return value;
         }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to