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 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #import <Cocoa/Cocoa.h> | 9 #import <Cocoa/Cocoa.h> |
10 | 10 |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 const std::vector<webkit::npapi::WebPluginGeometry>& moves) OVERRIDE; | 185 const std::vector<webkit::npapi::WebPluginGeometry>& moves) OVERRIDE; |
186 virtual void Focus() OVERRIDE; | 186 virtual void Focus() OVERRIDE; |
187 virtual void Blur() OVERRIDE; | 187 virtual void Blur() OVERRIDE; |
188 virtual bool HasFocus() OVERRIDE; | 188 virtual bool HasFocus() OVERRIDE; |
189 virtual void Show() OVERRIDE; | 189 virtual void Show() OVERRIDE; |
190 virtual void Hide() OVERRIDE; | 190 virtual void Hide() OVERRIDE; |
191 virtual bool IsShowing() OVERRIDE; | 191 virtual bool IsShowing() OVERRIDE; |
192 virtual gfx::Rect GetViewBounds() const OVERRIDE; | 192 virtual gfx::Rect GetViewBounds() const OVERRIDE; |
193 virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE; | 193 virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE; |
194 virtual void SetIsLoading(bool is_loading) OVERRIDE; | 194 virtual void SetIsLoading(bool is_loading) OVERRIDE; |
195 virtual void ImeUpdateTextInputState(WebKit::WebTextInputType state, | 195 virtual void ImeUpdateTextInputState(ui::TextInputType state, |
| 196 bool can_compose_inline, |
196 const gfx::Rect& caret_rect) OVERRIDE; | 197 const gfx::Rect& caret_rect) OVERRIDE; |
197 virtual void ImeCancelComposition() OVERRIDE; | 198 virtual void ImeCancelComposition() OVERRIDE; |
198 virtual void ImeCompositionRangeChanged(const ui::Range& range) OVERRIDE; | 199 virtual void ImeCompositionRangeChanged(const ui::Range& range) OVERRIDE; |
199 virtual void DidUpdateBackingStore( | 200 virtual void DidUpdateBackingStore( |
200 const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy, | 201 const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy, |
201 const std::vector<gfx::Rect>& copy_rects) OVERRIDE; | 202 const std::vector<gfx::Rect>& copy_rects) OVERRIDE; |
202 virtual void RenderViewGone(base::TerminationStatus status, | 203 virtual void RenderViewGone(base::TerminationStatus status, |
203 int error_code) OVERRIDE; | 204 int error_code) OVERRIDE; |
204 virtual void WillDestroyRenderWidget(RenderWidgetHost* rwh) OVERRIDE {}; | 205 virtual void WillDestroyRenderWidget(RenderWidgetHost* rwh) OVERRIDE {}; |
205 virtual void Destroy() OVERRIDE; | 206 virtual void Destroy() OVERRIDE; |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
324 | 325 |
325 // The time at which this view started displaying white pixels as a result of | 326 // The time at which this view started displaying white pixels as a result of |
326 // not having anything to paint (empty backing store from renderer). This | 327 // not having anything to paint (empty backing store from renderer). This |
327 // value returns true for is_null() if we are not recording whiteout times. | 328 // value returns true for is_null() if we are not recording whiteout times. |
328 base::TimeTicks whiteout_start_time_; | 329 base::TimeTicks whiteout_start_time_; |
329 | 330 |
330 // The time it took after this view was selected for it to be fully painted. | 331 // The time it took after this view was selected for it to be fully painted. |
331 base::TimeTicks tab_switch_paint_time_; | 332 base::TimeTicks tab_switch_paint_time_; |
332 | 333 |
333 // Current text input type. | 334 // Current text input type. |
334 WebKit::WebTextInputType text_input_type_; | 335 ui::TextInputType text_input_type_; |
335 | 336 |
336 typedef std::map<gfx::PluginWindowHandle, AcceleratedPluginView*> | 337 typedef std::map<gfx::PluginWindowHandle, AcceleratedPluginView*> |
337 PluginViewMap; | 338 PluginViewMap; |
338 PluginViewMap plugin_views_; // Weak values. | 339 PluginViewMap plugin_views_; // Weak values. |
339 | 340 |
340 // Helper class for managing instances of accelerated plug-ins. | 341 // Helper class for managing instances of accelerated plug-ins. |
341 AcceleratedSurfaceContainerManagerMac plugin_container_manager_; | 342 AcceleratedSurfaceContainerManagerMac plugin_container_manager_; |
342 | 343 |
343 // Used for continuous spell checking. | 344 // Used for continuous spell checking. |
344 bool spellcheck_enabled_; | 345 bool spellcheck_enabled_; |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
381 // hidden until the software backing store has been updated. This variable is | 382 // hidden until the software backing store has been updated. This variable is |
382 // set when the gpu widget needs to be hidden once a paint is completed. | 383 // set when the gpu widget needs to be hidden once a paint is completed. |
383 bool needs_gpu_visibility_update_after_repaint_; | 384 bool needs_gpu_visibility_update_after_repaint_; |
384 | 385 |
385 gfx::PluginWindowHandle compositing_surface_; | 386 gfx::PluginWindowHandle compositing_surface_; |
386 | 387 |
387 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); | 388 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); |
388 }; | 389 }; |
389 | 390 |
390 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 391 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
OLD | NEW |