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

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

Issue 10168026: Delete FunctionGroupBase from Pepper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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/ppapi/ppapi_plugin_instance.h" 5 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/linked_ptr.h" 10 #include "base/memory/linked_ptr.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 using ppapi::PPB_InputEvent_Shared; 102 using ppapi::PPB_InputEvent_Shared;
103 using ppapi::PpapiGlobals; 103 using ppapi::PpapiGlobals;
104 using ppapi::PPB_View_Shared; 104 using ppapi::PPB_View_Shared;
105 using ppapi::ScopedPPResource; 105 using ppapi::ScopedPPResource;
106 using ppapi::StringVar; 106 using ppapi::StringVar;
107 using ppapi::thunk::EnterResourceNoLock; 107 using ppapi::thunk::EnterResourceNoLock;
108 using ppapi::thunk::PPB_Buffer_API; 108 using ppapi::thunk::PPB_Buffer_API;
109 using ppapi::thunk::PPB_Graphics2D_API; 109 using ppapi::thunk::PPB_Graphics2D_API;
110 using ppapi::thunk::PPB_Graphics3D_API; 110 using ppapi::thunk::PPB_Graphics3D_API;
111 using ppapi::thunk::PPB_ImageData_API; 111 using ppapi::thunk::PPB_ImageData_API;
112 using ppapi::thunk::PPB_Instance_FunctionAPI;
113 using ppapi::Var; 112 using ppapi::Var;
114 using ppapi::ViewData; 113 using ppapi::ViewData;
115 using WebKit::WebBindings; 114 using WebKit::WebBindings;
116 using WebKit::WebCanvas; 115 using WebKit::WebCanvas;
117 using WebKit::WebCursorInfo; 116 using WebKit::WebCursorInfo;
118 using WebKit::WebDocument; 117 using WebKit::WebDocument;
119 using WebKit::WebElement; 118 using WebKit::WebElement;
120 using WebKit::WebFrame; 119 using WebKit::WebFrame;
121 using WebKit::WebInputEvent; 120 using WebKit::WebInputEvent;
122 using WebKit::WebPlugin; 121 using WebKit::WebPlugin;
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 module_(module), 298 module_(module),
300 instance_interface_(instance_interface), 299 instance_interface_(instance_interface),
301 pp_instance_(0), 300 pp_instance_(0),
302 container_(NULL), 301 container_(NULL),
303 full_frame_(false), 302 full_frame_(false),
304 sent_initial_did_change_view_(false), 303 sent_initial_did_change_view_(false),
305 suppress_did_change_view_(false), 304 suppress_did_change_view_(false),
306 has_webkit_focus_(false), 305 has_webkit_focus_(false),
307 has_content_area_focus_(false), 306 has_content_area_focus_(false),
308 find_identifier_(-1), 307 find_identifier_(-1),
308 resource_creation_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
309 plugin_find_interface_(NULL), 309 plugin_find_interface_(NULL),
310 plugin_messaging_interface_(NULL), 310 plugin_messaging_interface_(NULL),
311 plugin_mouse_lock_interface_(NULL), 311 plugin_mouse_lock_interface_(NULL),
312 plugin_input_event_interface_(NULL), 312 plugin_input_event_interface_(NULL),
313 plugin_private_interface_(NULL), 313 plugin_private_interface_(NULL),
314 plugin_pdf_interface_(NULL), 314 plugin_pdf_interface_(NULL),
315 plugin_selection_interface_(NULL), 315 plugin_selection_interface_(NULL),
316 plugin_textinput_interface_(NULL), 316 plugin_textinput_interface_(NULL),
317 plugin_zoom_interface_(NULL), 317 plugin_zoom_interface_(NULL),
318 checked_for_plugin_input_event_interface_(false), 318 checked_for_plugin_input_event_interface_(false),
(...skipping 1273 matching lines...) Expand 10 before | Expand all | Expand 10 after
1592 1592
1593 void PluginInstance::ClosePendingUserGesture(PP_Instance instance, 1593 void PluginInstance::ClosePendingUserGesture(PP_Instance instance,
1594 PP_TimeTicks timestamp) { 1594 PP_TimeTicks timestamp) {
1595 // Close the pending user gesture if the plugin had a chance to respond. 1595 // Close the pending user gesture if the plugin had a chance to respond.
1596 // Don't close the pending user gesture if the timestamps are equal since 1596 // Don't close the pending user gesture if the timestamps are equal since
1597 // there may be multiple input events with the same timestamp. 1597 // there may be multiple input events with the same timestamp.
1598 if (timestamp > pending_user_gesture_) 1598 if (timestamp > pending_user_gesture_)
1599 pending_user_gesture_ = 0.0; 1599 pending_user_gesture_ = 0.0;
1600 } 1600 }
1601 1601
1602 PPB_Instance_FunctionAPI* PluginInstance::AsPPB_Instance_FunctionAPI() {
1603 return this;
1604 }
1605
1606 PP_Bool PluginInstance::BindGraphics(PP_Instance instance, 1602 PP_Bool PluginInstance::BindGraphics(PP_Instance instance,
1607 PP_Resource device) { 1603 PP_Resource device) {
1608 if (bound_graphics_.get()) { 1604 if (bound_graphics_.get()) {
1609 if (GetBoundGraphics2D()) { 1605 if (GetBoundGraphics2D()) {
1610 GetBoundGraphics2D()->BindToInstance(NULL); 1606 GetBoundGraphics2D()->BindToInstance(NULL);
1611 } else if (GetBoundGraphics3D()) { 1607 } else if (GetBoundGraphics3D()) {
1612 GetBoundGraphics3D()->BindToInstance(false); 1608 GetBoundGraphics3D()->BindToInstance(false);
1613 } 1609 }
1614 bound_graphics_ = NULL; 1610 bound_graphics_ = NULL;
1615 } 1611 }
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
2062 screen_size_for_fullscreen_ = gfx::Size(); 2058 screen_size_for_fullscreen_ = gfx::Size();
2063 WebElement element = container_->element(); 2059 WebElement element = container_->element();
2064 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_); 2060 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
2065 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_); 2061 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
2066 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_); 2062 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
2067 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_); 2063 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
2068 } 2064 }
2069 2065
2070 } // namespace ppapi 2066 } // namespace ppapi
2071 } // namespace webkit 2067 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/ppapi_plugin_instance.h ('k') | webkit/plugins/ppapi/resource_creation_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698