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

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

Issue 7265009: Revert 90464 - Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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 | « ui/ui_base.gypi ('k') | webkit/tools/test_shell/mac/webwidget_host.mm » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "webkit/plugins/npapi/webplugin_delegate_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "app/win/iat_patch_function.h"
11 #include "base/file_util.h" 12 #include "base/file_util.h"
12 #include "base/lazy_instance.h" 13 #include "base/lazy_instance.h"
13 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
14 #include "base/message_loop.h" 15 #include "base/message_loop.h"
15 #include "base/metrics/stats_counters.h" 16 #include "base/metrics/stats_counters.h"
16 #include "base/string_number_conversions.h" 17 #include "base/string_number_conversions.h"
17 #include "base/string_split.h" 18 #include "base/string_split.h"
18 #include "base/string_util.h" 19 #include "base/string_util.h"
19 #include "base/stringprintf.h" 20 #include "base/stringprintf.h"
20 #include "base/version.h" 21 #include "base/version.h"
21 #include "base/win/iat_patch_function.h"
22 #include "base/win/registry.h" 22 #include "base/win/registry.h"
23 #include "base/win/windows_version.h" 23 #include "base/win/windows_version.h"
24 #include "skia/ext/platform_canvas.h" 24 #include "skia/ext/platform_canvas.h"
25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
26 #include "webkit/glue/webkit_glue.h" 26 #include "webkit/glue/webkit_glue.h"
27 #include "webkit/plugins/npapi/default_plugin_shared.h" 27 #include "webkit/plugins/npapi/default_plugin_shared.h"
28 #include "webkit/plugins/npapi/plugin_constants_win.h" 28 #include "webkit/plugins/npapi/plugin_constants_win.h"
29 #include "webkit/plugins/npapi/plugin_group.h" 29 #include "webkit/plugins/npapi/plugin_group.h"
30 #include "webkit/plugins/npapi/plugin_instance.h" 30 #include "webkit/plugins/npapi/plugin_instance.h"
31 #include "webkit/plugins/npapi/plugin_lib.h" 31 #include "webkit/plugins/npapi/plugin_lib.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // The current instance of the plugin which entered the modal loop. 68 // The current instance of the plugin which entered the modal loop.
69 WebPluginDelegateImpl* g_current_plugin_instance = NULL; 69 WebPluginDelegateImpl* g_current_plugin_instance = NULL;
70 70
71 typedef std::deque<MSG> ThrottleQueue; 71 typedef std::deque<MSG> ThrottleQueue;
72 base::LazyInstance<ThrottleQueue> g_throttle_queue(base::LINKER_INITIALIZED); 72 base::LazyInstance<ThrottleQueue> g_throttle_queue(base::LINKER_INITIALIZED);
73 base::LazyInstance<std::map<HWND, WNDPROC> > g_window_handle_proc_map( 73 base::LazyInstance<std::map<HWND, WNDPROC> > g_window_handle_proc_map(
74 base::LINKER_INITIALIZED); 74 base::LINKER_INITIALIZED);
75 75
76 76
77 // Helper object for patching the TrackPopupMenu API. 77 // Helper object for patching the TrackPopupMenu API.
78 base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_track_popup_menu( 78 base::LazyInstance<app::win::IATPatchFunction> g_iat_patch_track_popup_menu(
79 base::LINKER_INITIALIZED); 79 base::LINKER_INITIALIZED);
80 80
81 // Helper object for patching the SetCursor API. 81 // Helper object for patching the SetCursor API.
82 base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_set_cursor( 82 base::LazyInstance<app::win::IATPatchFunction> g_iat_patch_set_cursor(
83 base::LINKER_INITIALIZED); 83 base::LINKER_INITIALIZED);
84 84
85 // Helper object for patching the RegEnumKeyExW API. 85 // Helper object for patching the RegEnumKeyExW API.
86 base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_reg_enum_key_ex_w( 86 base::LazyInstance<app::win::IATPatchFunction> g_iat_patch_reg_enum_key_ex_w(
87 base::LINKER_INITIALIZED); 87 base::LINKER_INITIALIZED);
88 88
89 // http://crbug.com/16114 89 // http://crbug.com/16114
90 // Enforces providing a valid device context in NPWindow, so that NPP_SetWindow 90 // Enforces providing a valid device context in NPWindow, so that NPP_SetWindow
91 // is never called with NPNWindoTypeDrawable and NPWindow set to NULL. 91 // is never called with NPNWindoTypeDrawable and NPWindow set to NULL.
92 // Doing so allows removing NPP_SetWindow call during painting a windowless 92 // Doing so allows removing NPP_SetWindow call during painting a windowless
93 // plugin, which otherwise could trigger layout change while painting by 93 // plugin, which otherwise could trigger layout change while painting by
94 // invoking NPN_Evaluate. Which would cause bad, bad crashes. Bad crashes. 94 // invoking NPN_Evaluate. Which would cause bad, bad crashes. Bad crashes.
95 // TODO(dglazkov): If this approach doesn't produce regressions, move class to 95 // TODO(dglazkov): If this approach doesn't produce regressions, move class to
96 // webplugin_delegate_impl.h and implement for other platforms. 96 // webplugin_delegate_impl.h and implement for other platforms.
(...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after
1432 ::ReleaseCapture(); 1432 ::ReleaseCapture();
1433 break; 1433 break;
1434 1434
1435 default: 1435 default:
1436 break; 1436 break;
1437 } 1437 }
1438 } 1438 }
1439 1439
1440 } // namespace npapi 1440 } // namespace npapi
1441 } // namespace webkit 1441 } // namespace webkit
OLDNEW
« no previous file with comments | « ui/ui_base.gypi ('k') | webkit/tools/test_shell/mac/webwidget_host.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698