mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Update libgio_loader for some APIs

Browse source
This commit is contained in:
Cheng Zhao 2014-10-21 19:31:44 +08:00
parent 4b75b10542
commit 0d957cc68e
2 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
chromium_src/library_loaders/libgio.h
View file

@ -24,9 +24,11 @@ class LibGioLoader {
typeof(&::g_settings_get_child) g_settings_get_child; typeof(&::g_settings_get_child) g_settings_get_child;
typeof(&::g_settings_get_string) g_settings_get_string; typeof(&::g_settings_get_string) g_settings_get_string;
typeof(&::g_settings_get_boolean) g_settings_get_boolean; typeof(&::g_settings_get_boolean) g_settings_get_boolean;
typeof(&::g_settings_get_int) g_settings_get_int; typeof(&::g_settings_get_uint) g_settings_get_uint;
typeof(&::g_settings_get_strv) g_settings_get_strv; typeof(&::g_settings_get_strv) g_settings_get_strv;
typeof(&::g_settings_is_writable) g_settings_is_writable;
typeof(&::g_settings_list_schemas) g_settings_list_schemas; typeof(&::g_settings_list_schemas) g_settings_list_schemas;
typeof(&::g_settings_list_keys) g_settings_list_keys;
private: private:

39
chromium_src/library_loaders/libgio_loader.cc
View file

@ -85,14 +85,14 @@ bool LibGioLoader::Load(const std::string& library_name) {
} }
#if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBGIO_H_DLOPEN) #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBGIO_H_DLOPEN)
g_settings_get_int = g_settings_get_uint =
reinterpret_cast<typeof(this->g_settings_get_int)>( reinterpret_cast<typeof(this->g_settings_get_uint)>(
dlsym(library_, "g_settings_get_int")); dlsym(library_, "g_settings_get_uint"));
#endif #endif
#if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBGIO_H_DT_NEEDED) #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBGIO_H_DT_NEEDED)
g_settings_get_int = &::g_settings_get_int; g_settings_get_uint = &::g_settings_get_uint;
#endif #endif
if (!g_settings_get_int) { if (!g_settings_get_uint) {
CleanUp(true); CleanUp(true);
return false; return false;
} }
@ -110,6 +110,19 @@ bool LibGioLoader::Load(const std::string& library_name) {
return false; return false;
} }
#if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBGIO_H_DLOPEN)
g_settings_is_writable =
reinterpret_cast<typeof(this->g_settings_is_writable)>(
dlsym(library_, "g_settings_is_writable"));
#endif
#if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBGIO_H_DT_NEEDED)
g_settings_is_writable = &::g_settings_is_writable;
#endif
if (!g_settings_is_writable) {
CleanUp(true);
return false;
}
#if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBGIO_H_DLOPEN) #if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBGIO_H_DLOPEN)
g_settings_list_schemas = g_settings_list_schemas =
reinterpret_cast<typeof(this->g_settings_list_schemas)>( reinterpret_cast<typeof(this->g_settings_list_schemas)>(
@ -123,6 +136,18 @@ bool LibGioLoader::Load(const std::string& library_name) {
return false; return false;
} }
#if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBGIO_H_DLOPEN)
g_settings_list_keys =
reinterpret_cast<typeof(this->g_settings_list_keys)>(
dlsym(library_, "g_settings_list_keys"));
#endif
#if defined(LIBRARY_LOADER_OUT_RELEASE_GEN_LIBRARY_LOADERS_LIBGIO_H_DT_NEEDED)
g_settings_list_keys = &::g_settings_list_keys;
#endif
if (!g_settings_list_keys) {
CleanUp(true);
return false;
}
loaded_ = true; loaded_ = true;
return true; return true;
@ -140,8 +165,10 @@ void LibGioLoader::CleanUp(bool unload) {
g_settings_get_child = NULL; g_settings_get_child = NULL;
g_settings_get_string = NULL; g_settings_get_string = NULL;
g_settings_get_boolean = NULL; g_settings_get_boolean = NULL;
g_settings_get_int = NULL; g_settings_get_uint = NULL;
g_settings_get_strv = NULL; g_settings_get_strv = NULL;
g_settings_is_writable = NULL;
g_settings_list_schemas = NULL; g_settings_list_schemas = NULL;
g_settings_list_keys = NULL;
} }