aura: Add fullscreen/popups to RenderWidgetHostViewAura.

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
 #include "ui/aura/hit_test.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
+#include "ui/gfx/screen.h"
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 #include "base/bind.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/renderer_host/accelerated_surface_container_linux.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #endif
 
 using WebKit::WebTouchEvent;
@@ skipping 58 matching lines @@
 void RenderWidgetHostViewAura::Init() {
   window_->Init(ui::Layer::LAYER_HAS_TEXTURE);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewAura, RenderWidgetHostView implementation:
 
 void RenderWidgetHostViewAura::InitAsPopup(
     RenderWidgetHostView* parent_host_view,
     const gfx::Rect& pos) {
-  NOTIMPLEMENTED();
-  // TODO(ivankr): there has to be an Init() call, otherwise |window_|
-  // is left uninitialized and will eventually crash.
   Init();
+  window_->SetParent(
+      static_cast<RenderWidgetHostViewAura*>(parent_host_view)->window_);

[Ben Goodger (Google), 2011/10/27 22:56:11]

It seems like these should be parented to the menu container. Reason is if you
just do this we will not send events outside the bounds of the parent.
Perhaps we need to stow some state on window_ in this case and then
SetParent(NULL) to give the shell a chance to do this parenting. The popup would
be a transient of the parent_host_view's window though.

[Daniel Erat, 2011/10/28 00:53:13]

Done.  I think that it's not a transient since this class is just creating an
aura::Window directly instead of going through the NativeWidgetAura path,
though.

I used TYPE_MENU for this.  Is TYPE_POPUP more appropriate?  (The two use
different containers, and I believe that we only use InitPopup() for menus.)

+  SetBounds(pos);
+  Show();
 }
 
 void RenderWidgetHostViewAura::InitAsFullscreen(
     RenderWidgetHostView* reference_host_view) {
-  NOTIMPLEMENTED();
-  // TODO(ivankr): there has to be an Init() call, otherwise |window_|
-  // is left uninitialized and will eventually crash.
   Init();
+  window_->SetParent(aura::Desktop::GetInstance());

[sadrul, 2011/10/27 22:47:20]

Shouldn't this be parented to the default container in the shell?

[Ben Goodger (Google), 2011/10/27 22:56:11]

The menu container, to be exact.

[Daniel Erat, 2011/10/28 00:53:13]

I used TYPE_POPUP here, but that just gets treated as a regular window and
stuffed in the default container by the shell (which means that things like the
status area remain on top of it).  Should it instead be TYPE_MENU?  (If so,
TYPE_MENU should probably be renamed.)

+  window_->Fullscreen();
+  Show();
+  Focus();
+  // TODO(derat): The window is visible but it's not being updated.  Figure out
+  // why.
 }
 
 RenderWidgetHost* RenderWidgetHostViewAura::GetRenderWidgetHost() const {
   return host_;
 }
 
 void RenderWidgetHostViewAura::DidBecomeSelected() {
   host_->WasRestored();
 }
 
@@ skipping 157 matching lines @@
   RenderWidgetHostView::SetBackground(background);
   host_->SetBackground(background);
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   window_->layer()->SetFillsBoundsOpaquely(background.isOpaque());
 #endif
 }
 
 #if defined(OS_POSIX)
 void RenderWidgetHostViewAura::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
-  NOTIMPLEMENTED();
+  GetScreenInfo(results);
 }
 
 void RenderWidgetHostViewAura::GetScreenInfo(WebKit::WebScreenInfo* results) {
-  NOTIMPLEMENTED();
+  const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
+  results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
+  results->availableRect = results->rect;
+  // TODO(derat): Don't hardcode this?

[Ben Goodger (Google), 2011/10/27 22:56:11]

leave NOTIMPLEMENTED() if there is something here you don't want to see
production.

[Daniel Erat, 2011/10/28 00:53:13]

I'm okay with this being in production.  It'd ideally be exposed by
aura::Desktop or aura::Window, I think, which'd probably need to get it from the
layer...

+  results->depth = 24;
+  results->depthPerComponent = 8;
 }
 
 gfx::Rect RenderWidgetHostViewAura::GetRootWindowBounds() {
-  NOTIMPLEMENTED();
-  return gfx::Rect();
+  return aura::Desktop::GetInstance()->bounds();
 }
 #endif
 
 void RenderWidgetHostViewAura::SetVisuallyDeemphasized(const SkColor* color,
                                                        bool animate) {
   NOTIMPLEMENTED();
 }
 
 void RenderWidgetHostViewAura::UnhandledWheelEvent(
     const WebKit::WebMouseWheelEvent& event) {
@@ skipping 59 matching lines @@
 
 void RenderWidgetHostViewAura::OnFocus() {
   host_->GotFocus();
 }
 
 void RenderWidgetHostViewAura::OnBlur() {
   host_->Blur();
 }
 
 bool RenderWidgetHostViewAura::OnKeyEvent(aura::KeyEvent* event) {
-  NativeWebKeyboardEvent webkit_event(event);
-  host_->ForwardKeyboardEvent(webkit_event);
+  if (event->key_code() == ui::VKEY_ESCAPE) {

[sadrul, 2011/10/27 22:47:20]

This is only when 'IsPopup'?

[Daniel Erat, 2011/10/28 00:53:13]

Whoops, yeah (fullscreen, though).  Sorry for missing that; fixed.

+    host_->Shutdown();

[Ben Goodger (Google), 2011/10/27 22:56:11]

Side note: seems odd to me that the view has to do this. Isn't this handled by
webkit somewhere?

[Daniel Erat, 2011/10/28 00:53:13]

It's needed for Pepper Flash.

+  } else {
+    NativeWebKeyboardEvent webkit_event(event);
+    host_->ForwardKeyboardEvent(webkit_event);
+  }
   return true;
 }
 
 gfx::NativeCursor RenderWidgetHostViewAura::GetCursor(const gfx::Point& point) {
   // TODO(beng): talk to beng before implementing this.
   //NOTIMPLEMENTED();
   return gfx::kNullCursor;
 }
 
 int RenderWidgetHostViewAura::GetNonClientComponent(
     const gfx::Point& point) const {
   return HTCLIENT;
 }
 
 bool RenderWidgetHostViewAura::OnMouseEvent(aura::MouseEvent* event) {
+  // TODO: Mouse clicks don't have the desired effect on <SELECT> popups:
+  // clicking on an item closes the popup, but the item doesn't get selected.
+  // Figure out why.
   if (event->type() == ui::ET_MOUSEWHEEL)
-    host_->ForwardWheelEvent(content::MakeWebMouseWheelEvent(event));
+    host_->ForwardWheelEvent(content::MakeWebMouseWheelEvent(event, window_));
   else
-    host_->ForwardMouseEvent(content::MakeWebMouseEvent(event));
+    host_->ForwardMouseEvent(content::MakeWebMouseEvent(event, window_));
 
   // Return true so that we receive released/drag events.
   return true;
 }
 
 ui::TouchStatus RenderWidgetHostViewAura::OnTouchEvent(
     aura::TouchEvent* event) {
   // Update the touch event first.
   WebKit::WebTouchPoint* point = content::UpdateWebTouchEvent(event,
       &touch_event_);
@@ skipping 60 matching lines @@
 }
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewAura, private:
 
 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() {
   //NOTIMPLEMENTED();
   // TODO(beng): See RenderWidgetHostViewWin.
 }