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

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

Issue 11099037: Plumb through surface size for --enable-partial-swaps on OSX (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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
« no previous file with comments | « no previous file | content/common/gpu/gpu_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after
1221 "RenderWidgetHostViewMac::AcceleratedSurfacePostSubBuffer"); 1221 "RenderWidgetHostViewMac::AcceleratedSurfacePostSubBuffer");
1222 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 1222 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1223 1223
1224 pending_swap_buffers_acks_.push_back(std::make_pair(params.route_id, 1224 pending_swap_buffers_acks_.push_back(std::make_pair(params.route_id,
1225 gpu_host_id)); 1225 gpu_host_id));
1226 1226
1227 // Compositor window is always gfx::kNullPluginWindow. 1227 // Compositor window is always gfx::kNullPluginWindow.
1228 // TODO(jbates) http://crbug.com/105344 This will be removed when there are no 1228 // TODO(jbates) http://crbug.com/105344 This will be removed when there are no
1229 // plugin windows. 1229 // plugin windows.
1230 if (params.window == gfx::kNullPluginWindow) { 1230 if (params.window == gfx::kNullPluginWindow) {
1231 NOTIMPLEMENTED(); 1231 if (CompositorSwapBuffers(params.surface_handle, params.surface_size))
1232 AckPendingSwapBuffers(); 1232 AckPendingSwapBuffers();
1233 } else { 1233 } else {
1234 // Deprecated accelerated plugin code path. 1234 // Deprecated accelerated plugin code path.
1235 AcceleratedPluginView* view = ViewForPluginWindowHandle(params.window); 1235 AcceleratedPluginView* view = ViewForPluginWindowHandle(params.window);
1236 DCHECK(view); 1236 DCHECK(view);
1237 if (view) { 1237 if (view) {
1238 plugin_container_manager_.SetSurfaceWasPaintedTo( 1238 plugin_container_manager_.SetSurfaceWasPaintedTo(
1239 params.window, 1239 params.window,
1240 params.surface_handle, 1240 params.surface_handle,
1241 gfx::Rect(params.x, params.y, params.width, params.height)); 1241 gfx::Rect(params.x, params.y, params.width, params.height));
1242 1242
(...skipping 2056 matching lines...) Expand 10 before | Expand all | Expand 10 after
3299 if (!string) return NO; 3299 if (!string) return NO;
3300 3300
3301 // If the user is currently using an IME, confirm the IME input, 3301 // If the user is currently using an IME, confirm the IME input,
3302 // and then insert the text from the service, the same as TextEdit and Safari. 3302 // and then insert the text from the service, the same as TextEdit and Safari.
3303 [self confirmComposition]; 3303 [self confirmComposition];
3304 [self insertText:string]; 3304 [self insertText:string];
3305 return YES; 3305 return YES;
3306 } 3306 }
3307 3307
3308 @end 3308 @end
OLDNEW
« no previous file with comments | « no previous file | content/common/gpu/gpu_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698