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

Side by Side Diff: components/bitmap_uploader/bitmap_uploader.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 | « components/bitmap_uploader/bitmap_uploader.h ('k') | components/filesystem/file_system_app.h » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/bitmap_uploader/bitmap_uploader.h" 5 #include "components/bitmap_uploader/bitmap_uploader.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 27 matching lines...) Expand all
38 width_(0), 38 width_(0),
39 height_(0), 39 height_(0),
40 format_(BGRA), 40 format_(BGRA),
41 next_resource_id_(1u), 41 next_resource_id_(1u),
42 id_namespace_(0u) {} 42 id_namespace_(0u) {}
43 43
44 BitmapUploader::~BitmapUploader() { 44 BitmapUploader::~BitmapUploader() {
45 MojoGLES2DestroyContext(gles2_context_); 45 MojoGLES2DestroyContext(gles2_context_);
46 } 46 }
47 47
48 void BitmapUploader::Init(mojo::Connector* connector) { 48 void BitmapUploader::Init(shell::Connector* connector) {
49 surface_ = window_->RequestSurface(mus::mojom::SurfaceType::DEFAULT); 49 surface_ = window_->RequestSurface(mus::mojom::SurfaceType::DEFAULT);
50 surface_->BindToThread(); 50 surface_->BindToThread();
51 surface_->set_client(this); 51 surface_->set_client(this);
52 52
53 connector->ConnectToInterface("mojo:mus", &gpu_service_); 53 connector->ConnectToInterface("mojo:mus", &gpu_service_);
54 mus::mojom::CommandBufferPtr gles2_client; 54 mus::mojom::CommandBufferPtr gles2_client;
55 gpu_service_->CreateOffscreenGLES2Context(GetProxy(&gles2_client)); 55 gpu_service_->CreateOffscreenGLES2Context(GetProxy(&gles2_client));
56 gles2_context_ = MojoGLES2CreateContext( 56 gles2_context_ = MojoGLES2CreateContext(
57 gles2_client.PassInterface().PassHandle().release().value(), nullptr, 57 gles2_client.PassInterface().PassHandle().release().value(), nullptr,
58 &LostContext, nullptr); 58 &LostContext, nullptr);
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 glWaitSyncTokenCHROMIUM( 242 glWaitSyncTokenCHROMIUM(
243 resource->sync_token.GetConstData()); 243 resource->sync_token.GetConstData());
244 uint32_t texture_id = resource_to_texture_id_map_[resource->id]; 244 uint32_t texture_id = resource_to_texture_id_map_[resource->id];
245 DCHECK_NE(0u, texture_id); 245 DCHECK_NE(0u, texture_id);
246 resource_to_texture_id_map_.erase(resource->id); 246 resource_to_texture_id_map_.erase(resource->id);
247 glDeleteTextures(1, &texture_id); 247 glDeleteTextures(1, &texture_id);
248 } 248 }
249 } 249 }
250 250
251 } // namespace bitmap_uploader 251 } // namespace bitmap_uploader
OLDNEW
« no previous file with comments | « components/bitmap_uploader/bitmap_uploader.h ('k') | components/filesystem/file_system_app.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698