MacViews: Implement Tab Dragging

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"
 
 #import <Cocoa/Cocoa.h>
 
 #include <utility>
 
@@ skipping 19 matching lines @@
 @interface ViewsNSWindowCloseAnimator : NSObject<NSAnimationDelegate> {
  @private
   base::scoped_nsobject<NSWindow> window_;
   base::scoped_nsobject<NSAnimation> animation_;
 }
 
 + (void)closeWindowWithAnimation:(NSWindow*)window;
 
 @end
 
+extern "C" {
+
+typedef int32_t CGSWindow;
+typedef int32_t CGSConnection;
+CGSConnection _CGSDefaultConnection();
+OSStatus CGSGetWindowBounds(
+    CGSConnection connection, CGSWindow window, CGRect* bounds);
+
+}
+
 namespace views {
 namespace {
 
 NSInteger StyleMaskForParams(const Widget::InitParams& params) {
   // If the Widget is modal, it will be displayed as a sheet. This works best if
   // it has NSTitledWindowMask. For example, with NSBorderlessWindowMask, the
   // parent window still accepts input.
   if (params.delegate &&
       params.delegate->GetModalType() == ui::MODAL_TYPE_WINDOW)
     return NSTitledWindowMask;
 
   // TODO(tapted): Determine better masks when there are use cases for it.
   if (params.remove_standard_frame)
     return NSBorderlessWindowMask;
 
   if (params.type == Widget::InitParams::TYPE_WINDOW) {
     return NSTitledWindowMask | NSClosableWindowMask |
            NSMiniaturizableWindowMask | NSResizableWindowMask |
            NSTexturedBackgroundWindowMask;
   }
   return NSBorderlessWindowMask;
 }
 
+// -[NSWindow frame] doesn't update during a window drag. This is not what
+// toolkit-views expects, so ask the window server directly.
+NSRect FrameIncludingDrag(NSWindow* window) {
+  CGRect bounds = NSZeroRect;
+  CGSGetWindowBounds(_CGSDefaultConnection(), [window windowNumber], &bounds);
+  NSRect rect = ScreenRectToNSRect(gfx::Rect(bounds));
+
+  // If no mouse buttons are down, there is no drag. So it should match the
+  // window frame.
+  //DCHECK([NSEvent pressedMouseButtons] == 0 ||

[tapted, 2016/03/10 11:51:19]

This DCHECK would actually fail, which surprised me. I think we actually need to
get the origin from the window server and the size from [window frame] to ensure
that the window layout is in-step, synchronously with NSEvents that cause it.
But also I think we should only use FrameIncludingDrag at all when there's a
RunMoveLoop installed -- I think using it in other places could lead to test
flakiness because of asynchronous stuff around the window server.

[themblsha, 2016/03/10 17:18:58]

Done.

+  //       NSEqualRects(rect, [window frame]));
+  return rect;
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMac, public:
 
 NativeWidgetMac::NativeWidgetMac(internal::NativeWidgetDelegate* delegate)
     : delegate_(delegate),
       bridge_(new BridgedNativeWidget(this)),
       ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) {
 }
@@ skipping 121 matching lines @@
 
 void NativeWidgetMac::ReorderNativeViews() {
   if (bridge_)
     bridge_->SetRootView(GetWidget()->GetRootView());
 }
 
 void NativeWidgetMac::ViewRemoved(View* view) {
   // TODO(tapted): Something for drag and drop might be needed here in future.
   // See http://crbug.com/464581. A NOTIMPLEMENTED() here makes a lot of spam,
   // so only emit it when a drag and drop could be likely.
-  if (IsMouseButtonDown())
-    NOTIMPLEMENTED();
+  // if (IsMouseButtonDown())

[tapted, 2016/03/10 11:51:19]

nit: uncomment (sorry for the log spam - drag and drop is still in the
pipeline).

[themblsha, 2016/03/10 17:18:58]

Done.

+  //   NOTIMPLEMENTED();
 }
 
 void NativeWidgetMac::SetNativeWindowProperty(const char* name, void* value) {
   if (bridge_)
     bridge_->SetNativeWindowProperty(name, value);
 }
 
 void* NativeWidgetMac::GetNativeWindowProperty(const char* name) const {
   if (bridge_)
     return bridge_->GetNativeWindowProperty(name);
@@ skipping 73 matching lines @@
   // Everyhing happens upon show.
 }
 
 gfx::Rect NativeWidgetMac::GetWindowBoundsInScreen() const {
   return gfx::ScreenRectFromNSRect([GetNativeWindow() frame]);
 }
 
 gfx::Rect NativeWidgetMac::GetClientAreaBoundsInScreen() const {
   NSWindow* window = GetNativeWindow();
   return gfx::ScreenRectFromNSRect(
-      [window contentRectForFrameRect:[window frame]]);
+      [window contentRectForFrameRect:FrameIncludingDrag(window)]);
 }
 
 gfx::Rect NativeWidgetMac::GetRestoredBounds() const {
   return bridge_ ? bridge_->GetRestoredBounds() : gfx::Rect();
 }
 
 void NativeWidgetMac::SetBounds(const gfx::Rect& bounds) {
   if (bridge_)
     bridge_->SetBounds(bounds);
 }
@@ skipping 231 matching lines @@
 }
 
 gfx::Rect NativeWidgetMac::GetWorkAreaBoundsInScreen() const {
   return gfx::ScreenRectFromNSRect([[GetNativeWindow() screen] visibleFrame]);
 }
 
 Widget::MoveLoopResult NativeWidgetMac::RunMoveLoop(
     const gfx::Vector2d& drag_offset,
     Widget::MoveLoopSource source,
     Widget::MoveLoopEscapeBehavior escape_behavior) {
-  NOTIMPLEMENTED();
-  return Widget::MOVE_LOOP_CANCELED;
+  if (!bridge_)
+    return Widget::MOVE_LOOP_CANCELED;
+
+  return bridge_->RunMoveLoop(drag_offset);
 }
 
 void NativeWidgetMac::EndMoveLoop() {
-  NOTIMPLEMENTED();
+  if (bridge_)
+    bridge_->EndMoveLoop();
 }
 
 void NativeWidgetMac::SetVisibilityChangedAnimationsEnabled(bool value) {
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetMac::SetVisibilityAnimationDuration(
     const base::TimeDelta& duration) {
   NOTIMPLEMENTED();
 }
@@ skipping 166 matching lines @@
   [[ViewsNSWindowCloseAnimator alloc] initWithWindow:window];
 }
 
 - (void)animationDidEnd:(NSAnimation*)animation {
   [window_ close];
   [animation_ setDelegate:nil];
   [self release];
 }
 
 @end