OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/child/npapi/webplugin_delegate_impl.h" | 5 #include "content/child/npapi/webplugin_delegate_impl.h" |
6 | 6 |
7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
8 #include <gdk/gdkx.h> | 8 #include <gdk/gdkx.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 11 matching lines...) Expand all Loading... |
22 | 22 |
23 #include "third_party/npapi/bindings/npapi_x11.h" | 23 #include "third_party/npapi/bindings/npapi_x11.h" |
24 | 24 |
25 using WebKit::WebKeyboardEvent; | 25 using WebKit::WebKeyboardEvent; |
26 using WebKit::WebInputEvent; | 26 using WebKit::WebInputEvent; |
27 using WebKit::WebMouseEvent; | 27 using WebKit::WebMouseEvent; |
28 | 28 |
29 namespace content { | 29 namespace content { |
30 | 30 |
31 WebPluginDelegateImpl::WebPluginDelegateImpl( | 31 WebPluginDelegateImpl::WebPluginDelegateImpl( |
| 32 WebPlugin* plugin, |
32 PluginInstance* instance) | 33 PluginInstance* instance) |
33 : windowed_handle_(0), | 34 : windowed_handle_(0), |
34 windowed_did_set_window_(false), | 35 windowed_did_set_window_(false), |
35 windowless_(false), | 36 windowless_(false), |
36 plugin_(NULL), | 37 plugin_(plugin), |
37 instance_(instance), | 38 instance_(instance), |
38 windowless_shm_pixmap_(None), | 39 windowless_shm_pixmap_(None), |
39 pixmap_(NULL), | 40 pixmap_(NULL), |
40 first_event_time_(-1.0), | 41 first_event_time_(-1.0), |
41 plug_(NULL), | 42 plug_(NULL), |
42 socket_(NULL), | 43 socket_(NULL), |
43 quirks_(0), | 44 quirks_(0), |
44 handle_event_depth_(0), | 45 handle_event_depth_(0), |
45 first_set_window_call_(true), | 46 first_set_window_call_(true), |
46 plugin_has_focus_(false), | 47 plugin_has_focus_(false), |
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
741 // it. There is a nasty race condition here with the multiprocess browser | 742 // it. There is a nasty race condition here with the multiprocess browser |
742 // as someone might be setting the cursor in the main process as well. | 743 // as someone might be setting the cursor in the main process as well. |
743 *cursor = current_windowless_cursor_; | 744 *cursor = current_windowless_cursor_; |
744 } | 745 } |
745 #endif | 746 #endif |
746 | 747 |
747 return ret; | 748 return ret; |
748 } | 749 } |
749 | 750 |
750 } // namespace content | 751 } // namespace content |
OLD | NEW |