summaryrefslogtreecommitdiffstats
path: root/content/renderer
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-15 23:04:24 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-15 23:04:24 +0000
commitceadc397e01759ce1fb876f35357427766b70c2a (patch)
tree2d2ba77bcc48065140a88545801415574241fb2f /content/renderer
parent9af75df68c6103002f27298dee8e53574457a1ab (diff)
downloadchromium_src-ceadc397e01759ce1fb876f35357427766b70c2a.zip
chromium_src-ceadc397e01759ce1fb876f35357427766b70c2a.tar.gz
chromium_src-ceadc397e01759ce1fb876f35357427766b70c2a.tar.bz2
Move fullscreen and instance to the new thunk system.
This takes it in a slightl different direction. Rather than maintaining separate APIs, proxies, and impls for each interface, I think smaller instance-related interfaces can just be added on the Instance_API. There's no need for binary compatibility here and it saves a whole lot of boilerplate. Although PPB_Instance_API will get large, this isn't necessarily bad, and is probably more clear than the alternative (it saves a whole lot of code). This means that the interface IDs no longer have a 1:1 mapping to interface names. But this was already going to be the case when we have multiple versions of different interfaces. Currently the code in dispatcher to deal with this is a bit weird, because of the way the mapping works. Long term, I'm going to change these from interface IDs in the proxy to API IDs in the thunk layer. This adds APIs and thunks for several other interfaces without implementing them yet (this patch was getting too large): URL loading and surface 3D. TEST=ppapi tests BUG=none Review URL: http://codereview.chromium.org/7058015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89265 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r--content/renderer/pepper_plugin_delegate_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc
index 548990e..fe91c6d 100644
--- a/content/renderer/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper_plugin_delegate_impl.cc
@@ -1168,7 +1168,7 @@ int32_t PepperPluginDelegateImpl::ShowContextMenu(
webkit::ppapi::PPB_Flash_Menu_Impl* menu,
const gfx::Point& position) {
int32 render_widget_id = render_view_->routing_id();
- if (instance->IsFullscreen()) {
+ if (instance->IsFullscreen(instance->pp_instance())) {
webkit::ppapi::FullscreenContainer* container =
instance->fullscreen_container();
DCHECK(container);
@@ -1188,7 +1188,7 @@ int32_t PepperPluginDelegateImpl::ShowContextMenu(
params.custom_items = menu->menu_data();
// Transform the position to be in render view's coordinates.
- if (instance->IsFullscreen()) {
+ if (instance->IsFullscreen(instance->pp_instance())) {
WebKit::WebRect rect = render_view_->windowRect();
params.x -= rect.x;
params.y -= rect.y;