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 #include <QuartzCore/QuartzCore.h> | 7 #include <QuartzCore/QuartzCore.h> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 915 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
926 if (plugin_container_manager_.SurfaceShouldBeVisible(params.window)) | 926 if (plugin_container_manager_.SurfaceShouldBeVisible(params.window)) |
927 [view setHidden:NO]; | 927 [view setHidden:NO]; |
928 [view drawView]; | 928 [view drawView]; |
929 } | 929 } |
930 | 930 |
931 if (params.route_id != 0) { | 931 if (params.route_id != 0) { |
932 RenderWidgetHost::AcknowledgePostSubBuffer(params.route_id, gpu_host_id); | 932 RenderWidgetHost::AcknowledgePostSubBuffer(params.route_id, gpu_host_id); |
933 } | 933 } |
934 } | 934 } |
935 | 935 |
| 936 void RenderWidgetHostViewMac::AcceleratedSurfaceSuspend() { |
| 937 } |
| 938 |
936 void RenderWidgetHostViewMac::UpdateRootGpuViewVisibility( | 939 void RenderWidgetHostViewMac::UpdateRootGpuViewVisibility( |
937 bool show_gpu_widget) { | 940 bool show_gpu_widget) { |
938 TRACE_EVENT1("renderer_host", | 941 TRACE_EVENT1("renderer_host", |
939 "RenderWidgetHostViewMac::UpdateRootGpuViewVisibility", | 942 "RenderWidgetHostViewMac::UpdateRootGpuViewVisibility", |
940 "show", show_gpu_widget); | 943 "show", show_gpu_widget); |
941 // Plugins are destroyed on page navigate. The compositor layer on the other | 944 // Plugins are destroyed on page navigate. The compositor layer on the other |
942 // hand is created on demand and then stays alive until its renderer process | 945 // hand is created on demand and then stays alive until its renderer process |
943 // dies (usually on cross-domain navigation). Instead, only a flag | 946 // dies (usually on cross-domain navigation). Instead, only a flag |
944 // |is_accelerated_compositing_active()| is flipped when the compositor output | 947 // |is_accelerated_compositing_active()| is flipped when the compositor output |
945 // should be shown/hidden. | 948 // should be shown/hidden. |
(...skipping 1820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2766 if (!string) return NO; | 2769 if (!string) return NO; |
2767 | 2770 |
2768 // If the user is currently using an IME, confirm the IME input, | 2771 // If the user is currently using an IME, confirm the IME input, |
2769 // and then insert the text from the service, the same as TextEdit and Safari. | 2772 // and then insert the text from the service, the same as TextEdit and Safari. |
2770 [self confirmComposition]; | 2773 [self confirmComposition]; |
2771 [self insertText:string]; | 2774 [self insertText:string]; |
2772 return YES; | 2775 return YES; |
2773 } | 2776 } |
2774 | 2777 |
2775 @end | 2778 @end |
OLD | NEW |