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

Side by Side Diff: mojo/runner/native_application_support.cc

Issue 1189833005: Revert of Support impl-side painting in Mandoline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « mojo/gpu/mojo_gles2_impl_autogen.cc ('k') | third_party/mojo/src/mojo/public/c/gles2/BUILD.gn » ('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 "mojo/runner/native_application_support.h" 5 #include "mojo/runner/native_application_support.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "mojo/platform_handle/platform_handle_private_thunks.h" 11 #include "mojo/platform_handle/platform_handle_private_thunks.h"
12 #include "mojo/public/platform/native/gles2_impl_chromium_copy_texture_thunks.h"
13 #include "mojo/public/platform/native/gles2_impl_chromium_image_thunks.h"
14 #include "mojo/public/platform/native/gles2_impl_chromium_miscellaneous_thunks.h " 12 #include "mojo/public/platform/native/gles2_impl_chromium_miscellaneous_thunks.h "
15 #include "mojo/public/platform/native/gles2_impl_chromium_pixel_transfer_buffer_ object_thunks.h"
16 #include "mojo/public/platform/native/gles2_impl_chromium_sub_image_thunks.h" 13 #include "mojo/public/platform/native/gles2_impl_chromium_sub_image_thunks.h"
17 #include "mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h" 14 #include "mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h"
18 #include "mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks .h" 15 #include "mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks .h"
19 #include "mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.h" 16 #include "mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.h"
20 #include "mojo/public/platform/native/gles2_impl_thunks.h" 17 #include "mojo/public/platform/native/gles2_impl_thunks.h"
21 #include "mojo/public/platform/native/gles2_thunks.h" 18 #include "mojo/public/platform/native/gles2_thunks.h"
22 #include "mojo/public/platform/native/system_thunks.h" 19 #include "mojo/public/platform/native/system_thunks.h"
23 20
24 namespace mojo { 21 namespace mojo {
25 namespace runner { 22 namespace runner {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 if (!SetThunks(&MojoMakeGLES2ImplThunks, "MojoSetGLES2ImplThunks", 76 if (!SetThunks(&MojoMakeGLES2ImplThunks, "MojoSetGLES2ImplThunks",
80 app_library)) { 77 app_library)) {
81 LOG(ERROR) 78 LOG(ERROR)
82 << "MojoSetGLES2ControlThunks found, but not MojoSetGLES2ImplThunks"; 79 << "MojoSetGLES2ControlThunks found, but not MojoSetGLES2ImplThunks";
83 return false; 80 return false;
84 } 81 }
85 82
86 // If the application is using GLES2 extension points, register those 83 // If the application is using GLES2 extension points, register those
87 // thunks. Applications may use or not use any of these, so don't warn if 84 // thunks. Applications may use or not use any of these, so don't warn if
88 // they are missing. 85 // they are missing.
89 SetThunks(MojoMakeGLES2ImplChromiumCopyTextureThunks,
90 "MojoSetGLES2ImplChromiumCopyTextureThunks", app_library);
91 SetThunks(MojoMakeGLES2ImplChromiumImageThunks,
92 "MojoSetGLES2ImplChromiumImageThunks", app_library);
93 SetThunks(MojoMakeGLES2ImplChromiumMiscellaneousThunks, 86 SetThunks(MojoMakeGLES2ImplChromiumMiscellaneousThunks,
94 "MojoSetGLES2ImplChromiumMiscellaneousThunks", app_library); 87 "MojoSetGLES2ImplChromiumMiscellaneousThunks", app_library);
95 SetThunks(MojoMakeGLES2ImplChromiumPixelTransferBufferObjectThunks,
96 "MojoSetGLES2ImplChromiumPixelTransferBufferObjectThunks", app_lib rary);
97 SetThunks(MojoMakeGLES2ImplChromiumSubImageThunks, 88 SetThunks(MojoMakeGLES2ImplChromiumSubImageThunks,
98 "MojoSetGLES2ImplChromiumSubImageThunks", app_library); 89 "MojoSetGLES2ImplChromiumSubImageThunks", app_library);
99 SetThunks(MojoMakeGLES2ImplChromiumTextureMailboxThunks, 90 SetThunks(MojoMakeGLES2ImplChromiumTextureMailboxThunks,
100 "MojoSetGLES2ImplChromiumTextureMailboxThunks", app_library); 91 "MojoSetGLES2ImplChromiumTextureMailboxThunks", app_library);
101 SetThunks(MojoMakeGLES2ImplChromiumSyncPointThunks, 92 SetThunks(MojoMakeGLES2ImplChromiumSyncPointThunks,
102 "MojoSetGLES2ImplChromiumSyncPointThunks", app_library); 93 "MojoSetGLES2ImplChromiumSyncPointThunks", app_library);
103 SetThunks(MojoMakeGLES2ImplOcclusionQueryExtThunks, 94 SetThunks(MojoMakeGLES2ImplOcclusionQueryExtThunks,
104 "MojoSetGLES2ImplOcclusionQueryExtThunks", app_library); 95 "MojoSetGLES2ImplOcclusionQueryExtThunks", app_library);
105 } 96 }
106 // Unlike system thunks, we don't warn on a lack of GLES2 thunks because 97 // Unlike system thunks, we don't warn on a lack of GLES2 thunks because
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 MojoHandle handle = application_request.PassMessagePipe().release().value(); 142 MojoHandle handle = application_request.PassMessagePipe().release().value();
152 MojoResult result = main_function(handle); 143 MojoResult result = main_function(handle);
153 if (result != MOJO_RESULT_OK) { 144 if (result != MOJO_RESULT_OK) {
154 LOG(ERROR) << "MojoMain returned error (result: " << result << ")"; 145 LOG(ERROR) << "MojoMain returned error (result: " << result << ")";
155 } 146 }
156 return true; 147 return true;
157 } 148 }
158 149
159 } // namespace runner 150 } // namespace runner
160 } // namespace mojo 151 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/gpu/mojo_gles2_impl_autogen.cc ('k') | third_party/mojo/src/mojo/public/c/gles2/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698