diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-05 21:30:46 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-05 21:30:46 +0000 |
| commit | fe390ab7e359396a0c57de2839a38d18dc9199a0 (patch) | |
| tree | 1ff34ec40cbf00e2d42d2daeda60149e18b1a6de | |
| parent | 84792f0c6378d011216b714b697394514df50392 (diff) | |
| download | chromium_src-fe390ab7e359396a0c57de2839a38d18dc9199a0.zip chromium_src-fe390ab7e359396a0c57de2839a38d18dc9199a0.tar.gz chromium_src-fe390ab7e359396a0c57de2839a38d18dc9199a0.tar.bz2 | |
Revert 145557 - Unbreak the cros ARM builds.
TBR=posciak@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10704105
TBR=fischman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10698110
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145558 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/common/gpu/media/rendering_helper_gl.cc | 9 | ||||
| -rw-r--r-- | content/common/gpu/media/video_decode_accelerator_unittest.cc | 2 | ||||
| -rw-r--r-- | content/content_tests.gypi | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/content/common/gpu/media/rendering_helper_gl.cc b/content/common/gpu/media/rendering_helper_gl.cc index c5a961a..20fd593 100644 --- a/content/common/gpu/media/rendering_helper_gl.cc +++ b/content/common/gpu/media/rendering_helper_gl.cc @@ -6,7 +6,7 @@ #include <map> -#if defined(OS_WIN) || defined(ARCH_CPU_ARMEL) +#if defined(OS_WIN) #include "third_party/angle/include/EGL/egl.h" // Must precede ui/gl headers! #endif @@ -20,6 +20,10 @@ #include "ui/gl/gl_implementation.h" #include "ui/gl/gl_surface.h" +#if defined(ARCH_CPU_ARMEL) +#include "third_party/angle/include/GLES2/gl2.h" +#endif // ARCH_CPU_ARMEL + #if !defined(OS_WIN) && defined(ARCH_CPU_X86_FAMILY) #define GL_VARIANT_GLX 1 typedef GLXWindow NativeWindowType; @@ -251,10 +255,7 @@ void RenderingHelperGL::Initialize(bool suppress_swap_to_display, windows_.push_back(window); #else int depth = DefaultDepth(x_display_, DefaultScreen(x_display_)); - -#if defined(GL_VARIANT_GLX) CHECK_EQ(depth, x_visual_->depth); -#endif XSetWindowAttributes window_attributes; window_attributes.background_pixel = diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc index 75ccb96..792782f 100644 --- a/content/common/gpu/media/video_decode_accelerator_unittest.cc +++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc @@ -301,9 +301,7 @@ GLRenderingVDAClient::~GLRenderingVDAClient() { SetState(CS_DESTROYED); } -#if !defined(OS_WIN) && !defined(OS_MACOSX) && defined(ARCH_CPU_X86_FAMILY) static bool DoNothingReturnTrue() { return true; } -#endif void GLRenderingVDAClient::CreateDecoder() { CHECK(decoder_deleted()); diff --git a/content/content_tests.gypi b/content/content_tests.gypi index eeb3805..b4cdba7 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -621,7 +621,7 @@ '../third_party/angle/src/build_angle.gyp:libGLESv2', ], }], - ['OS=="win" and win_use_allocator_shim==1', { + ['win_use_allocator_shim==1', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], |