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

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

Issue 10735010: 3D Compositing in <browser>, first draft. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 // static 295 // static
296 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( 296 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
297 WebKit::WebScreenInfo* results) { 297 WebKit::WebScreenInfo* results) {
298 *results = WebKit::WebScreenInfoFactory::screenInfo(NULL); 298 *results = WebKit::WebScreenInfoFactory::screenInfo(NULL);
299 } 299 }
300 300
301 /////////////////////////////////////////////////////////////////////////////// 301 ///////////////////////////////////////////////////////////////////////////////
302 // RenderWidgetHostViewMac, public: 302 // RenderWidgetHostViewMac, public:
303 303
304 RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget) 304 RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget)
305 : render_widget_host_(RenderWidgetHostImpl::From(widget)), 305 : RenderWidgetHostViewBase(CompositingDelegateMac(this)),
306 render_widget_host_(RenderWidgetHostImpl::From(widget)),
306 about_to_validate_and_paint_(false), 307 about_to_validate_and_paint_(false),
307 call_set_needs_display_in_rect_pending_(false), 308 call_set_needs_display_in_rect_pending_(false),
308 last_frame_was_accelerated_(false), 309 last_frame_was_accelerated_(false),
309 text_input_type_(ui::TEXT_INPUT_TYPE_NONE), 310 text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
310 can_compose_inline_(true), 311 can_compose_inline_(true),
311 is_loading_(false), 312 is_loading_(false),
312 is_hidden_(false), 313 is_hidden_(false),
313 weak_factory_(this) { 314 weak_factory_(this) {
314 // |cocoa_view_| owns us and we will be deleted when |cocoa_view_| 315 // |cocoa_view_| owns us and we will be deleted when |cocoa_view_|
315 // goes away. Since we autorelease it, our caller must put 316 // goes away. Since we autorelease it, our caller must put
(...skipping 2775 matching lines...) Expand 10 before | Expand all | Expand 10 after
3091 if (!string) return NO; 3092 if (!string) return NO;
3092 3093
3093 // If the user is currently using an IME, confirm the IME input, 3094 // If the user is currently using an IME, confirm the IME input,
3094 // and then insert the text from the service, the same as TextEdit and Safari. 3095 // and then insert the text from the service, the same as TextEdit and Safari.
3095 [self confirmComposition]; 3096 [self confirmComposition];
3096 [self insertText:string]; 3097 [self insertText:string];
3097 return YES; 3098 return YES;
3098 } 3099 }
3099 3100
3100 @end 3101 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698