← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/arm.patch

  • Committer: Chad MILLER
  • Date: 2015-04-17 00:17:26 UTC
  • Revision ID: chad.miller@canonical.com-20150417001726-dszj422xuq86ob42
* Upstream release 42.0.2311.90:
  - CVE-2015-1235: Cross-origin-bypass in HTML parser.
  - CVE-2015-1236: Cross-origin-bypass in Blink.
  - CVE-2015-1237: Use-after-free in IPC.
  - CVE-2015-1238: Out-of-bounds write in Skia.
  - CVE-2015-1240: Out-of-bounds read in WebGL.
  - CVE-2015-1241: Tap-Jacking.
  - CVE-2015-1242: Type confusion in V8.
  - CVE-2015-1244: HSTS bypass in WebSockets.
  - CVE-2015-1245: Use-after-free in PDFium.
  - CVE-2015-1247: Scheme issues in OpenSearch.
  - CVE-2015-1248: SafeBrowsing bypass.
* Upstream release 41.0.2272.118:
  - CVE-2015-1233: A special thanks to Anonymous for a combination of V8,
    Gamepad and IPC bugs that can lead to remote code execution outside of
    the sandbox. 
  - CVE-2015-1234: Buffer overflow via race condition in GPU.
* debian/chromium-browser-etc-customizations-flash-staleness: Ask sudo users
  to update flash player.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/arm.patch
1
 
--- a/third_party/openmax_dl/dl/sp/api/omxSP.h
2
 
+++ b/third_party/openmax_dl/dl/sp/api/omxSP.h
3
 
@@ -2554,8 +2554,8 @@ extern OMXResult (*omxSP_FFTInv_CCSToR_F
4
 
 #define omxSP_FFTInv_CCSToR_F32 omxSP_FFTInv_CCSToR_F32_Sfs
5
 
 #else
6
 
 /* Build-time non-NEON selection. */
7
 
-#define omxSP_FFTFwd_RToCCS_F32 omxSP_FFTFwd_CCSToR_F32_vfp
8
 
-#define omxSP_FFTInv_CCSToR_F32 omxSP_FFTInv_CCSToR_F32_vfp
9
 
+#define omxSP_FFTFwd_RToCCS_F32 omxSP_FFTFwd_RToCCS_F32_Sfs_vfp
10
 
+#define omxSP_FFTInv_CCSToR_F32 omxSP_FFTInv_CCSToR_F32_Sfs_vfp
11
 
 #endif  /* defined(DL_ARM_NEON_OPTIONAL) */
12
 
 
13
 
 #if defined(DL_ARM_NEON_OPTIONAL) || !defined(DL_ARM_NEON)
14
 
--- a/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
15
 
+++ b/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
16
 
@@ -80,7 +80,7 @@
17
 
             'WEBRTC_LINUX',
18
 
           ],
19
 
         }],
20
 
-        ['target_arch=="arm" and arm_version>=7', {
21
 
+        ['target_arch=="arm" and arm_version>=7 and arm_neon==1', {
22
 
           'dependencies': [ 'isac_neon', ],
23
 
           'sources': [
24
 
             'lattice_armv7.S',
25
 
@@ -124,7 +124,7 @@
26
 
     },
27
 
   ],
28
 
   'conditions': [
29
 
-    ['target_arch=="arm" and arm_version>=7', {
30
 
+    ['target_arch=="arm" and arm_version>=7 and arm_neon==1', {
31
 
       'targets': [
32
 
         {
33
 
           'target_name': 'isac_neon',
34
1
--- a/ui/base/resource/data_pack.cc
35
2
+++ b/ui/base/resource/data_pack.cc
36
3
@@ -155,9 +155,11 @@ bool DataPack::LoadImpl() {