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

Side by Side Diff: webkit/glue/webplugin_impl.h

Issue 18768: POSIX: gfx::NativeViewId and CrossProcessEvent (Closed)
Patch Set: Addressing Brett's comments Created 11 years, 10 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
« no previous file with comments | « webkit/glue/webplugin.h ('k') | webkit/glue/webplugin_impl.cc » ('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 #ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_ 5 #ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_
6 #define WEBKIT_GLUE_WEBPLUGIN_IMPL_H_ 6 #define WEBKIT_GLUE_WEBPLUGIN_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
11 11
12 #include "config.h" 12 #include "config.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/gfx/native_widget_types.h"
14 15
15 MSVC_PUSH_WARNING_LEVEL(0); 16 MSVC_PUSH_WARNING_LEVEL(0);
16 #include "ResourceHandle.h" 17 #include "ResourceHandle.h"
17 #include "ResourceHandleClient.h" 18 #include "ResourceHandleClient.h"
18 #include "ResourceRequest.h" 19 #include "ResourceRequest.h"
19 #include "Widget.h" 20 #include "Widget.h"
20 MSVC_POP_WARNING(); 21 MSVC_POP_WARNING();
21 22
22 #include "base/basictypes.h" 23 #include "base/basictypes.h"
23 #include "base/scoped_ptr.h" 24 #include "base/scoped_ptr.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 140
140 private: 141 private:
141 friend class WebPluginContainer; 142 friend class WebPluginContainer;
142 143
143 WebPluginImpl(WebCore::Element *element, WebFrameImpl *frame, 144 WebPluginImpl(WebCore::Element *element, WebFrameImpl *frame,
144 WebPluginDelegate* delegate, const GURL& plugin_url, 145 WebPluginDelegate* delegate, const GURL& plugin_url,
145 bool load_manually, const std::string& mime_type, 146 bool load_manually, const std::string& mime_type,
146 int arg_count, char** arg_names, char** arg_values); 147 int arg_count, char** arg_names, char** arg_values);
147 148
148 // WebPlugin implementation: 149 // WebPlugin implementation:
149 void SetWindow(HWND window, HANDLE pump_messages_event); 150 void SetWindow(gfx::NativeView window, HANDLE pump_messages_event);
150 151
151 // Given a (maybe partial) url, completes using the base url. 152 // Given a (maybe partial) url, completes using the base url.
152 bool CompleteURL(const std::string& url_in, std::string* url_out); 153 bool CompleteURL(const std::string& url_in, std::string* url_out);
153 154
154 // Executes the script passed in. The notify_needed and notify_data arguments 155 // Executes the script passed in. The notify_needed and notify_data arguments
155 // are passed in by the plugin process. These indicate whether the plugin 156 // are passed in by the plugin process. These indicate whether the plugin
156 // expects a notification on script execution. We pass them back to the 157 // expects a notification on script execution. We pass them back to the
157 // plugin as is. This avoids having to track the notification arguments 158 // plugin as is. This avoids having to track the notification arguments
158 // in the plugin process. 159 // in the plugin process.
159 bool ExecuteScript(const std::string& url, const std::wstring& script, 160 bool ExecuteScript(const std::string& url, const std::wstring& script,
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 struct ClientInfo { 317 struct ClientInfo {
317 int id; 318 int id;
318 WebPluginResourceClient* client; 319 WebPluginResourceClient* client;
319 WebCore::ResourceRequest request; 320 WebCore::ResourceRequest request;
320 RefPtr<WebCore::ResourceHandle> handle; 321 RefPtr<WebCore::ResourceHandle> handle;
321 }; 322 };
322 323
323 std::vector<ClientInfo> clients_; 324 std::vector<ClientInfo> clients_;
324 325
325 bool windowless_; 326 bool windowless_;
326 HWND window_; 327 gfx::NativeView window_;
327 WebCore::Element* element_; 328 WebCore::Element* element_;
328 WebFrameImpl* webframe_; 329 WebFrameImpl* webframe_;
329 330
330 WebPluginDelegate* delegate_; 331 WebPluginDelegate* delegate_;
331 bool visible_; 332 bool visible_;
332 333
333 WebPluginContainer* widget_; 334 WebPluginContainer* widget_;
334 335
335 typedef std::map<WebPluginResourceClient*, MultipartResponseDelegate*> 336 typedef std::map<WebPluginResourceClient*, MultipartResponseDelegate*>
336 MultiPartResponseHandlerMap; 337 MultiPartResponseHandlerMap;
(...skipping 16 matching lines...) Expand all
353 // Holds the list of argument names passed to the plugin. 354 // Holds the list of argument names passed to the plugin.
354 std::vector<std::string> arg_names_; 355 std::vector<std::string> arg_names_;
355 356
356 // Holds the list of argument values passed to the plugin. 357 // Holds the list of argument values passed to the plugin.
357 std::vector<std::string> arg_values_; 358 std::vector<std::string> arg_values_;
358 359
359 DISALLOW_COPY_AND_ASSIGN(WebPluginImpl); 360 DISALLOW_COPY_AND_ASSIGN(WebPluginImpl);
360 }; 361 };
361 362
362 #endif // #ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_ 363 #endif // #ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/glue/webplugin.h ('k') | webkit/glue/webplugin_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698