diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 18:06:17 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 18:06:17 +0000 |
| commit | e2e48a08938eff8a0d32ab1eb1231efe5ce2e974 (patch) | |
| tree | 4953aa0142dccaa962000fe190ae23236504bd8b /webkit | |
| parent | 2be6a8410e277925d05e0f416812e78a172e88bd (diff) | |
| download | chromium_src-e2e48a08938eff8a0d32ab1eb1231efe5ce2e974.zip chromium_src-e2e48a08938eff8a0d32ab1eb1231efe5ce2e974.tar.gz chromium_src-e2e48a08938eff8a0d32ab1eb1231efe5ce2e974.tar.bz2 | |
Add a UseResFile call in Mac plugin loading
Although this doesn't change anything that we know of (and it's possible that no current plugin requires it), this makes our plugin loading more like it is in other Mac browsers, thus reducing the chances of weird, hard-to-track-down bugs.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1141009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_lib.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/webkit/glue/plugins/plugin_lib.cc b/webkit/glue/plugins/plugin_lib.cc index d63045a..525012f 100644 --- a/webkit/glue/plugins/plugin_lib.cc +++ b/webkit/glue/plugins/plugin_lib.cc @@ -173,6 +173,13 @@ bool PluginLib::Load() { if (library == 0) return rv; +#if defined(OS_MACOSX) + // According to the WebKit source, QuickTime at least requires us to call + // UseResFile on the plugin resources before loading. + if (library->bundle_resource_ref != -1) + UseResFile(library->bundle_resource_ref); +#endif + rv = true; // assume success now entry_points_.np_initialize = |