Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Side by Side Diff: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/gpu/webgraphicscontext3d_in_process_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" 5 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
6 6
7 #include <GLES2/gl2.h> 7 #include <GLES2/gl2.h>
8 #ifndef GL_GLEXT_PROTOTYPES 8 #ifndef GL_GLEXT_PROTOTYPES
9 #define GL_GLEXT_PROTOTYPES 1 9 #define GL_GLEXT_PROTOTYPES 1
10 #endif 10 #endif
11 #include <GLES2/gl2ext.h> 11 #include <GLES2/gl2ext.h>
12 12
13 #include <algorithm> 13 #include <algorithm>
14 #include <set> 14 #include <set>
15 15
16 #include "base/bind.h" 16 #include "base/bind.h"
17 #include "base/bind_helpers.h" 17 #include "base/bind_helpers.h"
18 #include "base/callback.h" 18 #include "base/callback.h"
19 #include "base/command_line.h" 19 #include "base/command_line.h"
20 #include "base/lazy_instance.h" 20 #include "base/lazy_instance.h"
21 #include "base/logging.h" 21 #include "base/logging.h"
22 #include "base/memory/singleton.h" 22 #include "base/memory/singleton.h"
23 #include "base/message_loop.h" 23 #include "base/message_loop.h"
24 #include "base/metrics/histogram.h" 24 #include "base/metrics/histogram.h"
25 #include "base/string_tokenizer.h" 25 #include "base/string_tokenizer.h"
26 #include "base/synchronization/lock.h" 26 #include "base/synchronization/lock.h"
27 #include "gpu/command_buffer/client/gles2_implementation.h"
27 #include "gpu/command_buffer/client/gles2_lib.h" 28 #include "gpu/command_buffer/client/gles2_lib.h"
28 #include "gpu/command_buffer/client/gles2_implementation.h"
29 #include "gpu/command_buffer/client/transfer_buffer.h" 29 #include "gpu/command_buffer/client/transfer_buffer.h"
30 #include "gpu/command_buffer/common/constants.h" 30 #include "gpu/command_buffer/common/constants.h"
31 #include "gpu/command_buffer/service/command_buffer_service.h"
31 #include "gpu/command_buffer/service/context_group.h" 32 #include "gpu/command_buffer/service/context_group.h"
32 #include "gpu/command_buffer/service/gpu_scheduler.h" 33 #include "gpu/command_buffer/service/gpu_scheduler.h"
33 #include "gpu/command_buffer/service/command_buffer_service.h"
34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
37 #include "ui/gfx/gl/gl_context.h" 37 #include "ui/gl/gl_context.h"
38 #include "ui/gfx/gl/gl_share_group.h" 38 #include "ui/gl/gl_share_group.h"
39 #include "ui/gfx/gl/gl_surface.h" 39 #include "ui/gl/gl_surface.h"
40 #include "webkit/glue/gl_bindings_skia_cmd_buffer.h" 40 #include "webkit/glue/gl_bindings_skia_cmd_buffer.h"
41 41
42 using gpu::Buffer; 42 using gpu::Buffer;
43 using gpu::CommandBuffer; 43 using gpu::CommandBuffer;
44 using gpu::CommandBufferService; 44 using gpu::CommandBufferService;
45 using gpu::gles2::GLES2CmdHelper; 45 using gpu::gles2::GLES2CmdHelper;
46 using gpu::gles2::GLES2Implementation; 46 using gpu::gles2::GLES2Implementation;
47 using gpu::GpuScheduler; 47 using gpu::GpuScheduler;
48 using gpu::TransferBuffer; 48 using gpu::TransferBuffer;
49 49
(...skipping 1555 matching lines...) Expand 10 before | Expand all | Expand 10 after
1605 void WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost() { 1605 void WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost() {
1606 // TODO(kbr): improve the precision here. 1606 // TODO(kbr): improve the precision here.
1607 context_lost_reason_ = GL_UNKNOWN_CONTEXT_RESET_ARB; 1607 context_lost_reason_ = GL_UNKNOWN_CONTEXT_RESET_ARB;
1608 if (context_lost_callback_) { 1608 if (context_lost_callback_) {
1609 context_lost_callback_->onContextLost(); 1609 context_lost_callback_->onContextLost();
1610 } 1610 }
1611 } 1611 }
1612 1612
1613 } // namespace gpu 1613 } // namespace gpu
1614 } // namespace webkit 1614 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/gpu/webgraphicscontext3d_in_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698