Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Side by Side Diff: webkit/glue/plugins/webplugin_delegate_impl_win.cc

Issue 196012: This changelist fixes some issues with the NPAPI WMP plugin work in Chrome. ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/plugins/webplugin_delegate_impl_mac.mm ('k') | webkit/glue/webplugin_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/glue/plugins/webplugin_delegate_impl.h" 5 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 int major = static_cast<int>(StringToInt64(version[0])); 196 int major = static_cast<int>(StringToInt64(version[0]));
197 if (major >= 9) { 197 if (major >= 9) {
198 quirks_ |= PLUGIN_QUIRK_DIE_AFTER_UNLOAD; 198 quirks_ |= PLUGIN_QUIRK_DIE_AFTER_UNLOAD;
199 } 199 }
200 } 200 }
201 quirks_ |= PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS; 201 quirks_ |= PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS;
202 } else if (plugin_info.name.find(L"Windows Media Player") != 202 } else if (plugin_info.name.find(L"Windows Media Player") !=
203 std::wstring::npos) { 203 std::wstring::npos) {
204 // Windows Media Player needs two NPP_SetWindow calls. 204 // Windows Media Player needs two NPP_SetWindow calls.
205 quirks_ |= PLUGIN_QUIRK_SETWINDOW_TWICE; 205 quirks_ |= PLUGIN_QUIRK_SETWINDOW_TWICE;
206
207 // Windowless mode doesn't work in the WMP NPAPI plugin.
208 quirks_ |= PLUGIN_QUIRK_NO_WINDOWLESS;
206 } else if (instance_->mime_type() == "audio/x-pn-realaudio-plugin" || 209 } else if (instance_->mime_type() == "audio/x-pn-realaudio-plugin" ||
207 filename == "nppl3260.dll") { 210 filename == "nppl3260.dll") {
208 quirks_ |= PLUGIN_QUIRK_DONT_CALL_WND_PROC_RECURSIVELY; 211 quirks_ |= PLUGIN_QUIRK_DONT_CALL_WND_PROC_RECURSIVELY;
209 } else if (plugin_info.name.find(L"VLC Multimedia Plugin") != 212 } else if (plugin_info.name.find(L"VLC Multimedia Plugin") !=
210 std::wstring::npos || 213 std::wstring::npos ||
211 plugin_info.name.find(L"VLC Multimedia Plug-in") != 214 plugin_info.name.find(L"VLC Multimedia Plug-in") !=
212 std::wstring::npos) { 215 std::wstring::npos) {
213 // VLC hangs on NPP_Destroy if we call NPP_SetWindow with a null window 216 // VLC hangs on NPP_Destroy if we call NPP_SetWindow with a null window
214 // handle 217 // handle
215 quirks_ |= PLUGIN_QUIRK_DONT_SET_NULL_WINDOW_HANDLE_ON_DESTROY; 218 quirks_ |= PLUGIN_QUIRK_DONT_SET_NULL_WINDOW_HANDLE_ON_DESTROY;
(...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after
1146 1149
1147 // It is ok to pass NULL here to GetCursor as we are not looking for cursor 1150 // It is ok to pass NULL here to GetCursor as we are not looking for cursor
1148 // types defined by Webkit. 1151 // types defined by Webkit.
1149 HCURSOR previous_cursor = 1152 HCURSOR previous_cursor =
1150 g_current_plugin_instance->current_windowless_cursor_.GetCursor(NULL); 1153 g_current_plugin_instance->current_windowless_cursor_.GetCursor(NULL);
1151 1154
1152 g_current_plugin_instance->current_windowless_cursor_.InitFromExternalCursor( 1155 g_current_plugin_instance->current_windowless_cursor_.InitFromExternalCursor(
1153 cursor); 1156 cursor);
1154 return previous_cursor; 1157 return previous_cursor;
1155 } 1158 }
OLDNEW
« no previous file with comments | « webkit/glue/plugins/webplugin_delegate_impl_mac.mm ('k') | webkit/glue/webplugin_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698