Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ |
| 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 93 int acc_obj_id, const gfx::Point& point) OVERRIDE; | 93 int acc_obj_id, const gfx::Point& point) OVERRIDE; |
| 94 virtual void AccessibilitySetTextSelection( | 94 virtual void AccessibilitySetTextSelection( |
| 95 int acc_obj_id, int start_offset, int end_offset) OVERRIDE; | 95 int acc_obj_id, int start_offset, int end_offset) OVERRIDE; |
| 96 virtual bool AccessibilityViewHasFocus() const OVERRIDE; | 96 virtual bool AccessibilityViewHasFocus() const OVERRIDE; |
| 97 virtual gfx::Rect AccessibilityGetViewBounds() const OVERRIDE; | 97 virtual gfx::Rect AccessibilityGetViewBounds() const OVERRIDE; |
| 98 virtual gfx::Point AccessibilityOriginInScreen(const gfx::Rect& bounds) | 98 virtual gfx::Point AccessibilityOriginInScreen(const gfx::Rect& bounds) |
| 99 const OVERRIDE; | 99 const OVERRIDE; |
| 100 virtual void AccessibilityHitTest(const gfx::Point& point) OVERRIDE; | 100 virtual void AccessibilityHitTest(const gfx::Point& point) OVERRIDE; |
| 101 virtual void AccessibilityFatalError() OVERRIDE; | 101 virtual void AccessibilityFatalError() OVERRIDE; |
| 102 | 102 |
| 103 bool CreateRenderFrame(int parent_routing_id); | |
| 104 bool IsRenderFrameLive(); | |
| 103 void Init(); | 105 void Init(); |
| 104 int routing_id() const { return routing_id_; } | 106 int routing_id() const { return routing_id_; } |
| 105 void OnCreateChildFrame(int new_routing_id, | 107 void OnCreateChildFrame(int new_routing_id, |
| 106 const std::string& frame_name); | 108 const std::string& frame_name); |
| 107 | 109 |
| 108 RenderViewHostImpl* render_view_host() { return render_view_host_; } | 110 RenderViewHostImpl* render_view_host() { return render_view_host_; } |
| 109 RenderFrameHostDelegate* delegate() { return delegate_; } | 111 RenderFrameHostDelegate* delegate() { return delegate_; } |
| 110 FrameTreeNode* frame_tree_node() { return frame_tree_node_; } | 112 FrameTreeNode* frame_tree_node() { return frame_tree_node_; } |
| 111 // TODO(nasko): The RenderWidgetHost will be owned by RenderFrameHost in | 113 // TODO(nasko): The RenderWidgetHost will be owned by RenderFrameHost in |
| 112 // the future, so update this accessor to return the right pointer. | 114 // the future, so update this accessor to return the right pointer. |
| 113 RenderWidgetHostImpl* GetRenderWidgetHost(); | 115 RenderWidgetHostImpl* GetRenderWidgetHost(); |
| 116 bool has_received_swap_out_ack() { return has_received_swap_out_ack_; } | |
|
Charlie Reis
2014/07/24 22:36:29
This doesn't appear to be called. Is it stale cod
nasko
2014/07/25 07:13:20
I added this to know at time of CommitPending whet
ncarter (slow)
2014/07/25 17:18:16
I think if we remove the getter then we can also r
kenrb
2014/07/25 23:42:05
Removed.
| |
| 114 | 117 |
| 115 // This function is called when this is a swapped out RenderFrameHost that | 118 // This function is called when this is a swapped out RenderFrameHost that |
| 116 // lives in the same process as the parent frame. The | 119 // lives in the same process as the parent frame. The |
| 117 // |cross_process_frame_connector| allows the non-swapped-out | 120 // |cross_process_frame_connector| allows the non-swapped-out |
| 118 // RenderFrameHost for a frame to communicate with the parent process | 121 // RenderFrameHost for a frame to communicate with the parent process |
| 119 // so that it may composite drawing data. | 122 // so that it may composite drawing data. |
| 120 // | 123 // |
| 121 // Ownership is not transfered. | 124 // Ownership is not transfered. |
| 122 void set_cross_process_frame_connector( | 125 void set_cross_process_frame_connector( |
| 123 CrossProcessFrameConnector* cross_process_frame_connector) { | 126 CrossProcessFrameConnector* cross_process_frame_connector) { |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 354 | 357 |
| 355 // The mapping of pending JavaScript calls created by | 358 // The mapping of pending JavaScript calls created by |
| 356 // ExecuteJavaScript and their corresponding callbacks. | 359 // ExecuteJavaScript and their corresponding callbacks. |
| 357 std::map<int, JavaScriptResultCallback> javascript_callbacks_; | 360 std::map<int, JavaScriptResultCallback> javascript_callbacks_; |
| 358 | 361 |
| 359 // Map from notification_id to a callback to cancel them. | 362 // Map from notification_id to a callback to cancel them. |
| 360 std::map<int, base::Closure> cancel_notification_callbacks_; | 363 std::map<int, base::Closure> cancel_notification_callbacks_; |
| 361 | 364 |
| 362 int routing_id_; | 365 int routing_id_; |
| 363 bool is_swapped_out_; | 366 bool is_swapped_out_; |
| 367 bool renderer_initialized_; | |
| 368 bool has_received_swap_out_ack_; | |
| 364 | 369 |
| 365 // When the last BeforeUnload message was sent. | 370 // When the last BeforeUnload message was sent. |
| 366 base::TimeTicks send_before_unload_start_time_; | 371 base::TimeTicks send_before_unload_start_time_; |
| 367 | 372 |
| 368 ServiceRegistryImpl service_registry_; | 373 ServiceRegistryImpl service_registry_; |
| 369 | 374 |
| 370 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; | 375 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; |
| 371 | 376 |
| 372 scoped_ptr<BrowserAccessibilityManager> browser_accessibility_manager_; | 377 scoped_ptr<BrowserAccessibilityManager> browser_accessibility_manager_; |
| 373 | 378 |
| 374 // Callback when an event is received, for testing. | 379 // Callback when an event is received, for testing. |
| 375 base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_; | 380 base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_; |
| 376 // The most recently received accessibility tree - for testing only. | 381 // The most recently received accessibility tree - for testing only. |
| 377 scoped_ptr<ui::AXTree> ax_tree_for_testing_; | 382 scoped_ptr<ui::AXTree> ax_tree_for_testing_; |
| 378 | 383 |
| 379 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); | 384 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); |
| 380 }; | 385 }; |
| 381 | 386 |
| 382 } // namespace content | 387 } // namespace content |
| 383 | 388 |
| 384 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ | 389 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ |
| OLD | NEW |