summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 05:54:24 +0000
committerpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 05:54:24 +0000
commit365c422975afad6b0c15442fc3b5665701a575db (patch)
tree5c7ba099714bc0daa8f9ccfab4c9630950f8e051
parent23d5f173a1e5da866d1ad04ad5b7f59e0a6fe7f1 (diff)
downloadchromium_src-365c422975afad6b0c15442fc3b5665701a575db.zip
chromium_src-365c422975afad6b0c15442fc3b5665701a575db.tar.gz
chromium_src-365c422975afad6b0c15442fc3b5665701a575db.tar.bz2
Remove unused argument that was not cleaned up in
http://codereview.chromium.org/8275031 BUG=none TEST=bots Review URL: http://codereview.chromium.org/8362021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107070 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/plugins/ppapi/ppapi_plugin_instance.cc6
-rw-r--r--webkit/plugins/ppapi/ppapi_plugin_instance.h13
2 files changed, 9 insertions, 10 deletions
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 2559fc1..fac79f1 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -425,7 +425,7 @@ void PluginInstance::InstanceCrashed() {
HostGlobals::Get()->InstanceCrashed(pp_instance());
// Free any associated graphics.
- SetFullscreen(false, false);
+ SetFullscreen(false);
FlashSetFullscreen(false, false);
bound_graphics_ = NULL;
InvalidateRect(gfx::Rect());
@@ -1156,7 +1156,7 @@ bool PluginInstance::IsFullscreenOrPending() {
return desired_fullscreen_state_;
}
-bool PluginInstance::SetFullscreen(bool fullscreen, bool delay_report) {
+bool PluginInstance::SetFullscreen(bool fullscreen) {
// Keep a reference on the stack. See NOTE above.
scoped_refptr<PluginInstance> ref(this);
@@ -1813,7 +1813,7 @@ PP_Bool PluginInstance::FlashIsFullscreen(PP_Instance instance) {
PP_Bool PluginInstance::SetFullscreen(PP_Instance instance,
PP_Bool fullscreen) {
- return PP_FromBool(SetFullscreen(PP_ToBool(fullscreen), true));
+ return PP_FromBool(SetFullscreen(PP_ToBool(fullscreen)));
}
PP_Bool PluginInstance::FlashSetFullscreen(PP_Instance instance,
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index 5ec97a3..871f712 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -272,13 +272,12 @@ class PluginInstance : public base::RefCounted<PluginInstance>,
// fullscreen_ = true
bool IsFullscreenOrPending();
- // Switches between fullscreen and normal mode. If |delay_report| is set to
- // false, it may report the new state through DidChangeView immediately. If
- // true, it will delay it. When called from the plugin, delay_report should be
- // true to avoid re-entrancy. Returns true on success, false on failure
- // (e.g. trying to enter fullscreen when not processing a user gesture or
- // trying to set fullscreen when already in fullscreen mode).
- bool SetFullscreen(bool fullscreen, bool delay_report);
+ // Switches between fullscreen and normal mode. The transition is
+ // asynchronous. WebKit will trigger corresponding VewChanged calls.
+ // Returns true on success, false on failure (e.g. trying to enter fullscreen
+ // when not processing a user gesture or trying to set fullscreen when
+ // already in fullscreen mode).
+ bool SetFullscreen(bool fullscreen);
// Implementation of PPB_Flash.
int32_t Navigate(PPB_URLRequestInfo_Impl* request,