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

Unified Diff: mojo/shell/context.cc

Issue 739493002: Introduce command buffer control thread (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Route echo better Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/services/native_viewport/main.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/context.cc
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index e1c742a8b670f734c1b825429644bb97948e8eff..fab5a6a56e296b7cf360b15d60b09b8f735d99e4 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -15,7 +15,6 @@
#include "base/memory/scoped_vector.h"
#include "base/strings/string_split.h"
#include "build/build_config.h"
-#include "gpu/command_buffer/service/mailbox_manager_impl.h"
#include "mojo/application_manager/application_loader.h"
#include "mojo/application_manager/application_manager.h"
#include "mojo/application_manager/background_shell_application_loader.h"
@@ -36,7 +35,6 @@
#include "mojo/services/gles2/gpu_impl.h"
#include "mojo/services/native_viewport/native_viewport_impl.h"
#include "mojo/shell/network_application_loader.h"
-#include "ui/gl/gl_share_group.h"
#endif // defined(OS_ANDROID)
namespace mojo {
@@ -129,9 +127,7 @@ class Context::NativeViewportApplicationLoader
public InterfaceFactory<NativeViewport>,
public InterfaceFactory<Gpu> {
public:
- NativeViewportApplicationLoader()
- : share_group_(new gfx::GLShareGroup),
- mailbox_manager_(new gpu::gles2::MailboxManagerImpl) {}
+ NativeViewportApplicationLoader() : gpu_state_(new GpuImpl::State) {}
virtual ~NativeViewportApplicationLoader() {}
private:
@@ -164,11 +160,10 @@ class Context::NativeViewportApplicationLoader
// InterfaceFactory<Gpu> implementation.
virtual void Create(ApplicationConnection* connection,
InterfaceRequest<Gpu> request) override {
- new GpuImpl(request.Pass(), share_group_.get(), mailbox_manager_.get());
+ new GpuImpl(request.Pass(), gpu_state_);
}
- scoped_refptr<gfx::GLShareGroup> share_group_;
- scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
+ scoped_refptr<GpuImpl::State> gpu_state_;
scoped_ptr<ApplicationImpl> app_;
DISALLOW_COPY_AND_ASSIGN(NativeViewportApplicationLoader);
};
« no previous file with comments | « mojo/services/native_viewport/main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698