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

Side by Side Diff: content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h

Issue 12896006: mac: Clean up a few more uses of USE_SKIA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac Created 7 years, 8 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
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 #ifndef CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_ 5 #ifndef CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
6 #define CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_ 6 #define CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "content/common/gpu/client/command_buffer_proxy_impl.h" 14 #include "content/common/gpu/client/command_buffer_proxy_impl.h"
15 #include "content/common/gpu/gpu_process_launch_causes.h" 15 #include "content/common/gpu/gpu_process_launch_causes.h"
16 #include "googleurl/src/gurl.h" 16 #include "googleurl/src/gurl.h"
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h" 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h"
18 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" 18 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
20 #include "ui/gl/gpu_preference.h" 20 #include "ui/gl/gpu_preference.h"
21 #include "ui/gfx/native_widget_types.h" 21 #include "ui/gfx/native_widget_types.h"
22 22
23 #if defined(USE_SKIA)
24 #define FLIP_FRAMEBUFFER_VERTICALLY
25 #endif
26
27 namespace gpu { 23 namespace gpu {
28 24
29 class TransferBuffer; 25 class TransferBuffer;
30 26
31 namespace gles2 { 27 namespace gles2 {
32 class GLES2CmdHelper; 28 class GLES2CmdHelper;
33 class GLES2Implementation; 29 class GLES2Implementation;
34 class GLES2Interface; 30 class GLES2Interface;
35 } 31 }
36 } 32 }
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 int cached_width_, cached_height_; 741 int cached_width_, cached_height_;
746 742
747 // For tracking which FBO is bound. 743 // For tracking which FBO is bound.
748 WebGLId bound_fbo_; 744 WebGLId bound_fbo_;
749 745
750 // Errors raised by synthesizeGLError(). 746 // Errors raised by synthesizeGLError().
751 std::vector<WGC3Denum> synthetic_errors_; 747 std::vector<WGC3Denum> synthetic_errors_;
752 748
753 base::WeakPtrFactory<WebGraphicsContext3DCommandBufferImpl> weak_ptr_factory_; 749 base::WeakPtrFactory<WebGraphicsContext3DCommandBufferImpl> weak_ptr_factory_;
754 750
755 #ifdef FLIP_FRAMEBUFFER_VERTICALLY
756 std::vector<uint8> scanline_; 751 std::vector<uint8> scanline_;
757 void FlipVertically(uint8* framebuffer, 752 void FlipVertically(uint8* framebuffer,
758 unsigned int width, 753 unsigned int width,
759 unsigned int height); 754 unsigned int height);
760 #endif
761 755
762 bool initialized_; 756 bool initialized_;
763 WebGraphicsContext3DCommandBufferImpl* parent_; 757 WebGraphicsContext3DCommandBufferImpl* parent_;
764 uint32 parent_texture_id_; 758 uint32 parent_texture_id_;
765 CommandBufferProxyImpl* command_buffer_; 759 CommandBufferProxyImpl* command_buffer_;
766 gpu::gles2::GLES2CmdHelper* gles2_helper_; 760 gpu::gles2::GLES2CmdHelper* gles2_helper_;
767 gpu::TransferBuffer* transfer_buffer_; 761 gpu::TransferBuffer* transfer_buffer_;
768 gpu::gles2::GLES2Interface* gl_; 762 gpu::gles2::GLES2Interface* gl_;
769 gpu::gles2::GLES2Implementation* real_gl_; 763 gpu::gles2::GLES2Implementation* real_gl_;
770 gpu::gles2::GLES2Interface* trace_gl_; 764 gpu::gles2::GLES2Interface* trace_gl_;
771 Error last_error_; 765 Error last_error_;
772 int frame_number_; 766 int frame_number_;
773 bool bind_generates_resources_; 767 bool bind_generates_resources_;
774 bool use_echo_for_swap_ack_; 768 bool use_echo_for_swap_ack_;
775 }; 769 };
776 770
777 } // namespace content 771 } // namespace content
778 772
779 #endif // CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_ 773 #endif // CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_internals_ui.cc ('k') | content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698