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

Side by Side Diff: webkit/plugins/ppapi/ppapi_plugin_instance.h

Issue 6720001: PPB_CursorControl_Dev.SetCursor: Add support for custom cursor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix warning on Mac. Created 9 years, 9 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 | « ppapi/example/example.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.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) 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 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
6 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 void CommitBackingTexture(); 123 void CommitBackingTexture();
124 124
125 // Called when the out-of-process plugin implementing this instance crashed. 125 // Called when the out-of-process plugin implementing this instance crashed.
126 void InstanceCrashed(); 126 void InstanceCrashed();
127 127
128 // PPB_Instance implementation. 128 // PPB_Instance implementation.
129 PP_Var GetWindowObject(); 129 PP_Var GetWindowObject();
130 PP_Var GetOwnerElementObject(); 130 PP_Var GetOwnerElementObject();
131 bool BindGraphics(PP_Resource graphics_id); 131 bool BindGraphics(PP_Resource graphics_id);
132 bool full_frame() const { return full_frame_; } 132 bool full_frame() const { return full_frame_; }
133 bool SetCursor(PP_CursorType_Dev type); 133 bool SetCursor(PP_CursorType_Dev type,
134 PP_Resource custom_image,
135 const PP_Point* hot_spot);
brettw 2011/03/23 02:08:02 I'd pass this as a ref. We pass pointers in the C
yzshen1 2011/03/23 17:24:35 If |type| is not PP_CURSORTYPE_CUSTOM, |hot_spot|
134 PP_Var ExecuteScript(PP_Var script, PP_Var* exception); 136 PP_Var ExecuteScript(PP_Var script, PP_Var* exception);
135 137
136 // PPP_Instance pass-through. 138 // PPP_Instance pass-through.
137 void Delete(); 139 void Delete();
138 bool Initialize(WebKit::WebPluginContainer* container, 140 bool Initialize(WebKit::WebPluginContainer* container,
139 const std::vector<std::string>& arg_names, 141 const std::vector<std::string>& arg_names,
140 const std::vector<std::string>& arg_values, 142 const std::vector<std::string>& arg_values,
141 bool full_frame); 143 bool full_frame);
142 bool HandleDocumentLoad(PPB_URLLoader_Impl* loader); 144 bool HandleDocumentLoad(PPB_URLLoader_Impl* loader);
143 bool HandleInputEvent(const WebKit::WebInputEvent& event, 145 bool HandleInputEvent(const WebKit::WebInputEvent& event,
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 typedef std::map<NPObject*, ObjectVar*> NPObjectToObjectVarMap; 373 typedef std::map<NPObject*, ObjectVar*> NPObjectToObjectVarMap;
372 NPObjectToObjectVarMap np_object_to_object_var_; 374 NPObjectToObjectVarMap np_object_to_object_var_;
373 375
374 DISALLOW_COPY_AND_ASSIGN(PluginInstance); 376 DISALLOW_COPY_AND_ASSIGN(PluginInstance);
375 }; 377 };
376 378
377 } // namespace ppapi 379 } // namespace ppapi
378 } // namespace webkit 380 } // namespace webkit
379 381
380 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 382 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
OLDNEW
« no previous file with comments | « ppapi/example/example.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698