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

Side by Side Diff: webkit/gpu/webgraphicscontext3d_in_process_impl.h

Issue 7021014: GLContext no longer holds a pointer to a GLSurface. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_ 5 #ifndef WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_
6 #define WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_ 6 #define WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <set> 9 #include <set>
10 10
11 #include "base/hash_tables.h" 11 #include "base/hash_tables.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "third_party/angle/include/GLSLANG/ShaderLang.h" 13 #include "third_party/angle/include/GLSLANG/ShaderLang.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGraphicsContext3D. h" 14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGraphicsContext3D. h"
15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
16 16
17 #if !defined(OS_MACOSX) 17 #if !defined(OS_MACOSX)
18 #define FLIP_FRAMEBUFFER_VERTICALLY 18 #define FLIP_FRAMEBUFFER_VERTICALLY
19 #endif 19 #endif
20 namespace gfx { 20 namespace gfx {
21 class GLContext; 21 class GLContext;
22 class GLSurface;
22 } 23 }
23 24
24 using WebKit::WGC3Dchar; 25 using WebKit::WGC3Dchar;
25 using WebKit::WGC3Denum; 26 using WebKit::WGC3Denum;
26 using WebKit::WGC3Dboolean; 27 using WebKit::WGC3Dboolean;
27 using WebKit::WGC3Dbitfield; 28 using WebKit::WGC3Dbitfield;
28 using WebKit::WGC3Dint; 29 using WebKit::WGC3Dint;
29 using WebKit::WGC3Dsizei; 30 using WebKit::WGC3Dsizei;
30 using WebKit::WGC3Duint; 31 using WebKit::WGC3Duint;
31 using WebKit::WGC3Dfloat; 32 using WebKit::WGC3Dfloat;
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 462
462 #ifdef FLIP_FRAMEBUFFER_VERTICALLY 463 #ifdef FLIP_FRAMEBUFFER_VERTICALLY
463 unsigned char* scanline_; 464 unsigned char* scanline_;
464 #endif 465 #endif
465 466
466 // Errors raised by synthesizeGLError(). 467 // Errors raised by synthesizeGLError().
467 std::list<WGC3Denum> synthetic_errors_list_; 468 std::list<WGC3Denum> synthetic_errors_list_;
468 std::set<WGC3Denum> synthetic_errors_set_; 469 std::set<WGC3Denum> synthetic_errors_set_;
469 470
470 scoped_ptr<gfx::GLContext> gl_context_; 471 scoped_ptr<gfx::GLContext> gl_context_;
472 scoped_ptr<gfx::GLSurface> gl_surface_;
471 473
472 ShaderSourceMap shader_source_map_; 474 ShaderSourceMap shader_source_map_;
473 475
474 ShHandle fragment_compiler_; 476 ShHandle fragment_compiler_;
475 ShHandle vertex_compiler_; 477 ShHandle vertex_compiler_;
476 }; 478 };
477 479
478 } // namespace gpu 480 } // namespace gpu
479 } // namespace webkit 481 } // namespace webkit
480 482
481 #endif // WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_ 483 #endif // WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698