diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 02:23:16 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 02:23:16 +0000 |
| commit | 8d7d1b82ee1888d088f34386be2a3abe32228524 (patch) | |
| tree | ba4319e905e90acf2d463a84b0b41c6194d0c51a /app | |
| parent | 13325c744ae97ee00f24e3cff1819084ab5c15ec (diff) | |
| download | chromium_src-8d7d1b82ee1888d088f34386be2a3abe32228524.zip chromium_src-8d7d1b82ee1888d088f34386be2a3abe32228524.tar.gz chromium_src-8d7d1b82ee1888d088f34386be2a3abe32228524.tar.bz2 | |
Revert 77766 - Preload D3DCompiler_42.dll.
This needs to be loaded before the sandbox is turned on.
TEST=The DLL is not loaded after initialization
BUG=none
Review URL: http://codereview.chromium.org/6674011
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/6667027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/gfx/gl/gl_context_egl.cc | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/app/gfx/gl/gl_context_egl.cc b/app/gfx/gl/gl_context_egl.cc index e68e1d3..a367cd8 100644 --- a/app/gfx/gl/gl_context_egl.cc +++ b/app/gfx/gl/gl_context_egl.cc @@ -2,17 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <d3d11.h> -#include <d3dcompiler.h> - #include "app/gfx/gl/gl_context_egl.h" -#include "base/file_path.h" +#include "build/build_config.h" #include "base/logging.h" -#include "base/native_library.h" -#include "base/path_service.h" #include "base/scoped_ptr.h" -#include "build/build_config.h" #include "third_party/angle/include/EGL/egl.h" // This header must come after the above third-party include, as @@ -96,15 +90,6 @@ bool BaseEGLContext::InitializeOneOff() { #else EGLNativeDisplayType native_display = EGL_DEFAULT_DISPLAY; #endif - -#ifdef OS_WIN - FilePath module_path; - if (!PathService::Get(base::DIR_MODULE, &module_path)) - return false; - - base::LoadNativeLibrary(module_path.Append(D3DCOMPILER_DLL)); -#endif - g_display = eglGetDisplay(native_display); if (!g_display) { LOG(ERROR) << "eglGetDisplay failed with error " << GetLastEGLErrorString(); |