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 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1153 } | 1153 } |
1154 return true; | 1154 return true; |
1155 } | 1155 } |
1156 | 1156 |
1157 void RenderWidgetHostViewMac::AckPendingSwapBuffers() { | 1157 void RenderWidgetHostViewMac::AckPendingSwapBuffers() { |
1158 TRACE_EVENT0("browser", "RenderWidgetHostViewMac::AckPendingSwapBuffers"); | 1158 TRACE_EVENT0("browser", "RenderWidgetHostViewMac::AckPendingSwapBuffers"); |
1159 while (!pending_swap_buffers_acks_.empty()) { | 1159 while (!pending_swap_buffers_acks_.empty()) { |
1160 if (pending_swap_buffers_acks_.front().first != 0) { | 1160 if (pending_swap_buffers_acks_.front().first != 0) { |
1161 AcceleratedSurfaceMsg_BufferPresented_Params ack_params; | 1161 AcceleratedSurfaceMsg_BufferPresented_Params ack_params; |
1162 ack_params.sync_point = 0; | 1162 ack_params.sync_point = 0; |
| 1163 if (compositing_iosurface_.get()) |
| 1164 ack_params.renderer_id = compositing_iosurface_->GetRendererID(); |
1163 RenderWidgetHostImpl::AcknowledgeBufferPresent( | 1165 RenderWidgetHostImpl::AcknowledgeBufferPresent( |
1164 pending_swap_buffers_acks_.front().first, | 1166 pending_swap_buffers_acks_.front().first, |
1165 pending_swap_buffers_acks_.front().second, | 1167 pending_swap_buffers_acks_.front().second, |
1166 ack_params); | 1168 ack_params); |
1167 if (render_widget_host_) { | 1169 if (render_widget_host_) { |
1168 render_widget_host_->AcknowledgeSwapBuffersToRenderer(); | 1170 render_widget_host_->AcknowledgeSwapBuffersToRenderer(); |
1169 | 1171 |
1170 // Send VSync parameters to compositor thread. | 1172 // Send VSync parameters to compositor thread. |
1171 if (compositing_iosurface_.get()) { | 1173 if (compositing_iosurface_.get()) { |
1172 base::TimeTicks timebase; | 1174 base::TimeTicks timebase; |
(...skipping 2363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3536 if (!string) return NO; | 3538 if (!string) return NO; |
3537 | 3539 |
3538 // If the user is currently using an IME, confirm the IME input, | 3540 // If the user is currently using an IME, confirm the IME input, |
3539 // and then insert the text from the service, the same as TextEdit and Safari. | 3541 // and then insert the text from the service, the same as TextEdit and Safari. |
3540 [self confirmComposition]; | 3542 [self confirmComposition]; |
3541 [self insertText:string]; | 3543 [self insertText:string]; |
3542 return YES; | 3544 return YES; |
3543 } | 3545 } |
3544 | 3546 |
3545 @end | 3547 @end |
OLD | NEW |