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

Side by Side Diff: content/child/npapi/webplugin_delegate_impl_gtk.cc

Issue 19761007: Move NPAPI implementation out of webkit/plugins/npapi and into content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 7 years, 5 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
OLDNEW
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 "webkit/plugins/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>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/metrics/stats_counters.h" 13 #include "base/metrics/stats_counters.h"
14 #include "content/child/npapi/plugin_instance.h"
15 #include "content/child/npapi/webplugin.h"
14 #include "skia/ext/platform_canvas.h" 16 #include "skia/ext/platform_canvas.h"
15 #include "third_party/WebKit/public/web/WebInputEvent.h" 17 #include "third_party/WebKit/public/web/WebInputEvent.h"
16 #include "ui/base/gtk/gtk_compat.h" 18 #include "ui/base/gtk/gtk_compat.h"
17 #include "ui/gfx/blit.h" 19 #include "ui/gfx/blit.h"
18 #include "webkit/common/cursors/webcursor.h" 20 #include "webkit/common/cursors/webcursor.h"
19 #include "webkit/plugins/npapi/plugin_instance.h"
20 #include "webkit/plugins/npapi/webplugin.h"
21 #include "webkit/plugins/plugin_constants.h" 21 #include "webkit/plugins/plugin_constants.h"
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 webkit { 29 namespace content {
30 namespace npapi {
31 30
32 WebPluginDelegateImpl::WebPluginDelegateImpl( 31 WebPluginDelegateImpl::WebPluginDelegateImpl(
33 PluginInstance* instance) 32 PluginInstance* instance)
34 : windowed_handle_(0), 33 : windowed_handle_(0),
35 windowed_did_set_window_(false), 34 windowed_did_set_window_(false),
36 windowless_(false), 35 windowless_(false),
37 plugin_(NULL), 36 plugin_(NULL),
38 instance_(instance), 37 instance_(instance),
39 windowless_shm_pixmap_(None), 38 windowless_shm_pixmap_(None),
40 pixmap_(NULL), 39 pixmap_(NULL),
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 // Snag a reference to the current cursor ASAP in case the plugin modified 741 // Snag a reference to the current cursor ASAP in case the plugin modified
743 // 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
744 // 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.
745 *cursor = current_windowless_cursor_; 744 *cursor = current_windowless_cursor_;
746 } 745 }
747 #endif 746 #endif
748 747
749 return ret; 748 return ret;
750 } 749 }
751 750
752 } // namespace npapi 751 } // namespace content
753 } // namespace webkit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698