MacViews: Initial skeleton for implementing NativeWidgetMac

ui/views/widget/native_widget_mac.mm

 // Copyright 2014 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 "ui/views/widget/native_widget_mac.h"
 
-#include <Cocoa/Cocoa.h>
+#import <Cocoa/Cocoa.h>
 
+#include "base/mac/scoped_nsobject.h"
 #include "ui/gfx/font_list.h"
+#import "ui/views/cocoa/bridged_content_view.h"
+#import "ui/views/cocoa/bridged_native_widget.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMac, public:
 
 NativeWidgetMac::NativeWidgetMac(internal::NativeWidgetDelegate* delegate)
-    : delegate_(delegate), window_(nil) {
+    : delegate_(delegate), bridge_(new BridgedNativeWidget) {
 }
 
 NativeWidgetMac::~NativeWidgetMac() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMac, internal::NativeWidgetPrivate implementation:
 
 void NativeWidgetMac::InitNativeWidget(const Widget::InitParams& params) {
   // TODO(tapted): Convert position into Cocoa's flipped coordinate space.
   NSRect content_rect =
       NSMakeRect(0, 0, params.bounds.width(), params.bounds.height());
   // TODO(tapted): Determine a good initial style mask from |params|.
   NSInteger style_mask = NSTitledWindowMask | NSClosableWindowMask |
                          NSMiniaturizableWindowMask | NSResizableWindowMask;
-  window_.reset([[NSWindow alloc] initWithContentRect:content_rect
-                                            styleMask:style_mask
-                                              backing:NSBackingStoreBuffered
-                                                defer:NO]);
+  base::scoped_nsobject<NSWindow> window(
+      [[NSWindow alloc] initWithContentRect:content_rect
+                                  styleMask:style_mask
+                                    backing:NSBackingStoreBuffered
+                                      defer:NO]);
+  bridge_->Init(window);
 }
 
 NonClientFrameView* NativeWidgetMac::CreateNonClientFrameView() {
   return NULL;
 }
 
 bool NativeWidgetMac::ShouldUseNativeFrame() const {
   return false;
 }
 
 bool NativeWidgetMac::ShouldWindowContentsBeTransparent() const {
   NOTIMPLEMENTED();
   return false;
 }
 
 void NativeWidgetMac::FrameTypeChanged() {
   NOTIMPLEMENTED();
 }
 
 Widget* NativeWidgetMac::GetWidget() {
   return delegate_->AsWidget();
 }
 
 const Widget* NativeWidgetMac::GetWidget() const {
   return delegate_->AsWidget();
 }
 
 gfx::NativeView NativeWidgetMac::GetNativeView() const {
-  return [window_ contentView];
+  return bridge_->ns_view();
 }
 
 gfx::NativeWindow NativeWidgetMac::GetNativeWindow() const {
-  return window_;
+  return bridge_->ns_window();
 }
 
 Widget* NativeWidgetMac::GetTopLevelWidget() {
   NOTIMPLEMENTED();
   return GetWidget();
 }
 
 const ui::Compositor* NativeWidgetMac::GetCompositor() const {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 ui::Compositor* NativeWidgetMac::GetCompositor() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 ui::Layer* NativeWidgetMac::GetLayer() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void NativeWidgetMac::ReorderNativeViews() {
-  NOTIMPLEMENTED();
+  bridge_->SetRootView(GetWidget()->GetRootView());
 }
 
 void NativeWidgetMac::ViewRemoved(View* view) {
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetMac::SetNativeWindowProperty(const char* name, void* value) {
   NOTIMPLEMENTED();
 }
 
@@ skipping 71 matching lines @@
 gfx::Rect NativeWidgetMac::GetRestoredBounds() const {
   NOTIMPLEMENTED();
   return gfx::Rect();
 }
 
 void NativeWidgetMac::SetBounds(const gfx::Rect& bounds) {
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetMac::SetSize(const gfx::Size& size) {
-  [window_ setContentSize:NSMakeSize(size.width(), size.height())];
+  [bridge_->ns_window() setContentSize:NSMakeSize(size.width(), size.height())];
 }
 
 void NativeWidgetMac::StackAbove(gfx::NativeView native_view) {
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetMac::StackAtTop() {
   NOTIMPLEMENTED();
 }
 
@@ skipping 106 matching lines @@
 
 void NativeWidgetMac::RunShellDrag(View* view,
                                    const ui::OSExchangeData& data,
                                    const gfx::Point& location,
                                    int operation,
                                    ui::DragDropTypes::DragEventSource source) {
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetMac::SchedulePaintInRect(const gfx::Rect& rect) {
-  NOTIMPLEMENTED();
+  [bridge_->ns_view() setNeedsDisplay:YES];

[sky, 2014/06/11 16:15:53]

setNeedsDisplayInRect?

[tapted, 2014/06/12 09:13:12]

Yep - well spotted :) We will definitely want this, but it needs a coordinate
transform which I want to make sure I get right. Added a TODO, since a
NOTIMPLEMENTED() here is a bit awkward for getting tests off the ground.
Something similar just came up in crrev/309483009 too

 }
 
 void NativeWidgetMac::SetCursor(gfx::NativeCursor cursor) {
   NOTIMPLEMENTED();
 }
 
 bool NativeWidgetMac::IsMouseEventsEnabled() const {
   NOTIMPLEMENTED();
   return true;
 }
@@ skipping 109 matching lines @@
 }
 
 // static
 gfx::FontList NativeWidgetPrivate::GetWindowTitleFontList() {
   NOTIMPLEMENTED();
   return gfx::FontList();
 }
 
 }  // namespace internal
 }  // namespace views