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

Unified Diff: chrome/renderer/render_widget_fullscreen_pepper.cc

Issue 6625034: Clarify/fix fullscreen semantics, and add GetScreenSize (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix review comments 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
« no previous file with comments | « chrome/renderer/pepper_plugin_delegate_impl.cc ('k') | ppapi/c/dev/ppb_fullscreen_dev.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_widget_fullscreen_pepper.cc
diff --git a/chrome/renderer/render_widget_fullscreen_pepper.cc b/chrome/renderer/render_widget_fullscreen_pepper.cc
index 27b48cd45e9f3c1474dda7dbcc3a188212faa52a..7e5101a606ef3207878ef03e51183c42089d7108 100644
--- a/chrome/renderer/render_widget_fullscreen_pepper.cc
+++ b/chrome/renderer/render_widget_fullscreen_pepper.cc
@@ -63,8 +63,6 @@ class PepperWidget : public WebWidget {
}
virtual void paint(WebCanvas* canvas, const WebRect& rect) {
- if (!plugin_)
- return;
WebRect plugin_rect(0, 0, size_.width, size_.height);
plugin_->Paint(canvas, plugin_rect, rect);
}
@@ -84,8 +82,6 @@ class PepperWidget : public WebWidget {
}
virtual bool handleInputEvent(const WebInputEvent& event) {
- if (!plugin_)
- return false;
return plugin_->HandleInputEvent(event, &cursor_);
}
@@ -97,46 +93,40 @@ class PepperWidget : public WebWidget {
NOTIMPLEMENTED();
}
+ // TODO(piman): figure out IME and implement these if necessary.
virtual bool setComposition(
const WebString& text,
const WebVector<WebCompositionUnderline>& underlines,
int selectionStart,
int selectionEnd) {
- NOTIMPLEMENTED();
return false;
}
virtual bool confirmComposition() {
- NOTIMPLEMENTED();
return false;
}
virtual bool confirmComposition(const WebString& text) {
- NOTIMPLEMENTED();
return false;
}
virtual WebTextInputType textInputType() {
- NOTIMPLEMENTED();
return WebKit::WebTextInputTypeNone;
}
virtual WebRect caretOrSelectionBounds() {
- NOTIMPLEMENTED();
return WebRect();
}
virtual void setTextDirection(WebTextDirection) {
- NOTIMPLEMENTED();
}
virtual bool isAcceleratedCompositingActive() const {
- return widget_->context() && plugin_ &&
- (plugin_->GetBackingTextureId() != 0);
+ return widget_->context() && (plugin_->GetBackingTextureId() != 0);
}
private:
- webkit::ppapi::PluginInstance* plugin_;
+ scoped_refptr<webkit::ppapi::PluginInstance> plugin_;
RenderWidgetFullscreenPepper* widget_;
WebSize size_;
WebCursorInfo cursor_;
@@ -223,7 +213,7 @@ void RenderWidgetFullscreenPepper::Close() {
// If the fullscreen window is closed (e.g. user pressed escape), reset to
// normal mode.
if (plugin_)
- plugin_->SetFullscreen(false);
+ plugin_->SetFullscreen(false, false);
}
webkit::ppapi::PluginInstance*
« no previous file with comments | « chrome/renderer/pepper_plugin_delegate_impl.cc ('k') | ppapi/c/dev/ppb_fullscreen_dev.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698