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

Side by Side Diff: mojo/shell/in_process_dynamic_service_runner.cc

Issue 413303002: mojo: Convert gles2 to the new thunking system (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add forgotten file. Created 6 years, 4 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 | « mojo/shell/context.cc ('k') | no next file » | 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 "mojo/shell/in_process_dynamic_service_runner.h" 5 #include "mojo/shell/in_process_dynamic_service_runner.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/message_loop/message_loop_proxy.h" 11 #include "base/message_loop/message_loop_proxy.h"
12 #include "mojo/public/platform/native/gles2_thunks.h"
12 #include "mojo/public/platform/native/system_thunks.h" 13 #include "mojo/public/platform/native/system_thunks.h"
13 14
14 namespace mojo { 15 namespace mojo {
15 namespace shell { 16 namespace shell {
16 17
17 InProcessDynamicServiceRunner::InProcessDynamicServiceRunner( 18 InProcessDynamicServiceRunner::InProcessDynamicServiceRunner(
18 Context* context) 19 Context* context)
19 : keep_alive_(context) { 20 : keep_alive_(context) {
20 } 21 }
21 22
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 } 80 }
80 } else { 81 } else {
81 // In the component build, Mojo Apps link against mojo_system_impl. 82 // In the component build, Mojo Apps link against mojo_system_impl.
82 #if !defined(COMPONENT_BUILD) 83 #if !defined(COMPONENT_BUILD)
83 // Strictly speaking this is not required, but it's very unusual to have 84 // Strictly speaking this is not required, but it's very unusual to have
84 // an app that doesn't require the basic system library. 85 // an app that doesn't require the basic system library.
85 LOG(WARNING) << "MojoSetSystemThunks not found in app library"; 86 LOG(WARNING) << "MojoSetSystemThunks not found in app library";
86 #endif 87 #endif
87 } 88 }
88 89
90 MojoSetGLES2ControlThunksFn mojo_set_gles2_control_thunks_fn =
91 reinterpret_cast<MojoSetGLES2ControlThunksFn>(
92 app_library_.GetFunctionPointer("MojoSetGLES2ControlThunks"));
93 if (mojo_set_gles2_control_thunks_fn) {
94 MojoGLES2ControlThunks gles2_control_thunks =
95 MojoMakeGLES2ControlThunks();
96 size_t expected_size = mojo_set_gles2_control_thunks_fn(
97 &gles2_control_thunks);
98 if (expected_size > sizeof(MojoGLES2ControlThunks)) {
99 LOG(ERROR)
100 << "Invalid app library: expected MojoGLES2ControlThunks size: "
101 << expected_size;
102 break;
103 }
104
105 // If we have the control thunks, we probably also have the
106 // GLES2 implementation thunks.
107 MojoSetGLES2ImplThunksFn mojo_set_gles2_impl_thunks_fn =
108 reinterpret_cast<MojoSetGLES2ImplThunksFn>(
109 app_library_.GetFunctionPointer("MojoSetGLES2ImplThunks"));
110 if (mojo_set_gles2_impl_thunks_fn) {
111 MojoGLES2ImplThunks gles2_impl_thunks =
112 MojoMakeGLES2ImplThunks();
113 size_t expected_size = mojo_set_gles2_impl_thunks_fn(
114 &gles2_impl_thunks);
115 if (expected_size > sizeof(MojoGLES2ImplThunks)) {
116 LOG(ERROR)
117 << "Invalid app library: expected MojoGLES2ImplThunks size: "
118 << expected_size;
119 break;
120 }
121 } else {
122 // In the component build, Mojo Apps link against mojo_gles2_impl.
123 #if !defined(COMPONENT_BUILD)
124 // Warn on this really weird case: The library requires the GLES2
125 // control functions, but doesn't require the GLES2 implementation.
126 LOG(WARNING) << "App library has MojoSetGLES2ControlThunks, but "
127 "doesn't have MojoSetGLES2ImplThunks.";
128 #endif
129 }
130 }
131 // Unlike system thunks, we don't warn on a lack of GLES2 thunks because
132 // not everything is a visual app.
133
89 typedef MojoResult (*MojoMainFunction)(MojoHandle); 134 typedef MojoResult (*MojoMainFunction)(MojoHandle);
90 MojoMainFunction main_function = reinterpret_cast<MojoMainFunction>( 135 MojoMainFunction main_function = reinterpret_cast<MojoMainFunction>(
91 app_library_.GetFunctionPointer("MojoMain")); 136 app_library_.GetFunctionPointer("MojoMain"));
92 if (!main_function) { 137 if (!main_function) {
93 LOG(ERROR) << "Entrypoint MojoMain not found"; 138 LOG(ERROR) << "Entrypoint MojoMain not found";
94 break; 139 break;
95 } 140 }
96 141
97 // |MojoMain()| takes ownership of the service handle. 142 // |MojoMain()| takes ownership of the service handle.
98 MojoResult result = main_function(service_handle_.release().value()); 143 MojoResult result = main_function(service_handle_.release().value());
99 if (result < MOJO_RESULT_OK) 144 if (result < MOJO_RESULT_OK)
100 LOG(ERROR) << "MojoMain returned an error: " << result; 145 LOG(ERROR) << "MojoMain returned an error: " << result;
101 } while (false); 146 } while (false);
102 147
103 bool success = app_completed_callback_runner_.Run(); 148 bool success = app_completed_callback_runner_.Run();
104 app_completed_callback_runner_.Reset(); 149 app_completed_callback_runner_.Reset();
105 LOG_IF(ERROR, !success) << "Failed post run app_completed_callback"; 150 LOG_IF(ERROR, !success) << "Failed post run app_completed_callback";
106 } 151 }
107 152
108 } // namespace shell 153 } // namespace shell
109 } // namespace mojo 154 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/context.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698