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

Side by Side Diff: ui/ozone/demo/gl_renderer.cc

Issue 1920163005: Split //ui/gl into //ui/gl + //ui/gi/init. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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
« no previous file with comments | « ui/ozone/demo/BUILD.gn ('k') | ui/ozone/demo/ozone_demo.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ui/ozone/demo/gl_renderer.h" 5 #include "ui/ozone/demo/gl_renderer.h"
6 6
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/threading/thread_task_runner_handle.h" 8 #include "base/threading/thread_task_runner_handle.h"
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "ui/gl/gl_bindings.h" 10 #include "ui/gl/gl_bindings.h"
11 #include "ui/gl/gl_context.h" 11 #include "ui/gl/gl_context.h"
12 #include "ui/gl/gl_surface.h" 12 #include "ui/gl/gl_surface.h"
13 #include "ui/gl/init/gl_factory.h"
13 14
14 namespace ui { 15 namespace ui {
15 16
16 GlRenderer::GlRenderer(gfx::AcceleratedWidget widget, 17 GlRenderer::GlRenderer(gfx::AcceleratedWidget widget,
17 const scoped_refptr<gfx::GLSurface>& surface, 18 const scoped_refptr<gfx::GLSurface>& surface,
18 const gfx::Size& size) 19 const gfx::Size& size)
19 : RendererBase(widget, size), surface_(surface), weak_ptr_factory_(this) {} 20 : RendererBase(widget, size), surface_(surface), weak_ptr_factory_(this) {}
20 21
21 GlRenderer::~GlRenderer() { 22 GlRenderer::~GlRenderer() {
22 } 23 }
23 24
24 bool GlRenderer::Initialize() { 25 bool GlRenderer::Initialize() {
25 context_ = gfx::GLContext::CreateGLContext(NULL, surface_.get(), 26 context_ = gl::init::CreateGLContext(nullptr, surface_.get(),
26 gfx::PreferIntegratedGpu); 27 gfx::PreferIntegratedGpu);
27 if (!context_.get()) { 28 if (!context_.get()) {
28 LOG(ERROR) << "Failed to create GL context"; 29 LOG(ERROR) << "Failed to create GL context";
29 return false; 30 return false;
30 } 31 }
31 32
32 surface_->Resize(size_, 1.f, true); 33 surface_->Resize(size_, 1.f, true);
33 34
34 if (!context_->MakeCurrent(surface_.get())) { 35 if (!context_->MakeCurrent(surface_.get())) {
35 LOG(ERROR) << "Failed to make GL context current"; 36 LOG(ERROR) << "Failed to make GL context current";
36 return false; 37 return false;
(...skipping 18 matching lines...) Expand all
55 weak_ptr_factory_.GetWeakPtr())); 56 weak_ptr_factory_.GetWeakPtr()));
56 } 57 }
57 58
58 void GlRenderer::PostRenderFrameTask(gfx::SwapResult result) { 59 void GlRenderer::PostRenderFrameTask(gfx::SwapResult result) {
59 base::ThreadTaskRunnerHandle::Get()->PostTask( 60 base::ThreadTaskRunnerHandle::Get()->PostTask(
60 FROM_HERE, 61 FROM_HERE,
61 base::Bind(&GlRenderer::RenderFrame, weak_ptr_factory_.GetWeakPtr())); 62 base::Bind(&GlRenderer::RenderFrame, weak_ptr_factory_.GetWeakPtr()));
62 } 63 }
63 64
64 } // namespace ui 65 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/demo/BUILD.gn ('k') | ui/ozone/demo/ozone_demo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698