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

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

Issue 10817010: Merge 147077 - Always invalidate whole NSView when switching to GPU mode (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/
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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 1215 matching lines...) Expand 10 before | Expand all | Expand 10 after
1226 render_widget_host_->Shutdown(); 1226 render_widget_host_->Shutdown();
1227 // Do not touch any members at this point, |this| has been deleted. 1227 // Do not touch any members at this point, |this| has been deleted.
1228 } 1228 }
1229 1229
1230 void RenderWidgetHostViewMac::GotAcceleratedFrame() { 1230 void RenderWidgetHostViewMac::GotAcceleratedFrame() {
1231 if (!last_frame_was_accelerated_) { 1231 if (!last_frame_was_accelerated_) {
1232 last_frame_was_accelerated_ = true; 1232 last_frame_was_accelerated_ = true;
1233 1233
1234 // Need to wipe the software view with transparency to expose the GL 1234 // Need to wipe the software view with transparency to expose the GL
1235 // underlay. Invalidate the whole window to do that. 1235 // underlay. Invalidate the whole window to do that.
1236 if (!about_to_validate_and_paint_) 1236 [cocoa_view_ setNeedsDisplay:YES];
1237 [cocoa_view_ setNeedsDisplay:YES];
1238 1237
1239 // Delete software backingstore. 1238 // Delete software backingstore.
1240 BackingStoreManager::RemoveBackingStore(render_widget_host_); 1239 BackingStoreManager::RemoveBackingStore(render_widget_host_);
1241 } 1240 }
1242 } 1241 }
1243 1242
1244 void RenderWidgetHostViewMac::GotSoftwareFrame() { 1243 void RenderWidgetHostViewMac::GotSoftwareFrame() {
1245 if (last_frame_was_accelerated_) { 1244 if (last_frame_was_accelerated_) {
1246 last_frame_was_accelerated_ = false; 1245 last_frame_was_accelerated_ = false;
1247 1246
(...skipping 1838 matching lines...) Expand 10 before | Expand all | Expand 10 after
3086 if (!string) return NO; 3085 if (!string) return NO;
3087 3086
3088 // If the user is currently using an IME, confirm the IME input, 3087 // 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. 3088 // and then insert the text from the service, the same as TextEdit and Safari.
3090 [self confirmComposition]; 3089 [self confirmComposition];
3091 [self insertText:string]; 3090 [self insertText:string];
3092 return YES; 3091 return YES;
3093 } 3092 }
3094 3093
3095 @end 3094 @end
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698