← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/disable-sse2

  • 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/disable-sse2
4
4
 
5
5
--- a/build/common.gypi
6
6
+++ b/build/common.gypi
7
 
@@ -3771,8 +3771,6 @@
 
7
@@ -3757,8 +3757,6 @@
8
8
                 # http://crbug.com/313032 for an example where this has "bit"
9
9
                 # us in the past.
10
10
                 'cflags': [
24
24
 #include <xmmintrin.h>
25
25
 #define CONVOLVE_FUNC Convolve_SSE
26
26
 #elif defined(ARCH_CPU_ARM_FAMILY) && defined(USE_NEON)
27
 
@@ -334,7 +334,7 @@ float SincResampler::Convolve_C(const fl
 
27
@@ -342,7 +342,7 @@ float SincResampler::Convolve_C(const fl
28
28
       kernel_interpolation_factor * sum2);
29
29
 }
30
30
 
35
35
                                   double kernel_interpolation_factor) {
36
36
--- a/media/base/sinc_resampler.h
37
37
+++ b/media/base/sinc_resampler.h
38
 
@@ -89,7 +89,7 @@ class MEDIA_EXPORT SincResampler {
 
38
@@ -94,7 +94,7 @@ class MEDIA_EXPORT SincResampler {
39
39
   // ARM, NEON support is chosen at compile time based on compilation flags.
40
40
   static float Convolve_C(const float* input_ptr, const float* k1,
41
41
                           const float* k2, double kernel_interpolation_factor);
57
57
 #define CONVOLVE_FUNC Convolve_NEON
58
58
--- a/media/base/sinc_resampler_unittest.cc
59
59
+++ b/media/base/sinc_resampler_unittest.cc
60
 
@@ -151,7 +151,7 @@ TEST(SincResamplerTest, DISABLED_SetRati
 
60
@@ -150,7 +150,7 @@ TEST(SincResamplerTest, DISABLED_SetRati
61
61
 
62
62
 
63
63
 // Define platform independent function name for Convolve* tests.
139
139
       const std::pair<float, float>& result = vector_math::EWMAAndMaxPower_SSE(
140
140
--- a/media/base/yuv_convert.cc
141
141
+++ b/media/base/yuv_convert.cc
142
 
@@ -27,7 +27,7 @@
 
142
@@ -29,7 +29,7 @@
 
143
 #include "media/base/simd/convert_yuv_to_rgb.h"
143
144
 #include "media/base/simd/filter_yuv.h"
144
 
 #include "media/base/simd/yuv_to_rgb_table.h"
145
145
 
146
146
-#if defined(ARCH_CPU_X86_FAMILY)
147
147
+#if defined(__x86_64__)
150
150
 #else
151
151
--- a/media/base/yuv_convert.h
152
152
+++ b/media/base/yuv_convert.h
153
 
@@ -15,7 +15,7 @@
 
153
@@ -14,7 +14,7 @@
154
154
 // hide the versions implemented with heavy use of MMX intrinsics.
155
155
 // TODO(wolenetz): Use MMX intrinsics when compiling win64 with Visual
156
156
 // Studio 2012? http://crbug.com/173450
161
161
 #endif
162
162
--- a/media/base/yuv_convert_unittest.cc
163
163
+++ b/media/base/yuv_convert_unittest.cc
164
 
@@ -886,6 +886,6 @@ TEST(YUVConvertTest, LinearScaleYUVToRGB
 
164
@@ -887,6 +887,6 @@ TEST(YUVConvertTest, LinearScaleYUVToRGB
165
165
 
166
166
 #endif  // defined(ARCH_CPU_X86_64)
167
167