diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-07 20:46:14 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-07 20:46:14 +0000 |
| commit | f4bff1e2cb4fc994a0f8453ae386222efa6f7b35 (patch) | |
| tree | 94dd6f86e3fe17310a2ef9fe5eb8e834bf4bd0ef /webkit/glue | |
| parent | d33982589ab807ffae287d6b6736cd7311b66555 (diff) | |
| download | chromium_src-f4bff1e2cb4fc994a0f8453ae386222efa6f7b35.zip chromium_src-f4bff1e2cb4fc994a0f8453ae386222efa6f7b35.tar.gz chromium_src-f4bff1e2cb4fc994a0f8453ae386222efa6f7b35.tar.bz2 | |
linux: Do not unload plugin in the browser process, it's not safe.
BUG=25245
TEST=none
Review URL: http://codereview.chromium.org/521047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/plugins/plugin_lib_linux.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/webkit/glue/plugins/plugin_lib_linux.cc b/webkit/glue/plugins/plugin_lib_linux.cc index 90a3597..17dbf96 100644 --- a/webkit/glue/plugins/plugin_lib_linux.cc +++ b/webkit/glue/plugins/plugin_lib_linux.cc @@ -59,13 +59,6 @@ bool ELFMatchesCurrentArchitecture(const FilePath& filename) { return false; } -// TODO(thestig) This is a hack to work around the crash in bug 25245. Remove -// this once we read plugins out of process. -bool SkipPluginUnloadHack(const WebPluginInfo& info) { - std::string filename = info.path.BaseName().value(); - return (filename.find("npo3dautoplugin") != std::string::npos); // O3D -} - } // anonymous namespace namespace NPAPI { @@ -114,8 +107,7 @@ bool PluginLib::ReadWebPluginInfo(const FilePath& filename, info->desc = UTF8ToWide(description); } - if (!SkipPluginUnloadHack(*info)) - base::UnloadNativeLibrary(dl); + // Intentionally not unloading the plugin here, it can lead to crashes. return true; } |