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 2132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2143 if (handlingGlobalFrameDidChange_) | 2143 if (handlingGlobalFrameDidChange_) |
2144 return; | 2144 return; |
2145 | 2145 |
2146 handlingGlobalFrameDidChange_ = YES; | 2146 handlingGlobalFrameDidChange_ = YES; |
2147 if (renderWidgetHostView_->compositing_iosurface_.get()) | 2147 if (renderWidgetHostView_->compositing_iosurface_.get()) |
2148 renderWidgetHostView_->compositing_iosurface_->GlobalFrameDidChange(); | 2148 renderWidgetHostView_->compositing_iosurface_->GlobalFrameDidChange(); |
2149 handlingGlobalFrameDidChange_ = NO; | 2149 handlingGlobalFrameDidChange_ = NO; |
2150 } | 2150 } |
2151 | 2151 |
2152 - (void)windowChangedScreen:(NSNotification*)notification { | 2152 - (void)windowChangedScreen:(NSNotification*)notification { |
2153 renderWidgetHostView_->UpdateScreenInfo(); | 2153 renderWidgetHostView_->UpdateScreenInfo( |
| 2154 renderWidgetHostView_->GetNativeView()); |
2154 } | 2155 } |
2155 | 2156 |
2156 - (void)setFrameSize:(NSSize)newSize { | 2157 - (void)setFrameSize:(NSSize)newSize { |
2157 // NB: -[NSView setFrame:] calls through -setFrameSize:, so overriding | 2158 // NB: -[NSView setFrame:] calls through -setFrameSize:, so overriding |
2158 // -setFrame: isn't neccessary. | 2159 // -setFrame: isn't neccessary. |
2159 [super setFrameSize:newSize]; | 2160 [super setFrameSize:newSize]; |
2160 if (renderWidgetHostView_->render_widget_host_) | 2161 if (renderWidgetHostView_->render_widget_host_) |
2161 renderWidgetHostView_->render_widget_host_->WasResized(); | 2162 renderWidgetHostView_->render_widget_host_->WasResized(); |
2162 } | 2163 } |
2163 | 2164 |
(...skipping 1135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3299 if (!string) return NO; | 3300 if (!string) return NO; |
3300 | 3301 |
3301 // If the user is currently using an IME, confirm the IME input, | 3302 // 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. | 3303 // and then insert the text from the service, the same as TextEdit and Safari. |
3303 [self confirmComposition]; | 3304 [self confirmComposition]; |
3304 [self insertText:string]; | 3305 [self insertText:string]; |
3305 return YES; | 3306 return YES; |
3306 } | 3307 } |
3307 | 3308 |
3308 @end | 3309 @end |
OLD | NEW |