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

Unified Diff: webkit/plugins/npapi/plugin_lib.cc

Issue 6864020: linux: don't always print dlopen errors from LoadNativeLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: owners Created 9 years, 8 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
« no previous file with comments | « ui/gfx/gl/gl_implementation_win.cc ('k') | webkit/plugins/npapi/plugin_lib_posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/npapi/plugin_lib.cc
diff --git a/webkit/plugins/npapi/plugin_lib.cc b/webkit/plugins/npapi/plugin_lib.cc
index f0793c5be7dbca503f8cb82e77357d79f2f59c3d..2db2a524501c75809592413ab90c0e2a798ef090 100644
--- a/webkit/plugins/npapi/plugin_lib.cc
+++ b/webkit/plugins/npapi/plugin_lib.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -180,6 +180,7 @@ bool PluginLib::Load() {
bool rv = false;
base::NativeLibrary library = 0;
+ std::string error;
if (!internal_) {
#if defined(OS_WIN)
@@ -193,14 +194,16 @@ bool PluginLib::Load() {
std::wstring::npos) {
library = base::LoadNativeLibraryDynamically(web_plugin_info_.path);
} else {
- library = base::LoadNativeLibrary(web_plugin_info_.path);
+ library = base::LoadNativeLibrary(web_plugin_info_.path, &error);
}
-#else // OS_WIN
- library = base::LoadNativeLibrary(web_plugin_info_.path);
-#endif // OS_WIN
- if (library == 0) {
+#else
+ library = base::LoadNativeLibrary(web_plugin_info_.path, &error);
+#endif
+
+ if (!library) {
LOG_IF(ERROR, PluginList::DebugPluginLoading())
- << "Couldn't load plugin " << web_plugin_info_.path.value();
+ << "Couldn't load plugin " << web_plugin_info_.path.value() << " "
+ << error;
return rv;
}
« no previous file with comments | « ui/gfx/gl/gl_implementation_win.cc ('k') | webkit/plugins/npapi/plugin_lib_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698