Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 667683002: Ensure RenderFrameHostImpl's RenderFrameSetupPtr doesn't die too early (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "content/browser/accessibility/browser_accessibility_manager.h" 17 #include "content/browser/accessibility/browser_accessibility_manager.h"
18 #include "content/browser/site_instance_impl.h" 18 #include "content/browser/site_instance_impl.h"
19 #include "content/common/accessibility_mode_enums.h" 19 #include "content/common/accessibility_mode_enums.h"
20 #include "content/common/content_export.h" 20 #include "content/common/content_export.h"
21 #include "content/common/mojo/service_registry_impl.h" 21 #include "content/common/mojo/service_registry_impl.h"
22 #include "content/common/render_frame_setup.mojom.h"
22 #include "content/public/browser/render_frame_host.h" 23 #include "content/public/browser/render_frame_host.h"
23 #include "content/public/common/javascript_message_type.h" 24 #include "content/public/common/javascript_message_type.h"
24 #include "net/http/http_response_headers.h" 25 #include "net/http/http_response_headers.h"
25 #include "third_party/WebKit/public/platform/WebNotificationPermission.h" 26 #include "third_party/WebKit/public/platform/WebNotificationPermission.h"
26 #include "third_party/WebKit/public/web/WebTextDirection.h" 27 #include "third_party/WebKit/public/web/WebTextDirection.h"
27 #include "ui/accessibility/ax_node_data.h" 28 #include "ui/accessibility/ax_node_data.h"
28 #include "ui/base/page_transition_types.h" 29 #include "ui/base/page_transition_types.h"
29 30
30 #if defined(OS_ANDROID) 31 #if defined(OS_ANDROID)
31 #include "content/browser/mojo/service_registry_android.h" 32 #include "content/browser/mojo/service_registry_android.h"
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 559
559 // Callback when an event is received, for testing. 560 // Callback when an event is received, for testing.
560 base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_; 561 base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_;
561 // The most recently received accessibility tree - for testing only. 562 // The most recently received accessibility tree - for testing only.
562 scoped_ptr<ui::AXTree> ax_tree_for_testing_; 563 scoped_ptr<ui::AXTree> ax_tree_for_testing_;
563 564
564 // PlzNavigate: Owns the stream used in navigations to store the body of the 565 // PlzNavigate: Owns the stream used in navigations to store the body of the
565 // response once it has started. 566 // response once it has started.
566 scoped_ptr<StreamHandle> stream_handle_; 567 scoped_ptr<StreamHandle> stream_handle_;
567 568
569 // Holds the browser-side handle to the pipe used to establish the Mojo
570 // connection between this instance and its associated render frame.
571 // TODO(blundell): Change this back to being a local variable if/once Mojo
572 // is changed to guarantee that message writes that are pending when the proxy
573 // pointer dies are delivered. See the discussion on the mojo-dev@ thread
574 // "Advice request to track down a flaky dropped message".
575 RenderFrameSetupPtr render_frame_setup_;
576
568 // NOTE: This must be the last member. 577 // NOTE: This must be the last member.
569 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 578 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
570 579
571 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 580 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
572 }; 581 };
573 582
574 } // namespace content 583 } // namespace content
575 584
576 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 585 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698