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

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

Issue 2588233002: Fix a crash related to null BrowserPluginGuest on Mac (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_guest.h" 5 #include "content/browser/frame_host/render_widget_host_view_guest.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 void RenderWidgetHostViewGuest::LockCompositingSurface() { 537 void RenderWidgetHostViewGuest::LockCompositingSurface() {
538 NOTIMPLEMENTED(); 538 NOTIMPLEMENTED();
539 } 539 }
540 540
541 void RenderWidgetHostViewGuest::UnlockCompositingSurface() { 541 void RenderWidgetHostViewGuest::UnlockCompositingSurface() {
542 NOTIMPLEMENTED(); 542 NOTIMPLEMENTED();
543 } 543 }
544 544
545 RenderWidgetHostViewBase* 545 RenderWidgetHostViewBase*
546 RenderWidgetHostViewGuest::GetOwnerRenderWidgetHostView() const { 546 RenderWidgetHostViewGuest::GetOwnerRenderWidgetHostView() const {
547 return static_cast<RenderWidgetHostViewBase*>( 547 return guest_ ? static_cast<RenderWidgetHostViewBase*>(
548 guest_->GetOwnerRenderWidgetHostView()); 548 guest_->GetOwnerRenderWidgetHostView())
549 : nullptr;
549 } 550 }
550 551
551 // TODO(wjmaclean): When we remove BrowserPlugin, delete this code. 552 // TODO(wjmaclean): When we remove BrowserPlugin, delete this code.
552 // http://crbug.com/533069 553 // http://crbug.com/533069
553 void RenderWidgetHostViewGuest::MaybeSendSyntheticTapGesture( 554 void RenderWidgetHostViewGuest::MaybeSendSyntheticTapGesture(
554 const blink::WebFloatPoint& position, 555 const blink::WebFloatPoint& position,
555 const blink::WebFloatPoint& screenPosition) const { 556 const blink::WebFloatPoint& screenPosition) const {
556 if (!HasFocus()) { 557 if (!HasFocus()) {
557 // We need to a account for the position of the guest view within the 558 // We need to a account for the position of the guest view within the
558 // embedder, as well as the fact that the embedder's host will add its 559 // embedder, as well as the fact that the embedder's host will add its
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 gesture_event.data.scrollUpdate.inertialPhase == 690 gesture_event.data.scrollUpdate.inertialPhase ==
690 blink::WebGestureEvent::MomentumPhase) { 691 blink::WebGestureEvent::MomentumPhase) {
691 return; 692 return;
692 } 693 }
693 host_->ForwardGestureEvent(gesture_event); 694 host_->ForwardGestureEvent(gesture_event);
694 return; 695 return;
695 } 696 }
696 } 697 }
697 698
698 } // namespace content 699 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698