| OLD | NEW |
| 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 CrossProcessFrameConnector* frame_connector) { | 78 CrossProcessFrameConnector* frame_connector) { |
| 79 if (frame_connector_ == frame_connector) | 79 if (frame_connector_ == frame_connector) |
| 80 return; | 80 return; |
| 81 | 81 |
| 82 if (frame_connector_) { | 82 if (frame_connector_) { |
| 83 if (parent_frame_sink_id_.is_valid()) { | 83 if (parent_frame_sink_id_.is_valid()) { |
| 84 GetSurfaceManager()->UnregisterFrameSinkHierarchy(parent_frame_sink_id_, | 84 GetSurfaceManager()->UnregisterFrameSinkHierarchy(parent_frame_sink_id_, |
| 85 frame_sink_id_); | 85 frame_sink_id_); |
| 86 } | 86 } |
| 87 parent_frame_sink_id_ = cc::FrameSinkId(); | 87 parent_frame_sink_id_ = cc::FrameSinkId(); |
| 88 local_surface_id_ = cc::LocalSurfaceId(); |
| 88 | 89 |
| 89 // Unlocks the mouse if this RenderWidgetHostView holds the lock. | 90 // Unlocks the mouse if this RenderWidgetHostView holds the lock. |
| 90 UnlockMouse(); | 91 UnlockMouse(); |
| 91 } | 92 } |
| 92 frame_connector_ = frame_connector; | 93 frame_connector_ = frame_connector; |
| 93 if (frame_connector_) { | 94 if (frame_connector_) { |
| 94 RenderWidgetHostViewBase* parent_view = | 95 RenderWidgetHostViewBase* parent_view = |
| 95 frame_connector_->GetParentRenderWidgetHostView(); | 96 frame_connector_->GetParentRenderWidgetHostView(); |
| 96 if (parent_view) { | 97 if (parent_view) { |
| 97 parent_frame_sink_id_ = parent_view->GetFrameSinkId(); | 98 parent_frame_sink_id_ = parent_view->GetFrameSinkId(); |
| (...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 708 frame_sink_id_); | 709 frame_sink_id_); |
| 709 } | 710 } |
| 710 support_.reset(); | 711 support_.reset(); |
| 711 } | 712 } |
| 712 | 713 |
| 713 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() { | 714 bool RenderWidgetHostViewChildFrame::HasEmbedderChanged() { |
| 714 return false; | 715 return false; |
| 715 } | 716 } |
| 716 | 717 |
| 717 } // namespace content | 718 } // namespace content |
| OLD | NEW |