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

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

Issue 1074843002: Fix RenderFrameProxyHost leak. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lucasfix
Patch Set: Add comment suggested by Charlie Created 5 years, 8 months 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_manager.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_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 // window.name property. 417 // window.name property.
418 void OnDidUpdateName(const std::string& name); 418 void OnDidUpdateName(const std::string& name);
419 419
420 void EnsureRenderViewInitialized(FrameTreeNode* source, 420 void EnsureRenderViewInitialized(FrameTreeNode* source,
421 RenderViewHostImpl* render_view_host, 421 RenderViewHostImpl* render_view_host,
422 SiteInstance* instance); 422 SiteInstance* instance);
423 423
424 private: 424 private:
425 friend class NavigatorTestWithBrowserSideNavigation; 425 friend class NavigatorTestWithBrowserSideNavigation;
426 friend class RenderFrameHostManagerTest; 426 friend class RenderFrameHostManagerTest;
427 friend class SitePerProcessBrowserTest;
427 friend class TestWebContents; 428 friend class TestWebContents;
428 429
429 FRIEND_TEST_ALL_PREFIXES(CrossProcessFrameTreeBrowserTest, 430 FRIEND_TEST_ALL_PREFIXES(CrossProcessFrameTreeBrowserTest,
430 CreateCrossProcessSubframeProxies); 431 CreateCrossProcessSubframeProxies);
431 432
432 // Stores information regarding a SiteInstance targeted at a specific URL to 433 // Stores information regarding a SiteInstance targeted at a specific URL to
433 // allow for comparisons without having to actually create new instances. It 434 // allow for comparisons without having to actually create new instances. It
434 // can point to an existing one or store the details needed to create a new 435 // can point to an existing one or store the details needed to create a new
435 // one. 436 // one.
436 struct CONTENT_EXPORT SiteInstanceDescriptor { 437 struct CONTENT_EXPORT SiteInstanceDescriptor {
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 bool should_reuse_web_ui_; 747 bool should_reuse_web_ui_;
747 748
748 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 749 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
749 750
750 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 751 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
751 }; 752 };
752 753
753 } // namespace content 754 } // namespace content
754 755
755 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 756 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698