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

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

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

Powered by Google App Engine
This is Rietveld 408576698