| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "ui/views/cocoa/bridged_native_widget.h" | 5 #import "ui/views/cocoa/bridged_native_widget.h" |
| 6 | 6 |
| 7 #import <objc/runtime.h> | 7 #import <objc/runtime.h> |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #import "base/mac/foundation_util.h" | 12 #import "base/mac/foundation_util.h" |
| 13 #include "base/mac/mac_util.h" | 13 #include "base/mac/mac_util.h" |
| 14 #import "base/mac/sdk_forward_declarations.h" | 14 #import "base/mac/sdk_forward_declarations.h" |
| 15 #include "base/memory/ptr_util.h" |
| 15 #include "base/threading/thread_task_runner_handle.h" | 16 #include "base/threading/thread_task_runner_handle.h" |
| 16 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" | 17 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" |
| 17 #import "ui/base/cocoa/constrained_window/constrained_window_animation.h" | 18 #import "ui/base/cocoa/constrained_window/constrained_window_animation.h" |
| 18 #include "ui/base/hit_test.h" | 19 #include "ui/base/hit_test.h" |
| 19 #include "ui/base/ime/input_method.h" | 20 #include "ui/base/ime/input_method.h" |
| 20 #include "ui/base/ime/input_method_factory.h" | 21 #include "ui/base/ime/input_method_factory.h" |
| 21 #include "ui/display/display.h" | 22 #include "ui/display/display.h" |
| 22 #include "ui/display/screen.h" | 23 #include "ui/display/screen.h" |
| 23 #include "ui/gfx/geometry/dip_util.h" | 24 #include "ui/gfx/geometry/dip_util.h" |
| 24 #import "ui/gfx/mac/coordinate_conversion.h" | 25 #import "ui/gfx/mac/coordinate_conversion.h" |
| (...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 969 } | 970 } |
| 970 | 971 |
| 971 void BridgedNativeWidget::CreateLayer(ui::LayerType layer_type, | 972 void BridgedNativeWidget::CreateLayer(ui::LayerType layer_type, |
| 972 bool translucent) { | 973 bool translucent) { |
| 973 DCHECK(bridged_view_); | 974 DCHECK(bridged_view_); |
| 974 DCHECK(!layer()); | 975 DCHECK(!layer()); |
| 975 | 976 |
| 976 CreateCompositor(); | 977 CreateCompositor(); |
| 977 DCHECK(compositor_); | 978 DCHECK(compositor_); |
| 978 | 979 |
| 979 SetLayer(new ui::Layer(layer_type)); | 980 SetLayer(base::MakeUnique<ui::Layer>(layer_type)); |
| 980 // Note, except for controls, this will set the layer to be hidden, since it | 981 // Note, except for controls, this will set the layer to be hidden, since it |
| 981 // is only called during Init(). | 982 // is only called during Init(). |
| 982 layer()->SetVisible(window_visible_); | 983 layer()->SetVisible(window_visible_); |
| 983 layer()->set_delegate(this); | 984 layer()->set_delegate(this); |
| 984 | 985 |
| 985 InitCompositor(); | 986 InitCompositor(); |
| 986 | 987 |
| 987 // Transparent window support. | 988 // Transparent window support. |
| 988 layer()->GetCompositor()->SetHostHasTransparentBackground(translucent); | 989 layer()->GetCompositor()->SetHostHasTransparentBackground(translucent); |
| 989 layer()->SetFillsBoundsOpaquely(!translucent); | 990 layer()->SetFillsBoundsOpaquely(!translucent); |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1392 [bridged_view_ setMouseDownCanMoveWindow:draggable]; | 1393 [bridged_view_ setMouseDownCanMoveWindow:draggable]; |
| 1393 // AppKit will not update its cache of mouseDownCanMoveWindow unless something | 1394 // AppKit will not update its cache of mouseDownCanMoveWindow unless something |
| 1394 // changes. Previously we tried adding an NSView and removing it, but for some | 1395 // changes. Previously we tried adding an NSView and removing it, but for some |
| 1395 // reason it required reposting the mouse-down event, and didn't always work. | 1396 // reason it required reposting the mouse-down event, and didn't always work. |
| 1396 // Calling the below seems to be an effective solution. | 1397 // Calling the below seems to be an effective solution. |
| 1397 [window_ setMovableByWindowBackground:NO]; | 1398 [window_ setMovableByWindowBackground:NO]; |
| 1398 [window_ setMovableByWindowBackground:YES]; | 1399 [window_ setMovableByWindowBackground:YES]; |
| 1399 } | 1400 } |
| 1400 | 1401 |
| 1401 } // namespace views | 1402 } // namespace views |
| OLD | NEW |