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

Side by Side Diff: content/browser/frame_host/interstitial_page_impl.cc

Issue 647613002: Fix RenderWidgetHostViewGuest leak. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: bring back mac delegate() Created 6 years, 2 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
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 #include "content/browser/frame_host/interstitial_page_impl.h" 5 #include "content/browser/frame_host/interstitial_page_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 browser_context, site_instance.get(), MSG_ROUTING_NONE, MSG_ROUTING_NONE); 574 browser_context, site_instance.get(), MSG_ROUTING_NONE, MSG_ROUTING_NONE);
575 return frame_tree_.root()->current_frame_host()->render_view_host(); 575 return frame_tree_.root()->current_frame_host()->render_view_host();
576 } 576 }
577 577
578 WebContentsView* InterstitialPageImpl::CreateWebContentsView() { 578 WebContentsView* InterstitialPageImpl::CreateWebContentsView() {
579 if (!enabled() || !create_view_) 579 if (!enabled() || !create_view_)
580 return NULL; 580 return NULL;
581 WebContentsView* wcv = 581 WebContentsView* wcv =
582 static_cast<WebContentsImpl*>(web_contents())->GetView(); 582 static_cast<WebContentsImpl*>(web_contents())->GetView();
583 RenderWidgetHostViewBase* view = 583 RenderWidgetHostViewBase* view =
584 wcv->CreateViewForWidget(render_view_host_); 584 wcv->CreateViewForWidget(render_view_host_, false);
585 render_view_host_->SetView(view); 585 render_view_host_->SetView(view);
586 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION); 586 render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION);
587 587
588 int32 max_page_id = web_contents()-> 588 int32 max_page_id = web_contents()->
589 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance()); 589 GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance());
590 render_view_host_->CreateRenderView(base::string16(), 590 render_view_host_->CreateRenderView(base::string16(),
591 MSG_ROUTING_NONE, 591 MSG_ROUTING_NONE,
592 MSG_ROUTING_NONE, 592 MSG_ROUTING_NONE,
593 max_page_id, 593 max_page_id,
594 false); 594 false);
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 912
913 web_contents->GetDelegateView()->TakeFocus(reverse); 913 web_contents->GetDelegateView()->TakeFocus(reverse);
914 } 914 }
915 915
916 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( 916 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
917 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 917 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
918 int active_match_ordinal, bool final_update) { 918 int active_match_ordinal, bool final_update) {
919 } 919 }
920 920
921 } // namespace content 921 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_guest.cc ('k') | content/browser/frame_host/render_widget_host_view_guest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698