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

Side by Side Diff: mojo/skia/ganesh_surface.cc

Issue 891143002: Teach SkyShell how to draw with Ganesh (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: build fix Created 5 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
« no previous file with comments | « no previous file | sky/shell/BUILD.gn » ('j') | sky/shell/gpu/ganesh_context.h » ('J')
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 "mojo/skia/ganesh_surface.h" 5 #include "mojo/skia/ganesh_surface.h"
6 6
7 #include "base/logging.h"
eseidel 2015/02/01 08:31:34 ?
abarth-chromium 2015/02/01 08:34:17 Yeah, this wasn't needed. Removed in most recent
8
7 namespace mojo { 9 namespace mojo {
8 10
9 GaneshSurface::GaneshSurface(GaneshContext* context, 11 GaneshSurface::GaneshSurface(GaneshContext* context,
10 scoped_ptr<GLTexture> texture) 12 scoped_ptr<GLTexture> texture)
11 : texture_(texture.Pass()) { 13 : texture_(texture.Pass()) {
12 GrBackendTextureDesc desc; 14 GrBackendTextureDesc desc;
13 desc.fFlags = kRenderTarget_GrBackendTextureFlag; 15 desc.fFlags = kRenderTarget_GrBackendTextureFlag;
14 desc.fWidth = texture_->size().width; 16 desc.fWidth = texture_->size().width;
15 desc.fHeight = texture_->size().height; 17 desc.fHeight = texture_->size().height;
16 desc.fConfig = kSkia8888_GrPixelConfig; 18 desc.fConfig = kSkia8888_GrPixelConfig;
(...skipping 10 matching lines...) Expand all
27 29
28 GaneshSurface::~GaneshSurface() { 30 GaneshSurface::~GaneshSurface() {
29 } 31 }
30 32
31 scoped_ptr<GLTexture> GaneshSurface::TakeTexture() { 33 scoped_ptr<GLTexture> GaneshSurface::TakeTexture() {
32 surface_.clear(); 34 surface_.clear();
33 return texture_.Pass(); 35 return texture_.Pass();
34 } 36 }
35 37
36 } // namespace mojo 38 } // namespace mojo
OLDNEW
« no previous file with comments | « no previous file | sky/shell/BUILD.gn » ('j') | sky/shell/gpu/ganesh_context.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698