Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(725)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 10663003: Merge the IPCs used for GPU process synchronization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after
1021 [cocoa_view_ displayIfNeeded]; 1021 [cocoa_view_ displayIfNeeded];
1022 } 1022 }
1023 } 1023 }
1024 return false; 1024 return false;
1025 } 1025 }
1026 1026
1027 void RenderWidgetHostViewMac::AckPendingSwapBuffers() { 1027 void RenderWidgetHostViewMac::AckPendingSwapBuffers() {
1028 TRACE_EVENT0("browser", "RenderWidgetHostViewMac::AckPendingSwapBuffers"); 1028 TRACE_EVENT0("browser", "RenderWidgetHostViewMac::AckPendingSwapBuffers");
1029 while (!pending_swap_buffers_acks_.empty()) { 1029 while (!pending_swap_buffers_acks_.empty()) {
1030 if (pending_swap_buffers_acks_.front().first != 0) { 1030 if (pending_swap_buffers_acks_.front().first != 0) {
1031 RenderWidgetHostImpl::AcknowledgeSwapBuffers( 1031 RenderWidgetHostImpl::AcknowledgeBufferPresent(
1032 pending_swap_buffers_acks_.front().first, 1032 pending_swap_buffers_acks_.front().first,
1033 pending_swap_buffers_acks_.front().second); 1033 pending_swap_buffers_acks_.front().second);
1034 } 1034 }
1035 pending_swap_buffers_acks_.erase(pending_swap_buffers_acks_.begin()); 1035 pending_swap_buffers_acks_.erase(pending_swap_buffers_acks_.begin());
1036 } 1036 }
1037 } 1037 }
1038 1038
1039 void RenderWidgetHostViewMac::AcceleratedSurfaceBuffersSwapped( 1039 void RenderWidgetHostViewMac::AcceleratedSurfaceBuffersSwapped(
1040 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, 1040 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
1041 int gpu_host_id) { 1041 int gpu_host_id) {
(...skipping 2044 matching lines...) Expand 10 before | Expand all | Expand 10 after
3086 if (!string) return NO; 3086 if (!string) return NO;
3087 3087
3088 // If the user is currently using an IME, confirm the IME input, 3088 // If the user is currently using an IME, confirm the IME input,
3089 // and then insert the text from the service, the same as TextEdit and Safari. 3089 // and then insert the text from the service, the same as TextEdit and Safari.
3090 [self confirmComposition]; 3090 [self confirmComposition];
3091 [self insertText:string]; 3091 [self insertText:string];
3092 return YES; 3092 return YES;
3093 } 3093 }
3094 3094
3095 @end 3095 @end
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_gtk.cc ('k') | content/common/gpu/gpu_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698