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

Unified Diff: ui/gl/gl_implementation_win.cc

Issue 1272373004: Fix Mandoline apptests on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ' Created 5 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 side-by-side diff with in-line comments
Download patch
« sql/mojo/vfs_unittest.cc ('K') | « sql/mojo/vfs_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_implementation_win.cc
diff --git a/ui/gl/gl_implementation_win.cc b/ui/gl/gl_implementation_win.cc
index 40cbdde91319156e7ae91e42f19ffc51520d17e8..6a4e61298a71ea231190462ecf669f643df0d7f7 100644
--- a/ui/gl/gl_implementation_win.cc
+++ b/ui/gl/gl_implementation_win.cc
@@ -90,16 +90,17 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {
switch (implementation) {
case kGLImplementationOSMesaGL: {
base::FilePath module_path;
- if (!PathService::Get(base::DIR_MODULE, &module_path)) {
- LOG(ERROR) << "PathService::Get failed.";
- return false;
- }
-
+ PathService::Get(base::DIR_MODULE, &module_path);
base::NativeLibrary library = base::LoadNativeLibrary(
module_path.Append(L"osmesa.dll"), NULL);
if (!library) {
- DVLOG(1) << "osmesa.dll not found";
- return false;
+ PathService::Get(base::DIR_EXE, &module_path);
+ library = base::LoadNativeLibrary(
+ module_path.Append(L"osmesa.dll"), NULL);
+ if (!library) {
+ DVLOG(1) << "osmesa.dll not found";
+ return false;
+ }
}
GLGetProcAddressProc get_proc_address =
« sql/mojo/vfs_unittest.cc ('K') | « sql/mojo/vfs_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698