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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override; | 217 gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override; |
218 gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override; | 218 gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override; |
219 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, | 219 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, |
220 const SkBitmap& zoomed_bitmap) override; | 220 const SkBitmap& zoomed_bitmap) override; |
221 bool LockMouse() override; | 221 bool LockMouse() override; |
222 void UnlockMouse() override; | 222 void UnlockMouse() override; |
223 void OnSwapCompositorFrame(uint32 output_surface_id, | 223 void OnSwapCompositorFrame(uint32 output_surface_id, |
224 scoped_ptr<cc::CompositorFrame> frame) override; | 224 scoped_ptr<cc::CompositorFrame> frame) override; |
225 void DidStopFlinging() override; | 225 void DidStopFlinging() override; |
226 void OnDidNavigateMainFrameToNewPage() override; | 226 void OnDidNavigateMainFrameToNewPage() override; |
| 227 uint32_t GetSurfaceIdNamespace() override; |
227 | 228 |
228 #if defined(OS_WIN) | 229 #if defined(OS_WIN) |
229 void SetParentNativeViewAccessible( | 230 void SetParentNativeViewAccessible( |
230 gfx::NativeViewAccessible accessible_parent) override; | 231 gfx::NativeViewAccessible accessible_parent) override; |
231 gfx::NativeViewId GetParentForWindowlessPlugin() const override; | 232 gfx::NativeViewId GetParentForWindowlessPlugin() const override; |
232 #endif | 233 #endif |
233 | 234 |
234 // Overridden from ui::TextInputClient: | 235 // Overridden from ui::TextInputClient: |
235 void SetCompositionText(const ui::CompositionText& composition) override; | 236 void SetCompositionText(const ui::CompositionText& composition) override; |
236 void ConfirmCompositionText() override; | 237 void ConfirmCompositionText() override; |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
467 void DelegatedFrameHostSendCompositorSwapAck( | 468 void DelegatedFrameHostSendCompositorSwapAck( |
468 int output_surface_id, | 469 int output_surface_id, |
469 const cc::CompositorFrameAck& ack) override; | 470 const cc::CompositorFrameAck& ack) override; |
470 void DelegatedFrameHostSendReclaimCompositorResources( | 471 void DelegatedFrameHostSendReclaimCompositorResources( |
471 int output_surface_id, | 472 int output_surface_id, |
472 const cc::CompositorFrameAck& ack) override; | 473 const cc::CompositorFrameAck& ack) override; |
473 void DelegatedFrameHostOnLostCompositorResources() override; | 474 void DelegatedFrameHostOnLostCompositorResources() override; |
474 void DelegatedFrameHostUpdateVSyncParameters( | 475 void DelegatedFrameHostUpdateVSyncParameters( |
475 const base::TimeTicks& timebase, | 476 const base::TimeTicks& timebase, |
476 const base::TimeDelta& interval) override; | 477 const base::TimeDelta& interval) override; |
| 478 void DelegatedFrameHostUpdateSurfaceIdNamespace( |
| 479 uint32_t surface_id_namespace) override; |
477 | 480 |
478 // Detaches |this| from the input method object. | 481 // Detaches |this| from the input method object. |
479 void DetachFromInputMethod(); | 482 void DetachFromInputMethod(); |
480 | 483 |
481 // Before calling RenderWidgetHost::ForwardKeyboardEvent(), this method | 484 // Before calling RenderWidgetHost::ForwardKeyboardEvent(), this method |
482 // calls our keybindings handler against the event and send matched | 485 // calls our keybindings handler against the event and send matched |
483 // edit commands to renderer instead. | 486 // edit commands to renderer instead. |
484 void ForwardKeyboardEvent(const NativeWebKeyboardEvent& event); | 487 void ForwardKeyboardEvent(const NativeWebKeyboardEvent& event); |
485 | 488 |
486 // Dismisses a Web Popup on a mouse or touch press outside the popup and its | 489 // Dismisses a Web Popup on a mouse or touch press outside the popup and its |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
670 // compositing surface and showing the disambiguation popup. | 673 // compositing surface and showing the disambiguation popup. |
671 gfx::Vector2dF disambiguation_scroll_offset_; | 674 gfx::Vector2dF disambiguation_scroll_offset_; |
672 | 675 |
673 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; | 676 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; |
674 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 677 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
675 }; | 678 }; |
676 | 679 |
677 } // namespace content | 680 } // namespace content |
678 | 681 |
679 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 682 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
OLD | NEW |