| author | Jingning Ji <jingning.ji@oracle.com> |
| Fri, 16 Sep 2016 16:06:45 -0700 | |
| changeset 6919 | 7972aae0fb03 |
| parent 5527 | 611b2d6efdfe |
| permissions | -rw-r--r-- |
|
5527
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
5255
diff
changeset
|
1 |
Returns an error if big endian. We probably don't need to worry about this |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
5255
diff
changeset
|
2 |
since we don't use Skia gpu. |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
5255
diff
changeset
|
3 |
Seems sparc specific. To be investigated. |
|
5255
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
4 |
|
|
6919
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
5527
diff
changeset
|
5 |
diff --git a/gfx/skia/skia/include/gpu/GrTypes.h b/gfx/skia/skia/include/gpu/GrTypes.h |
|
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
5527
diff
changeset
|
6 |
--- a/gfx/skia/skia/include/gpu/GrTypes.h |
|
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
5527
diff
changeset
|
7 |
+++ b/gfx/skia/skia/include/gpu/GrTypes.h |
|
5527
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
5255
diff
changeset
|
8 |
@@ -309,9 +309,9 @@ |
|
5255
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
9 |
static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1; |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
10 |
|
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
11 |
// Aliases for pixel configs that match skia's byte order. |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
12 |
-#ifndef SK_CPU_LENDIAN |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
13 |
- #error "Skia gpu currently assumes little endian" |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
14 |
-#endif |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
15 |
+// #ifndef SK_CPU_LENDIAN |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
16 |
+// #error "Skia gpu currently assumes little endian" |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
17 |
+// #endif |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
18 |
#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
19 |
static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig; |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
20 |
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) |