bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: Override DIR_ASSETS with libcef directory (issue #1936)

This commit is contained in:
Riku Palomäki 2019-03-07 22:04:32 +00:00 committed by Marshall Greenblatt
parent feffedbae9
commit 602c163127
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libcef/common/main_delegate.cc
View File

@ -3,6 +3,11 @@
// found in the LICENSE file. // found in the LICENSE file.
#include "libcef/common/main_delegate.h" #include "libcef/common/main_delegate.h"
#if defined(OS_LINUX)
#include <dlfcn.h>
#endif
#include "libcef/browser/browser_message_loop.h" #include "libcef/browser/browser_message_loop.h"
#include "libcef/browser/content_browser_client.h" #include "libcef/browser/content_browser_client.h"
#include "libcef/browser/context.h" #include "libcef/browser/context.h"
@ -257,6 +262,18 @@ bool IsScaleFactorSupported(ui::ScaleFactor scale_factor) {
scale_factor) != supported_scale_factors.end(); scale_factor) != supported_scale_factors.end();
} }
#if defined(OS_LINUX)
// Look for the *.dat and *.bin files next to libcef instead of the exe on
// Linux. This is already the default on Windows.
void OverrideAssetPath() {
Dl_info dl_info;
if (dladdr(reinterpret_cast<const void*>(&OverrideAssetPath), &dl_info)) {
base::FilePath path = base::FilePath(dl_info.dli_fname).DirName();
base::PathService::Override(base::DIR_ASSETS, path);
}
}
#endif
// Used to run the UI on a separate thread. // Used to run the UI on a separate thread.
class CefUIThread : public base::Thread { class CefUIThread : public base::Thread {
public: public:
@ -313,6 +330,10 @@ CefMainDelegate::CefMainDelegate(CefRefPtr<CefApp> application)
// in the binary. // in the binary.
extern void base_impl_stub(); extern void base_impl_stub();
base_impl_stub(); base_impl_stub();
#if defined(OS_LINUX)
OverrideAssetPath();
#endif
} }
CefMainDelegate::~CefMainDelegate() {} CefMainDelegate::~CefMainDelegate() {}