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

Side by Side Diff: gpu/demos/framework/window.h

Issue 9160012: Change PluginWindowHandle to AcceleratedWidget in ui/gfx/gl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops mac Created 8 years, 10 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 | « no previous file | gpu/demos/framework/window.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 #ifndef GPU_DEMOS_FRAMEWORK_WINDOW_H_ 5 #ifndef GPU_DEMOS_FRAMEWORK_WINDOW_H_
6 #define GPU_DEMOS_FRAMEWORK_WINDOW_H_ 6 #define GPU_DEMOS_FRAMEWORK_WINDOW_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "gpu/command_buffer/client/gles2_cmd_helper.h" 9 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
10 #include "gpu/command_buffer/service/command_buffer_service.h" 10 #include "gpu/command_buffer/service/command_buffer_service.h"
(...skipping 24 matching lines...) Expand all
35 // Enters the event processing loop. 35 // Enters the event processing loop.
36 void MainLoop(); 36 void MainLoop();
37 37
38 void OnPaint(); 38 void OnPaint();
39 39
40 private: 40 private:
41 // Creates and shows a native window with the given title and dimensions. 41 // Creates and shows a native window with the given title and dimensions.
42 gfx::NativeWindow CreateNativeWindow(const wchar_t* title, 42 gfx::NativeWindow CreateNativeWindow(const wchar_t* title,
43 int width, int height); 43 int width, int height);
44 // Converts native window handle to NPAPI plugin window handle. 44 // Converts native window handle to NPAPI plugin window handle.
45 gfx::PluginWindowHandle PluginWindow(gfx::NativeWindow hwnd); 45 gfx::AcceleratedWidget PluginWindow(gfx::NativeWindow hwnd);
46 // Creates an OpenGL ES 2.0 rendering context for the given window. 46 // Creates an OpenGL ES 2.0 rendering context for the given window.
47 bool CreateRenderContext(gfx::PluginWindowHandle hwnd); 47 bool CreateRenderContext(gfx::AcceleratedWidget hwnd);
48 48
49 gfx::NativeWindow window_handle_; 49 gfx::NativeWindow window_handle_;
50 scoped_ptr<Demo> demo_; 50 scoped_ptr<Demo> demo_;
51 51
52 scoped_ptr<gpu::CommandBufferService> command_buffer_; 52 scoped_ptr<gpu::CommandBufferService> command_buffer_;
53 scoped_ptr<gpu::GpuScheduler> gpu_scheduler_; 53 scoped_ptr<gpu::GpuScheduler> gpu_scheduler_;
54 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_; 54 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
55 scoped_refptr<gfx::GLContext> context_; 55 scoped_refptr<gfx::GLContext> context_;
56 scoped_refptr<gfx::GLSurface> surface_; 56 scoped_refptr<gfx::GLSurface> surface_;
57 scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_; 57 scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_;
58 scoped_ptr<gpu::TransferBuffer> transfer_buffer_; 58 scoped_ptr<gpu::TransferBuffer> transfer_buffer_;
59 59
60 DISALLOW_COPY_AND_ASSIGN(Window); 60 DISALLOW_COPY_AND_ASSIGN(Window);
61 }; 61 };
62 62
63 } // namespace demos 63 } // namespace demos
64 } // namespace gpu 64 } // namespace gpu
65 #endif // GPU_DEMOS_FRAMEWORK_WINDOW_H_ 65 #endif // GPU_DEMOS_FRAMEWORK_WINDOW_H_
66 66
OLDNEW
« no previous file with comments | « no previous file | gpu/demos/framework/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698