Allow multiple instances of the newer VLC plugins to load. The older versions...

webkit/plugins/npapi/webplugin_delegate_impl_win.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 163 matching lines @@
 
   result = func(key, KeyNameInformation, buffer.get(), size, &size);
   if (result != STATUS_SUCCESS)
     return L"";
 
   KEY_NAME_INFORMATION* info =
       reinterpret_cast<KEY_NAME_INFORMATION*>(buffer.get());
   return std::wstring(info->Name, info->NameLength / sizeof(wchar_t));
 }
 
+int GetPluginMajorVersion(const WebPluginInfo& plugin_info) {
+  int major_version = 0;

[jam, 2011/01/24 22:38:35]

i think we want to use PluginGroup::CreateVersionFromString since it's more
lenient in the parsing, which apparently is needed with some plugins/platforms

+  std::vector<std::wstring> version;
+  base::SplitString(plugin_info.version, L'.', &version);
+  if (version.size() > 0) {
+    base::StringToInt(version[0], &major_version);
+  }
+  return major_version;
+}
+
 }  // namespace
 
 bool WebPluginDelegateImpl::IsPluginDelegateWindow(HWND window) {
   static const int kBufLen = 64;
   wchar_t class_name[kBufLen];
   if (!GetClassNameW(window, class_name, kBufLen))
     return false;
   return wcscmp(class_name, kNativeWindowClassName) == 0;
 }
 
@@ skipping 89 matching lines @@
       filename == kFlashPlugin) {
     // Flash only requests windowless plugins if we return a Mozilla user
     // agent.
     instance_->set_use_mozilla_user_agent();
     quirks_ |= PLUGIN_QUIRK_THROTTLE_WM_USER_PLUS_ONE;
     quirks_ |= PLUGIN_QUIRK_PATCH_SETCURSOR;
     quirks_ |= PLUGIN_QUIRK_ALWAYS_NOTIFY_SUCCESS;
     quirks_ |= PLUGIN_QUIRK_HANDLE_MOUSE_CAPTURE;
   } else if (filename == kAcrobatReaderPlugin) {
     // Check for the version number above or equal 9.
-    std::vector<std::wstring> version;
-    base::SplitString(plugin_info.version, L'.', &version);
-    if (version.size() > 0) {
-      int major;
-      base::StringToInt(version[0], &major);
-      if (major >= 9) {
-        quirks_ |= PLUGIN_QUIRK_DIE_AFTER_UNLOAD;
-
-        // 9.2 needs this.
-        quirks_ |= PLUGIN_QUIRK_SETWINDOW_TWICE;
-      }
+    int major_version = GetPluginMajorVersion(plugin_info);
+    if (major_version >= 9) {
+      quirks_ |= PLUGIN_QUIRK_DIE_AFTER_UNLOAD;
+      // 9.2 needs this.
+      quirks_ |= PLUGIN_QUIRK_SETWINDOW_TWICE;
     }
     quirks_ |= PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS;
   } else if (plugin_info.name.find(L"Windows Media Player") !=
              std::wstring::npos) {
     // Windows Media Player needs two NPP_SetWindow calls.
     quirks_ |= PLUGIN_QUIRK_SETWINDOW_TWICE;
 
     // Windowless mode doesn't work in the WMP NPAPI plugin.
     quirks_ |= PLUGIN_QUIRK_NO_WINDOWLESS;
 
     // The media player plugin sets its size on the first NPP_SetWindow call
     // and never updates its size. We should call the underlying NPP_SetWindow
     // only when we have the correct size.
     quirks_ |= PLUGIN_QUIRK_IGNORE_FIRST_SETWINDOW_CALL;
 
     if (filename == kOldWMPPlugin) {
       // Non-admin users on XP couldn't modify the key to force the new UI.
       quirks_ |= PLUGIN_QUIRK_PATCH_REGENUMKEYEXW;
     }
   } else if (instance_->mime_type() == "audio/x-pn-realaudio-plugin" ||
              filename == kRealPlayerPlugin) {
     quirks_ |= PLUGIN_QUIRK_DONT_CALL_WND_PROC_RECURSIVELY;
   } else if (plugin_info.name.find(L"VLC Multimedia Plugin") !=
              std::wstring::npos ||
              plugin_info.name.find(L"VLC Multimedia Plug-in") !=
              std::wstring::npos) {
     // VLC hangs on NPP_Destroy if we call NPP_SetWindow with a null window
     // handle
     quirks_ |= PLUGIN_QUIRK_DONT_SET_NULL_WINDOW_HANDLE_ON_DESTROY;
-    // VLC 0.8.6d and 0.8.6e crash if multiple instances are created.
-    quirks_ |= PLUGIN_QUIRK_DONT_ALLOW_MULTIPLE_INSTANCES;
+    int major_version = GetPluginMajorVersion(plugin_info);
+    if (major_version == 0) {
+      // VLC 0.8.6d and 0.8.6e crash if multiple instances are created.
+      quirks_ |= PLUGIN_QUIRK_DONT_ALLOW_MULTIPLE_INSTANCES;
+    }
   } else if (filename == kSilverlightPlugin) {
     // Explanation for this quirk can be found in
     // WebPluginDelegateImpl::Initialize.
     quirks_ |= PLUGIN_QUIRK_PATCH_SETCURSOR;
   } else if (plugin_info.name.find(L"DivX Web Player") !=
              std::wstring::npos) {
     // The divx plugin sets its size on the first NPP_SetWindow call and never
     // updates its size. We should call the underlying NPP_SetWindow only when
     // we have the correct size.
     quirks_ |= PLUGIN_QUIRK_IGNORE_FIRST_SETWINDOW_CALL;
@@ skipping 1060 matching lines @@
       ::ReleaseCapture();
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace npapi
 }  // namespace webkit