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

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

Issue 2797473005: Fix interstitials on OOPIF-based guests. (Closed)
Patch Set: null check webcontents Created 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/render_widget_host_view_child_frame.h" 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 CrossProcessFrameConnector* frame_connector) { 77 CrossProcessFrameConnector* frame_connector) {
78 if (frame_connector_ == frame_connector) 78 if (frame_connector_ == frame_connector)
79 return; 79 return;
80 80
81 if (frame_connector_) { 81 if (frame_connector_) {
82 if (parent_frame_sink_id_.is_valid()) { 82 if (parent_frame_sink_id_.is_valid()) {
83 GetSurfaceManager()->UnregisterFrameSinkHierarchy(parent_frame_sink_id_, 83 GetSurfaceManager()->UnregisterFrameSinkHierarchy(parent_frame_sink_id_,
84 frame_sink_id_); 84 frame_sink_id_);
85 } 85 }
86 parent_frame_sink_id_ = cc::FrameSinkId(); 86 parent_frame_sink_id_ = cc::FrameSinkId();
87 local_surface_id_ = cc::LocalSurfaceId();
87 88
88 // Unlocks the mouse if this RenderWidgetHostView holds the lock. 89 // Unlocks the mouse if this RenderWidgetHostView holds the lock.
89 UnlockMouse(); 90 UnlockMouse();
90 } 91 }
91 frame_connector_ = frame_connector; 92 frame_connector_ = frame_connector;
92 if (frame_connector_) { 93 if (frame_connector_) {
93 RenderWidgetHostViewBase* parent_view = 94 RenderWidgetHostViewBase* parent_view =
94 frame_connector_->GetParentRenderWidgetHostView(); 95 frame_connector_->GetParentRenderWidgetHostView();
95 if (parent_view) { 96 if (parent_view) {
96 parent_frame_sink_id_ = parent_view->GetFrameSinkId(); 97 parent_frame_sink_id_ = parent_view->GetFrameSinkId();
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 frame_sink_id_); 696 frame_sink_id_);
696 } 697 }
697 support_.reset(); 698 support_.reset();
698 } 699 }
699 700
700 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() { 701 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() {
701 return false; 702 return false;
702 } 703 }
703 704
704 } // namespace content 705 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698