Title: [103432] branches/safari-534.54-branch

Diff

Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (103431 => 103432)


--- branches/safari-534.54-branch/LayoutTests/ChangeLog	2011-12-21 20:35:40 UTC (rev 103431)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog	2011-12-21 20:39:44 UTC (rev 103432)
@@ -1,5 +1,22 @@
 2011-12-21  Lucas Forschler  <[email protected]>
 
+    Merge 94095
+
+    2011-08-29  Oliver Hunt  <[email protected]>
+
+            TypedArrays don't ensure that denormalised values are normalised
+            https://bugs.webkit.org/show_bug.cgi?id=67178
+
+            Reviewed by Gavin Barraclough.
+
+            Add test to ensure that we create a non-signalling nan when reading
+            a singaling nan from a typed array.
+
+            * fast/canvas/webgl/webgl-array-invalid-ranges-expected.txt:
+            * fast/canvas/webgl/webgl-array-invalid-ranges.html:
+
+2011-12-21  Lucas Forschler  <[email protected]>
+
     Merge 94001
 
     2011-08-29  Abhishek Arya  <[email protected]>

Modified: branches/safari-534.54-branch/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges-expected.txt (103431 => 103432)


--- branches/safari-534.54-branch/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges-expected.txt	2011-12-21 20:35:40 UTC (rev 103431)
+++ branches/safari-534.54-branch/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges-expected.txt	2011-12-21 20:39:44 UTC (rev 103432)
@@ -77,6 +77,7 @@
 PASS Setting Float32Array from array with out-of-range offset was caught
 PASS Setting Float32Array from fake array with invalid length was caught
 PASS Setting Float32Array from Float32Array with out-of-range offset was caught
+PASS isNaN(floats[0]) is true
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: branches/safari-534.54-branch/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges.html (103431 => 103432)


--- branches/safari-534.54-branch/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges.html	2011-12-21 20:35:40 UTC (rev 103431)
+++ branches/safari-534.54-branch/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges.html	2011-12-21 20:39:44 UTC (rev 103432)
@@ -147,6 +147,14 @@
     }
 }
 
+buffer = new ArrayBuffer(40);
+ints = new Int32Array(buffer, 0, 10);
+floats = new Float32Array(buffer, 0, 10);
+// Plant a NaN into the buffer
+ints[0]=-0x7ffff;
+// Read the NaN out as a float
+shouldBeTrue("isNaN(floats[0])");
+
 successfullyParsed = true;
 
 </script>

Modified: branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog (103431 => 103432)


--- branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog	2011-12-21 20:35:40 UTC (rev 103431)
+++ branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog	2011-12-21 20:39:44 UTC (rev 103432)
@@ -1,3 +1,21 @@
+2011-12-21  Lucas Forschler  <[email protected]>
+
+    Merge 94095
+
+    2011-08-30  Oliver Hunt  <[email protected]>
+
+            TypedArrays don't ensure that denormalised values are normalised
+            https://bugs.webkit.org/show_bug.cgi?id=67178
+
+            Reviewed by Gavin Barraclough.
+
+            Add a couple of assertions to jsNumber() to ensure that
+            we block signaling NaNs
+
+            * runtime/JSValue.h:
+            (JSC::jsDoubleNumber):
+            (JSC::jsNumber):
+
 2011-12-02  Lucas Forschler  <[email protected]>
 
     Merge 93445

Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (103431 => 103432)


--- branches/safari-534.54-branch/Source/WebCore/ChangeLog	2011-12-21 20:35:40 UTC (rev 103431)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog	2011-12-21 20:39:44 UTC (rev 103432)
@@ -1,5 +1,22 @@
 2011-12-21  Lucas Forschler  <[email protected]>
 
+    Merge 94095
+
+    2011-08-29  Oliver Hunt  <[email protected]>
+
+            TypedArrays don't ensure that denormalised values are normalised
+            https://bugs.webkit.org/show_bug.cgi?id=67178
+
+            Reviewed by Gavin Barraclough.
+
+            Ensure that we convert singaling nans to silent nans when loading
+            from a typed array. 
+
+            * bindings/scripts/CodeGeneratorJS.pm:
+            (GenerateImplementation):
+
+2011-12-21  Lucas Forschler  <[email protected]>
+
     Merge 94001
 
     2011-08-29  Abhishek Arya  <[email protected]>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to