summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-11 21:27:50 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-11 21:27:50 +0000
commitc742d957136361c4164e0e93ad78267e558339e8 (patch)
treee9c75ecd0d519ab1ec3b4e4cc6ca67ecacd7cdee /app
parentcb8c9628bab1e4e2d828e0ab341fae5422712f6c (diff)
downloadchromium_src-c742d957136361c4164e0e93ad78267e558339e8.zip
chromium_src-c742d957136361c4164e0e93ad78267e558339e8.tar.gz
chromium_src-c742d957136361c4164e0e93ad78267e558339e8.tar.bz2
Prefer native library symbol lookup to the platform GetProcAddress.
BUG=none TEST=none Review URL: http://codereview.chromium.org/4791002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/gfx/gl/gl_implementation.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/gfx/gl/gl_implementation.cc b/app/gfx/gl/gl_implementation.cc
index 2a83cd2..fccfb09 100644
--- a/app/gfx/gl/gl_implementation.cc
+++ b/app/gfx/gl/gl_implementation.cc
@@ -115,12 +115,6 @@ void SetGLGetProcAddressProc(GLGetProcAddressProc proc) {
void* GetGLProcAddress(const char* name) {
DCHECK(g_gl_implementation != kGLImplementationNone);
- if (g_get_proc_address) {
- void* proc = g_get_proc_address(name);
- if (proc)
- return proc;
- }
-
if (g_libraries) {
for (size_t i = 0; i < g_libraries->size(); ++i) {
void* proc = base::GetFunctionPointerFromNativeLibrary((*g_libraries)[i],
@@ -130,6 +124,12 @@ void* GetGLProcAddress(const char* name) {
}
}
+ if (g_get_proc_address) {
+ void* proc = g_get_proc_address(name);
+ if (proc)
+ return proc;
+ }
+
return NULL;
}