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 955 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
980 } | 981 } |
981 | 982 |
982 void BridgedNativeWidget::CreateLayer(ui::LayerType layer_type, | 983 void BridgedNativeWidget::CreateLayer(ui::LayerType layer_type, |
983 bool translucent) { | 984 bool translucent) { |
984 DCHECK(bridged_view_); | 985 DCHECK(bridged_view_); |
985 DCHECK(!layer()); | 986 DCHECK(!layer()); |
986 | 987 |
987 CreateCompositor(); | 988 CreateCompositor(); |
988 DCHECK(compositor_); | 989 DCHECK(compositor_); |
989 | 990 |
990 SetLayer(new ui::Layer(layer_type)); | 991 SetLayer(base::MakeUnique<ui::Layer>(layer_type)); |
991 // Note, except for controls, this will set the layer to be hidden, since it | 992 // Note, except for controls, this will set the layer to be hidden, since it |
992 // is only called during Init(). | 993 // is only called during Init(). |
993 layer()->SetVisible(window_visible_); | 994 layer()->SetVisible(window_visible_); |
994 layer()->set_delegate(this); | 995 layer()->set_delegate(this); |
995 | 996 |
996 InitCompositor(); | 997 InitCompositor(); |
997 | 998 |
998 // Transparent window support. | 999 // Transparent window support. |
999 layer()->GetCompositor()->SetHostHasTransparentBackground(translucent); | 1000 layer()->GetCompositor()->SetHostHasTransparentBackground(translucent); |
1000 layer()->SetFillsBoundsOpaquely(!translucent); | 1001 layer()->SetFillsBoundsOpaquely(!translucent); |
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1402 [bridged_view_ setMouseDownCanMoveWindow:draggable]; | 1403 [bridged_view_ setMouseDownCanMoveWindow:draggable]; |
1403 // AppKit will not update its cache of mouseDownCanMoveWindow unless something | 1404 // AppKit will not update its cache of mouseDownCanMoveWindow unless something |
1404 // changes. Previously we tried adding an NSView and removing it, but for some | 1405 // changes. Previously we tried adding an NSView and removing it, but for some |
1405 // reason it required reposting the mouse-down event, and didn't always work. | 1406 // reason it required reposting the mouse-down event, and didn't always work. |
1406 // Calling the below seems to be an effective solution. | 1407 // Calling the below seems to be an effective solution. |
1407 [window_ setMovableByWindowBackground:NO]; | 1408 [window_ setMovableByWindowBackground:NO]; |
1408 [window_ setMovableByWindowBackground:YES]; | 1409 [window_ setMovableByWindowBackground:YES]; |
1409 } | 1410 } |
1410 | 1411 |
1411 } // namespace views | 1412 } // namespace views |
OLD | NEW |