| OLD | NEW |
| 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 "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/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 NSWidth([ancestor_window frame]))) { | 203 NSWidth([ancestor_window frame]))) { |
| 204 enclosing_window = ancestor_window; | 204 enclosing_window = ancestor_window; |
| 205 } | 205 } |
| 206 | 206 |
| 207 return enclosing_window; | 207 return enclosing_window; |
| 208 } | 208 } |
| 209 | 209 |
| 210 } // namespace | 210 } // namespace |
| 211 | 211 |
| 212 /////////////////////////////////////////////////////////////////////////////// | 212 /////////////////////////////////////////////////////////////////////////////// |
| 213 // RenderWidgetHostView, public: |
| 214 |
| 215 // static |
| 216 void RenderWidgetHostView::GetDefaultScreenInfo( |
| 217 WebKit::WebScreenInfo* results) { |
| 218 *results = WebKit::WebScreenInfoFactory::screenInfo(NULL); |
| 219 } |
| 220 |
| 221 /////////////////////////////////////////////////////////////////////////////// |
| 213 // RenderWidgetHostViewMac, public: | 222 // RenderWidgetHostViewMac, public: |
| 214 | 223 |
| 215 RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget) | 224 RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget) |
| 216 : render_widget_host_(widget), | 225 : render_widget_host_(widget), |
| 217 about_to_validate_and_paint_(false), | 226 about_to_validate_and_paint_(false), |
| 218 call_set_needs_display_in_rect_pending_(false), | 227 call_set_needs_display_in_rect_pending_(false), |
| 219 text_input_type_(ui::TEXT_INPUT_TYPE_NONE), | 228 text_input_type_(ui::TEXT_INPUT_TYPE_NONE), |
| 220 is_loading_(false), | 229 is_loading_(false), |
| 221 is_hidden_(false), | 230 is_hidden_(false), |
| 222 is_showing_context_menu_(false), | 231 is_showing_context_menu_(false), |
| (...skipping 2526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2749 if (!string) return NO; | 2758 if (!string) return NO; |
| 2750 | 2759 |
| 2751 // If the user is currently using an IME, confirm the IME input, | 2760 // If the user is currently using an IME, confirm the IME input, |
| 2752 // and then insert the text from the service, the same as TextEdit and Safari. | 2761 // and then insert the text from the service, the same as TextEdit and Safari. |
| 2753 [self confirmComposition]; | 2762 [self confirmComposition]; |
| 2754 [self insertText:string]; | 2763 [self insertText:string]; |
| 2755 return YES; | 2764 return YES; |
| 2756 } | 2765 } |
| 2757 | 2766 |
| 2758 @end | 2767 @end |
| OLD | NEW |