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

Unified Diff: webkit/plugins/ppapi/ppapi_webplugin_impl.cc

Issue 6625034: Clarify/fix fullscreen semantics, and add GetScreenSize (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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 side-by-side diff with in-line comments
Download patch
Index: webkit/plugins/ppapi/ppapi_webplugin_impl.cc
diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc
index 5bdc4ca72c09216b1c9caaad8af6e1a6671fae8c..8adbcf457f101798482676a0c50a29d75ee9bc75 100644
--- a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc
+++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc
@@ -96,7 +96,7 @@ NPObject* WebPluginImpl::scriptableObject() {
}
void WebPluginImpl::paint(WebCanvas* canvas, const WebRect& rect) {
- if (!instance_->IsFullscreen())
+ if (!instance_->IsFullscreenOrPending())
instance_->Paint(canvas, plugin_rect_, rect);
}
@@ -106,7 +106,7 @@ void WebPluginImpl::updateGeometry(
const WebVector<WebRect>& cut_outs_rects,
bool is_visible) {
plugin_rect_ = window_rect;
- if (!instance_->IsFullscreen())
+ if (!instance_->IsFullscreenOrPending())
instance_->ViewChanged(plugin_rect_, clip_rect);
}
@@ -127,7 +127,7 @@ bool WebPluginImpl::acceptsInputEvents() {
bool WebPluginImpl::handleInputEvent(const WebKit::WebInputEvent& event,
WebKit::WebCursorInfo& cursor_info) {
- if (instance_->IsFullscreen())
+ if (instance_->IsFullscreenOrPending())
return false;
return instance_->HandleInputEvent(event, &cursor_info);
}

Powered by Google App Engine
This is Rietveld 408576698