| 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 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 SetCrossProcessFrameConnector(nullptr); | 288 SetCrossProcessFrameConnector(nullptr); |
| 289 } | 289 } |
| 290 | 290 |
| 291 // We notify our observers about shutdown here since we are about to release | 291 // We notify our observers about shutdown here since we are about to release |
| 292 // host_ and do not want any event calls coming from | 292 // host_ and do not want any event calls coming from |
| 293 // RenderWidgetHostInputEventRouter afterwards. | 293 // RenderWidgetHostInputEventRouter afterwards. |
| 294 NotifyObserversAboutShutdown(); | 294 NotifyObserversAboutShutdown(); |
| 295 | 295 |
| 296 host_->SetView(nullptr); | 296 host_->SetView(nullptr); |
| 297 host_ = nullptr; | 297 host_ = nullptr; |
| 298 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); | 298 |
| 299 delete this; |
| 299 } | 300 } |
| 300 | 301 |
| 301 void RenderWidgetHostViewChildFrame::SetTooltipText( | 302 void RenderWidgetHostViewChildFrame::SetTooltipText( |
| 302 const base::string16& tooltip_text) { | 303 const base::string16& tooltip_text) { |
| 303 frame_connector_->GetRootRenderWidgetHostView()->SetTooltipText(tooltip_text); | 304 frame_connector_->GetRootRenderWidgetHostView()->SetTooltipText(tooltip_text); |
| 304 } | 305 } |
| 305 | 306 |
| 306 RenderWidgetHostViewBase* RenderWidgetHostViewChildFrame::GetParentView() { | 307 RenderWidgetHostViewBase* RenderWidgetHostViewChildFrame::GetParentView() { |
| 307 if (!frame_connector_) | 308 if (!frame_connector_) |
| 308 return nullptr; | 309 return nullptr; |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 747 | 748 |
| 748 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { | 749 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { |
| 749 return true; | 750 return true; |
| 750 } | 751 } |
| 751 | 752 |
| 752 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { | 753 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { |
| 753 return cc::SurfaceId(frame_sink_id_, local_surface_id_); | 754 return cc::SurfaceId(frame_sink_id_, local_surface_id_); |
| 754 }; | 755 }; |
| 755 | 756 |
| 756 } // namespace content | 757 } // namespace content |
| OLD | NEW |