| Index: webkit/glue/plugins/webplugin_delegate_impl.cc
|
| ===================================================================
|
| --- webkit/glue/plugins/webplugin_delegate_impl.cc (revision 9653)
|
| +++ webkit/glue/plugins/webplugin_delegate_impl.cc (working copy)
|
| @@ -58,7 +58,7 @@
|
|
|
| } // namespace
|
|
|
| -WebPluginDelegateImpl* WebPluginDelegateImpl::Create(
|
| +WebPluginDelegate* WebPluginDelegate::Create(
|
| const FilePath& filename,
|
| const std::string& mime_type,
|
| gfx::NativeView containing_view) {
|
| @@ -800,7 +800,7 @@
|
| }
|
|
|
| if (message == delegate->last_message_ &&
|
| - delegate->quirks() & PLUGIN_QUIRK_DONT_CALL_WND_PROC_RECURSIVELY &&
|
| + delegate->GetQuirks() & PLUGIN_QUIRK_DONT_CALL_WND_PROC_RECURSIVELY &&
|
| delegate->is_calling_wndproc) {
|
| // Real may go into a state where it recursively dispatches the same event
|
| // when subclassed. See https://bugzilla.mozilla.org/show_bug.cgi?id=192914
|
| @@ -852,7 +852,7 @@
|
| // usage. See https://bugzilla.mozilla.org/show_bug.cgi?id=132759. We
|
| // prevent this by throttling the messages.
|
| case WM_USER + 1: {
|
| - if (delegate->quirks() & PLUGIN_QUIRK_THROTTLE_WM_USER_PLUS_ONE) {
|
| + if (delegate->GetQuirks() & PLUGIN_QUIRK_THROTTLE_WM_USER_PLUS_ONE) {
|
| WebPluginDelegateImpl::ThrottleMessage(delegate->plugin_wnd_proc_, hwnd,
|
| message, wparam, lparam);
|
| g_current_plugin_instance = last_plugin_instance;
|
| @@ -1172,7 +1172,7 @@
|
| if (!g_current_plugin_instance)
|
| return GetCursor();
|
|
|
| - if (!g_current_plugin_instance->windowless()) {
|
| + if (!g_current_plugin_instance->IsWindowless()) {
|
| return SetCursor(cursor);
|
| }
|
|
|
|
|