| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "content/browser/renderer_host/render_widget_host_view_mac.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_mac.h" |
| 6 | 6 |
| 7 #import <objc/runtime.h> | 7 #import <objc/runtime.h> |
| 8 #include <OpenGL/gl.h> | 8 #include <OpenGL/gl.h> |
| 9 #include <QuartzCore/QuartzCore.h> | 9 #include <QuartzCore/QuartzCore.h> |
| 10 | 10 |
| (...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 822 if (!render_widget_host_) | 822 if (!render_widget_host_) |
| 823 return; | 823 return; |
| 824 render_widget_host_->NotifyScreenInfoChanged(); | 824 render_widget_host_->NotifyScreenInfoChanged(); |
| 825 } | 825 } |
| 826 | 826 |
| 827 RenderWidgetHost* RenderWidgetHostViewMac::GetRenderWidgetHost() const { | 827 RenderWidgetHost* RenderWidgetHostViewMac::GetRenderWidgetHost() const { |
| 828 return render_widget_host_; | 828 return render_widget_host_; |
| 829 } | 829 } |
| 830 | 830 |
| 831 void RenderWidgetHostViewMac::Show() { | 831 void RenderWidgetHostViewMac::Show() { |
| 832 ScopedCAActionDisabler disabler; |
| 832 [cocoa_view_ setHidden:NO]; | 833 [cocoa_view_ setHidden:NO]; |
| 833 if (!render_widget_host_->is_hidden()) | 834 if (!render_widget_host_->is_hidden()) |
| 834 return; | 835 return; |
| 835 | 836 |
| 836 WasUnOccluded(); | 837 WasUnOccluded(); |
| 837 | 838 |
| 838 // If there is not a frame being currently drawn, kick one, so that the below | 839 // If there is not a frame being currently drawn, kick one, so that the below |
| 839 // pause will have a frame to wait on. | 840 // pause will have a frame to wait on. |
| 840 render_widget_host_->ScheduleComposite(); | 841 render_widget_host_->ScheduleComposite(); |
| 841 PauseForPendingResizeOrRepaintsAndDraw(); | 842 PauseForPendingResizeOrRepaintsAndDraw(); |
| 842 } | 843 } |
| 843 | 844 |
| 844 void RenderWidgetHostViewMac::Hide() { | 845 void RenderWidgetHostViewMac::Hide() { |
| 846 ScopedCAActionDisabler disabler; |
| 845 [cocoa_view_ setHidden:YES]; | 847 [cocoa_view_ setHidden:YES]; |
| 846 WasOccluded(); | 848 WasOccluded(); |
| 847 DestroySuspendedBrowserCompositorViewIfNeeded(); | 849 DestroySuspendedBrowserCompositorViewIfNeeded(); |
| 848 } | 850 } |
| 849 | 851 |
| 850 void RenderWidgetHostViewMac::WasUnOccluded() { | 852 void RenderWidgetHostViewMac::WasUnOccluded() { |
| 851 if (!render_widget_host_->is_hidden()) | 853 if (!render_widget_host_->is_hidden()) |
| 852 return; | 854 return; |
| 853 | 855 |
| 854 ui::LatencyInfo renderer_latency_info; | 856 ui::LatencyInfo renderer_latency_info; |
| (...skipping 2576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3431 | 3433 |
| 3432 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding | 3434 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding |
| 3433 // regions that are not draggable. (See ControlRegionView in | 3435 // regions that are not draggable. (See ControlRegionView in |
| 3434 // native_app_window_cocoa.mm). This requires the render host view to be | 3436 // native_app_window_cocoa.mm). This requires the render host view to be |
| 3435 // draggable by default. | 3437 // draggable by default. |
| 3436 - (BOOL)mouseDownCanMoveWindow { | 3438 - (BOOL)mouseDownCanMoveWindow { |
| 3437 return YES; | 3439 return YES; |
| 3438 } | 3440 } |
| 3439 | 3441 |
| 3440 @end | 3442 @end |
| OLD | NEW |