diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 20:49:59 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 20:49:59 +0000 |
| commit | de945c861f68df1f16d58b0570332976fed57f7d (patch) | |
| tree | 93fb838cf4ace27106a90dc8f11a883da988f256 | |
| parent | a755dc2df6712d2965b3ea2e6a0e90fe5fb3d0a3 (diff) | |
| download | chromium_src-de945c861f68df1f16d58b0570332976fed57f7d.zip chromium_src-de945c861f68df1f16d58b0570332976fed57f7d.tar.gz chromium_src-de945c861f68df1f16d58b0570332976fed57f7d.tar.bz2 | |
Fixes to 10.6 port of GPU plugin after recent backport to 10.5 and
(apparently) other recent changes.
BUG=none
TEST=ran Pepper test plugin with both 10.6 and 10.5 code paths
Review URL: http://codereview.chromium.org/661391
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40417 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/plugin/plugin_thread.cc | 18 | ||||
| -rw-r--r-- | webkit/glue/plugins/mac_gpu_plugin_container.cc | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc index c46de35..59d243d 100644 --- a/chrome/plugin/plugin_thread.cc +++ b/chrome/plugin/plugin_thread.cc @@ -86,18 +86,18 @@ PluginThread::PluginThread() NPAPI::PluginLib::CreatePluginLib(plugin_path_); if (plugin.get()) { plugin->NP_Initialize(); - } #if defined(OS_MACOSX) - scoped_cftyperef<CFStringRef> plugin_name(base::SysWideToCFStringRef( - plugin->plugin_info().name)); - scoped_cftyperef<CFStringRef> app_name(base::SysUTF16ToCFStringRef( - l10n_util::GetStringUTF16(IDS_SHORT_PLUGIN_APP_NAME))); - scoped_cftyperef<CFStringRef> process_name(CFStringCreateWithFormat( - kCFAllocatorDefault, NULL, CFSTR("%@ (%@)"), - plugin_name.get(), app_name.get())); - mac_util::SetProcessName(process_name); + scoped_cftyperef<CFStringRef> plugin_name(base::SysWideToCFStringRef( + plugin->plugin_info().name)); + scoped_cftyperef<CFStringRef> app_name(base::SysUTF16ToCFStringRef( + l10n_util::GetStringUTF16(IDS_SHORT_PLUGIN_APP_NAME))); + scoped_cftyperef<CFStringRef> process_name(CFStringCreateWithFormat( + kCFAllocatorDefault, NULL, CFSTR("%@ (%@)"), + plugin_name.get(), app_name.get())); + mac_util::SetProcessName(process_name); #endif + } // Certain plugins, such as flash, steal the unhandled exception filter // thus we never get crash reports when they fault. This call fixes it. diff --git a/webkit/glue/plugins/mac_gpu_plugin_container.cc b/webkit/glue/plugins/mac_gpu_plugin_container.cc index c313b16..d9ddd47 100644 --- a/webkit/glue/plugins/mac_gpu_plugin_container.cc +++ b/webkit/glue/plugins/mac_gpu_plugin_container.cc @@ -70,7 +70,8 @@ void MacGPUPluginContainer::Draw(CGLContextObj context) { IOSurfaceSupport* io_surface_support = IOSurfaceSupport::Initialize(); GLenum target = GL_TEXTURE_RECTANGLE_ARB; if (!texture_) { - if ((io_surface_support && !surface_) || transport_dib_.get() == NULL) + if ((io_surface_support && !surface_) || + (!io_surface_support && !transport_dib_.get())) return; glGenTextures(1, &texture_); glBindTexture(target, texture_); |