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

Side by Side Diff: webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h

Issue 25455002: Remove WGC3D::width(), height(), reshape() implementations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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 WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ 5 #ifndef WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_
6 #define WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ 6 #define WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_
7 7
8 #if defined(ENABLE_GPU) 8 #if defined(ENABLE_GPU)
9 9
10 #include <vector> 10 #include <vector>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 static void ConvertAttributes( 69 static void ConvertAttributes(
70 const WebKit::WebGraphicsContext3D::Attributes& attributes, 70 const WebKit::WebGraphicsContext3D::Attributes& attributes,
71 ::gpu::GLInProcessContextAttribs* output_attribs); 71 ::gpu::GLInProcessContextAttribs* output_attribs);
72 72
73 //---------------------------------------------------------------------- 73 //----------------------------------------------------------------------
74 // WebGraphicsContext3D methods 74 // WebGraphicsContext3D methods
75 virtual bool makeContextCurrent(); 75 virtual bool makeContextCurrent();
76 76
77 virtual uint32_t lastFlushID(); 77 virtual uint32_t lastFlushID();
78 78
79 virtual int width();
80 virtual int height();
81
82 virtual void reshape(int width, int height);
83 virtual void reshapeWithScaleFactor(int width, int height, float scaleFactor); 79 virtual void reshapeWithScaleFactor(int width, int height, float scaleFactor);
84 80
85 virtual void prepareTexture(); 81 virtual void prepareTexture();
86 virtual void postSubBufferCHROMIUM(int x, int y, int width, int height); 82 virtual void postSubBufferCHROMIUM(int x, int y, int width, int height);
87 83
88 virtual void activeTexture(WGC3Denum texture); 84 virtual void activeTexture(WGC3Denum texture);
89 virtual void attachShader(WebGLId program, WebGLId shader); 85 virtual void attachShader(WebGLId program, WebGLId shader);
90 virtual void bindAttribLocation(WebGLId program, WGC3Duint index, 86 virtual void bindAttribLocation(WebGLId program, WGC3Duint index,
91 const WGC3Dchar* name); 87 const WGC3Dchar* name);
92 virtual void bindBuffer(WGC3Denum target, WebGLId buffer); 88 virtual void bindBuffer(WGC3Denum target, WebGLId buffer);
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 574
579 // The context we use for OpenGL rendering. 575 // The context we use for OpenGL rendering.
580 scoped_ptr< ::gpu::GLInProcessContext> context_; 576 scoped_ptr< ::gpu::GLInProcessContext> context_;
581 // The GLES2Implementation we use for OpenGL rendering. 577 // The GLES2Implementation we use for OpenGL rendering.
582 ::gpu::gles2::GLES2Implementation* gl_; 578 ::gpu::gles2::GLES2Implementation* gl_;
583 579
584 WebGraphicsContext3D::WebGraphicsContextLostCallback* context_lost_callback_; 580 WebGraphicsContext3D::WebGraphicsContextLostCallback* context_lost_callback_;
585 WGC3Denum context_lost_reason_; 581 WGC3Denum context_lost_reason_;
586 582
587 WebKit::WebGraphicsContext3D::Attributes attributes_; 583 WebKit::WebGraphicsContext3D::Attributes attributes_;
588 int cached_width_, cached_height_;
589 584
590 // Errors raised by synthesizeGLError(). 585 // Errors raised by synthesizeGLError().
591 std::vector<WGC3Denum> synthetic_errors_; 586 std::vector<WGC3Denum> synthetic_errors_;
592 587
593 uint32_t flush_id_; 588 uint32_t flush_id_;
594 }; 589 };
595 590
596 } // namespace gpu 591 } // namespace gpu
597 } // namespace webkit 592 } // namespace webkit
598 593
599 #endif // defined(ENABLE_GPU) 594 #endif // defined(ENABLE_GPU)
600 #endif // WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL _H_ 595 #endif // WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL _H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698