Chromium Code Reviews| 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. |
|
viettrungluu
2011/03/08 00:06:01
Does leaving in the NOTIMPLEMENTED()s result in a
piman
2011/03/08 00:55:30
Yes, 2 per frame when in full-screen, including in
|
| 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_) |
|
viettrungluu
2011/03/08 00:06:01
Why do you sometimes check |plugin_| and sometimes
piman
2011/03/08 00:55:30
The RenderWidgetFullscreenPepper checks for it bec
|
| - plugin_->SetFullscreen(false); |
| + plugin_->SetFullscreen(false, false); |
| } |
| webkit::ppapi::PluginInstance* |