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

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

Issue 2417693002: Allow MimeHandlerViewGuest be embedded inside OOPIFs (Closed)
Patch Set: Addressing lfg@ and nasko@ comments Created 4 years, 1 month 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 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 } 328 }
329 329
330 void RenderWidgetHostViewChildFrame::UnregisterFrameSinkId() { 330 void RenderWidgetHostViewChildFrame::UnregisterFrameSinkId() {
331 DCHECK(host_); 331 DCHECK(host_);
332 if (host_->delegate() && host_->delegate()->GetInputEventRouter()) { 332 if (host_->delegate() && host_->delegate()->GetInputEventRouter()) {
333 host_->delegate()->GetInputEventRouter()->RemoveFrameSinkIdOwner( 333 host_->delegate()->GetInputEventRouter()->RemoveFrameSinkIdOwner(
334 frame_sink_id_); 334 frame_sink_id_);
335 } 335 }
336 } 336 }
337 337
338 RenderWidgetHostViewBase*
339 RenderWidgetHostViewChildFrame::GetOwnerRenderWidgetHostView() const {
340 NOTREACHED();
341 return nullptr;
342 }
343
338 void RenderWidgetHostViewChildFrame::GestureEventAck( 344 void RenderWidgetHostViewChildFrame::GestureEventAck(
339 const blink::WebGestureEvent& event, 345 const blink::WebGestureEvent& event,
340 InputEventAckState ack_result) { 346 InputEventAckState ack_result) {
341 bool not_consumed = ack_result == INPUT_EVENT_ACK_STATE_NOT_CONSUMED || 347 bool not_consumed = ack_result == INPUT_EVENT_ACK_STATE_NOT_CONSUMED ||
342 ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS; 348 ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
343 // GestureScrollBegin is consumed by the target frame and not forwarded, 349 // GestureScrollBegin is consumed by the target frame and not forwarded,
344 // because we don't know whether we will need to bubble scroll until we 350 // because we don't know whether we will need to bubble scroll until we
345 // receive a GestureScrollUpdate ACK. GestureScrollUpdate with unused 351 // receive a GestureScrollUpdate ACK. GestureScrollUpdate with unused
346 // scroll extent is forwarded for bubbling, while GestureScrollEnd is 352 // scroll extent is forwarded for bubbling, while GestureScrollEnd is
347 // always forwarded and handled according to current scroll state in the 353 // always forwarded and handled according to current scroll state in the
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 744
739 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { 745 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const {
740 return true; 746 return true;
741 } 747 }
742 748
743 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { 749 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const {
744 return cc::SurfaceId(frame_sink_id_, local_frame_id_); 750 return cc::SurfaceId(frame_sink_id_, local_frame_id_);
745 }; 751 };
746 752
747 } // namespace content 753 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698