| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Fri, 03 Mar 2017 01:11:03 -0800 | |
| branch | s11u3-sru |
| changeset 7732 | 6d9c5ca1de6b |
| parent 7035 | 4c2f26e9d5ab |
| permissions | -rw-r--r-- |
|
7035
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
S11.3 FCS only workaround for |
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
|
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
19337921 - C99 math needs to be in namespace std for C++11 and later |
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
|
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
which is available in Oracle Solaris 11.3.3.6.0 (or greater). |
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
|
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
--- firefox-45.1.1esr/dom/canvas/CanvasRenderingContext2D.cpp |
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
+++ firefox-45.1.1esr/dom/canvas/CanvasRenderingContext2D.cpp |
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
@@ -2495,8 +2495,8 @@ |
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
// The values of canvas API input are in double precision, but Moz2D APIs are |
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
// using float precision. Bypass canvas API calls when the input is out of |
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
// float precision to avoid precision problem |
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
- if (!std::isfinite((float)aX) | !std::isfinite((float)aY) | |
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
- !std::isfinite((float)aWidth) | !std::isfinite((float)aHeight)) {
|
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
+ if (!isfinite((float)aX) | !isfinite((float)aY) | |
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
+ !isfinite((float)aWidth) | !isfinite((float)aHeight)) {
|
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
return false; |
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
} |
|
4c2f26e9d5ab
24361911 Upgrade Firefox to version 45.4.0 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
|
|
7732
6d9c5ca1de6b
25651093 Upgrade Firefox to version 45.8 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7035
diff
changeset
|
20 |
--- firefox-45.8.0esr/gfx/2d/FilterNodeSoftware.cpp |
|
6d9c5ca1de6b
25651093 Upgrade Firefox to version 45.8 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7035
diff
changeset
|
21 |
+++ firefox-45.8.0esr/gfx/2d/FilterNodeSoftware.cpp |
|
6d9c5ca1de6b
25651093 Upgrade Firefox to version 45.8 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7035
diff
changeset
|
22 |
@@ -3305,7 +3305,7 @@ |
|
6d9c5ca1de6b
25651093 Upgrade Firefox to version 45.8 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7035
diff
changeset
|
23 |
} |
|
6d9c5ca1de6b
25651093 Upgrade Firefox to version 45.8 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7035
diff
changeset
|
24 |
switch (aIndex) {
|
|
6d9c5ca1de6b
25651093 Upgrade Firefox to version 45.8 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7035
diff
changeset
|
25 |
case ATT_LIGHTING_SURFACE_SCALE: |
|
6d9c5ca1de6b
25651093 Upgrade Firefox to version 45.8 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7035
diff
changeset
|
26 |
- mSurfaceScale = std::fpclassify(aValue) == FP_SUBNORMAL ? 0.0 : aValue; |
|
6d9c5ca1de6b
25651093 Upgrade Firefox to version 45.8 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7035
diff
changeset
|
27 |
+ mSurfaceScale = fpclassify(aValue) == FP_SUBNORMAL ? 0.0 : aValue; |
|
6d9c5ca1de6b
25651093 Upgrade Firefox to version 45.8 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7035
diff
changeset
|
28 |
break; |
|
6d9c5ca1de6b
25651093 Upgrade Firefox to version 45.8 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7035
diff
changeset
|
29 |
default: |
|
6d9c5ca1de6b
25651093 Upgrade Firefox to version 45.8 ESR
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7035
diff
changeset
|
30 |
MOZ_CRASH("GFX: FilterNodeLightingSoftware::SetAttribute float");
|