| 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/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1072 return true; | 1072 return true; |
| 1073 } | 1073 } |
| 1074 | 1074 |
| 1075 void RenderWidgetHostViewMac::AckPendingSwapBuffers() { | 1075 void RenderWidgetHostViewMac::AckPendingSwapBuffers() { |
| 1076 TRACE_EVENT0("browser", "RenderWidgetHostViewMac::AckPendingSwapBuffers"); | 1076 TRACE_EVENT0("browser", "RenderWidgetHostViewMac::AckPendingSwapBuffers"); |
| 1077 while (!pending_swap_buffers_acks_.empty()) { | 1077 while (!pending_swap_buffers_acks_.empty()) { |
| 1078 if (pending_swap_buffers_acks_.front().first != 0) { | 1078 if (pending_swap_buffers_acks_.front().first != 0) { |
| 1079 RenderWidgetHostImpl::AcknowledgeBufferPresent( | 1079 RenderWidgetHostImpl::AcknowledgeBufferPresent( |
| 1080 pending_swap_buffers_acks_.front().first, | 1080 pending_swap_buffers_acks_.front().first, |
| 1081 pending_swap_buffers_acks_.front().second, | 1081 pending_swap_buffers_acks_.front().second, |
| 1082 true, | 1082 0, |
| 1083 0); | 1083 0); |
| 1084 if (render_widget_host_) { | 1084 if (render_widget_host_) { |
| 1085 render_widget_host_->AcknowledgeSwapBuffersToRenderer(); | 1085 render_widget_host_->AcknowledgeSwapBuffersToRenderer(); |
| 1086 | 1086 |
| 1087 // Send VSync parameters to compositor thread. | 1087 // Send VSync parameters to compositor thread. |
| 1088 if (compositing_iosurface_.get()) { | 1088 if (compositing_iosurface_.get()) { |
| 1089 base::TimeTicks timebase; | 1089 base::TimeTicks timebase; |
| 1090 uint32 numerator = 0, denominator = 0; | 1090 uint32 numerator = 0, denominator = 0; |
| 1091 compositing_iosurface_->GetVSyncParameters(&timebase, | 1091 compositing_iosurface_->GetVSyncParameters(&timebase, |
| 1092 &numerator, | 1092 &numerator, |
| (...skipping 2272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3365 if (!string) return NO; | 3365 if (!string) return NO; |
| 3366 | 3366 |
| 3367 // If the user is currently using an IME, confirm the IME input, | 3367 // If the user is currently using an IME, confirm the IME input, |
| 3368 // and then insert the text from the service, the same as TextEdit and Safari. | 3368 // and then insert the text from the service, the same as TextEdit and Safari. |
| 3369 [self confirmComposition]; | 3369 [self confirmComposition]; |
| 3370 [self insertText:string]; | 3370 [self insertText:string]; |
| 3371 return YES; | 3371 return YES; |
| 3372 } | 3372 } |
| 3373 | 3373 |
| 3374 @end | 3374 @end |
| OLD | NEW |