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

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

Issue 2658293002: content: Remove Lock/Unlock CompositingSurface API from RWH. (Closed)
Patch Set: last_frame_info Created 3 years, 10 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 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 host_->SetView(nullptr); 296 host_->SetView(nullptr);
297 host_ = nullptr; 297 host_ = nullptr;
298 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); 298 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
299 } 299 }
300 300
301 void RenderWidgetHostViewChildFrame::SetTooltipText( 301 void RenderWidgetHostViewChildFrame::SetTooltipText(
302 const base::string16& tooltip_text) { 302 const base::string16& tooltip_text) {
303 frame_connector_->GetRootRenderWidgetHostView()->SetTooltipText(tooltip_text); 303 frame_connector_->GetRootRenderWidgetHostView()->SetTooltipText(tooltip_text);
304 } 304 }
305 305
306 void RenderWidgetHostViewChildFrame::LockCompositingSurface() {
307 NOTIMPLEMENTED();
308 }
309
310 void RenderWidgetHostViewChildFrame::UnlockCompositingSurface() {
311 NOTIMPLEMENTED();
312 }
313
314 RenderWidgetHostViewBase* RenderWidgetHostViewChildFrame::GetParentView() { 306 RenderWidgetHostViewBase* RenderWidgetHostViewChildFrame::GetParentView() {
315 if (!frame_connector_) 307 if (!frame_connector_)
316 return nullptr; 308 return nullptr;
317 return frame_connector_->GetParentRenderWidgetHostView(); 309 return frame_connector_->GetParentRenderWidgetHostView();
318 } 310 }
319 311
320 void RenderWidgetHostViewChildFrame::RegisterFrameSinkId() { 312 void RenderWidgetHostViewChildFrame::RegisterFrameSinkId() {
321 // If Destroy() has been called before we get here, host_ may be null. 313 // If Destroy() has been called before we get here, host_ may be null.
322 if (host_ && host_->delegate() && host_->delegate()->GetInputEventRouter()) { 314 if (host_ && host_->delegate() && host_->delegate()->GetInputEventRouter()) {
323 RenderWidgetHostInputEventRouter* router = 315 RenderWidgetHostInputEventRouter* router =
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 748
757 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { 749 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const {
758 return true; 750 return true;
759 } 751 }
760 752
761 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { 753 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const {
762 return cc::SurfaceId(frame_sink_id_, local_surface_id_); 754 return cc::SurfaceId(frame_sink_id_, local_surface_id_);
763 }; 755 };
764 756
765 } // namespace content 757 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698