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

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

Issue 7980006: Implement OSMesa image transport for TOUCH_UI builds (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebase onto newer trunk Created 9 years, 3 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/renderer_host/render_widget_host_view_mac.h" 5 #include "chrome/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 <cmath> 9 #include <cmath>
10 10
(...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after
871 871
872 AcceleratedPluginView* RenderWidgetHostViewMac::ViewForPluginWindowHandle( 872 AcceleratedPluginView* RenderWidgetHostViewMac::ViewForPluginWindowHandle(
873 gfx::PluginWindowHandle window) { 873 gfx::PluginWindowHandle window) {
874 PluginViewMap::iterator it = plugin_views_.find(window); 874 PluginViewMap::iterator it = plugin_views_.find(window);
875 DCHECK(plugin_views_.end() != it); 875 DCHECK(plugin_views_.end() != it);
876 if (plugin_views_.end() == it) 876 if (plugin_views_.end() == it)
877 return nil; 877 return nil;
878 return it->second; 878 return it->second;
879 } 879 }
880 880
881 void RenderWidgetHostViewMac::AcceleratedSurfaceSetIOSurface( 881 void RenderWidgetHostViewMac::AcceleratedSurfaceNew(
jonathan.backer 2011/09/21 20:27:36 I'm not sure it makes sense to rename this yet. Cu
danakj 2011/09/21 20:58:20 To have a different name means a number of places
882 gfx::PluginWindowHandle window, 882 gfx::PluginWindowHandle window,
883 int32 width, 883 int32 width,
884 int32 height, 884 int32 height,
885 uint64 io_surface_identifier) { 885 uint64 io_surface_identifier) {
886 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 886 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
887 plugin_container_manager_.SetSizeAndIOSurface(window, 887 plugin_container_manager_.SetSizeAndIOSurface(window,
888 width, 888 width,
889 height, 889 height,
890 io_surface_identifier); 890 io_surface_identifier);
891 891
(...skipping 1986 matching lines...) Expand 10 before | Expand all | Expand 10 after
2878 if (!string) return NO; 2878 if (!string) return NO;
2879 2879
2880 // If the user is currently using an IME, confirm the IME input, 2880 // If the user is currently using an IME, confirm the IME input,
2881 // and then insert the text from the service, the same as TextEdit and Safari. 2881 // and then insert the text from the service, the same as TextEdit and Safari.
2882 [self confirmComposition]; 2882 [self confirmComposition];
2883 [self insertText:string]; 2883 [self insertText:string];
2884 return YES; 2884 return YES;
2885 } 2885 }
2886 2886
2887 @end 2887 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698