diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
| commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
| tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/gpu/gles2_conform_support/egl/display.cc | |
| parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
| download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz | |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/gpu/gles2_conform_support/egl/display.cc')
| -rw-r--r-- | chromium/gpu/gles2_conform_support/egl/display.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/chromium/gpu/gles2_conform_support/egl/display.cc b/chromium/gpu/gles2_conform_support/egl/display.cc index 3fc17b9b29f..bd17250e16e 100644 --- a/chromium/gpu/gles2_conform_support/egl/display.cc +++ b/chromium/gpu/gles2_conform_support/egl/display.cc @@ -10,10 +10,12 @@ #include "gpu/command_buffer/client/gles2_implementation.h" #include "gpu/command_buffer/client/gles2_lib.h" #include "gpu/command_buffer/client/transfer_buffer.h" +#include "gpu/command_buffer/common/value_state.h" #include "gpu/command_buffer/service/context_group.h" #include "gpu/command_buffer/service/mailbox_manager.h" #include "gpu/command_buffer/service/memory_tracking.h" #include "gpu/command_buffer/service/transfer_buffer_manager.h" +#include "gpu/command_buffer/service/valuebuffer_manager.h" #include "gpu/gles2_conform_support/egl/config.h" #include "gpu/gles2_conform_support/egl/surface.h" @@ -114,8 +116,14 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config, if (!command_buffer->Initialize()) return NULL; - scoped_refptr<gpu::gles2::ContextGroup> group(new gpu::gles2::ContextGroup( - NULL, NULL, new gpu::gles2::ShaderTranslatorCache, NULL, true)); + scoped_refptr<gpu::gles2::ContextGroup> group( + new gpu::gles2::ContextGroup(NULL, + NULL, + new gpu::gles2::ShaderTranslatorCache, + NULL, + NULL, + NULL, + true)); decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get())); if (!decoder_.get()) @@ -327,4 +335,8 @@ uint32 Display::CreateStreamTexture(uint32 texture_id) { return 0; } +void Display::SetLock(base::Lock*) { + NOTIMPLEMENTED(); +} + } // namespace egl |