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 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1230 render_widget_host_->Shutdown(); | 1230 render_widget_host_->Shutdown(); |
1231 // Do not touch any members at this point, |this| has been deleted. | 1231 // Do not touch any members at this point, |this| has been deleted. |
1232 } | 1232 } |
1233 | 1233 |
1234 void RenderWidgetHostViewMac::GotAcceleratedFrame() { | 1234 void RenderWidgetHostViewMac::GotAcceleratedFrame() { |
1235 if (!last_frame_was_accelerated_) { | 1235 if (!last_frame_was_accelerated_) { |
1236 last_frame_was_accelerated_ = true; | 1236 last_frame_was_accelerated_ = true; |
1237 | 1237 |
1238 // Need to wipe the software view with transparency to expose the GL | 1238 // Need to wipe the software view with transparency to expose the GL |
1239 // underlay. Invalidate the whole window to do that. | 1239 // underlay. Invalidate the whole window to do that. |
1240 if (!about_to_validate_and_paint_) | 1240 [cocoa_view_ setNeedsDisplay:YES]; |
1241 [cocoa_view_ setNeedsDisplay:YES]; | |
1242 | 1241 |
1243 // Delete software backingstore. | 1242 // Delete software backingstore. |
1244 BackingStoreManager::RemoveBackingStore(render_widget_host_); | 1243 BackingStoreManager::RemoveBackingStore(render_widget_host_); |
1245 } | 1244 } |
1246 } | 1245 } |
1247 | 1246 |
1248 void RenderWidgetHostViewMac::GotSoftwareFrame() { | 1247 void RenderWidgetHostViewMac::GotSoftwareFrame() { |
1249 if (last_frame_was_accelerated_) { | 1248 if (last_frame_was_accelerated_) { |
1250 last_frame_was_accelerated_ = false; | 1249 last_frame_was_accelerated_ = false; |
1251 | 1250 |
(...skipping 1840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3092 if (!string) return NO; | 3091 if (!string) return NO; |
3093 | 3092 |
3094 // If the user is currently using an IME, confirm the IME input, | 3093 // If the user is currently using an IME, confirm the IME input, |
3095 // and then insert the text from the service, the same as TextEdit and Safari. | 3094 // and then insert the text from the service, the same as TextEdit and Safari. |
3096 [self confirmComposition]; | 3095 [self confirmComposition]; |
3097 [self insertText:string]; | 3096 [self insertText:string]; |
3098 return YES; | 3097 return YES; |
3099 } | 3098 } |
3100 | 3099 |
3101 @end | 3100 @end |
OLD | NEW |