From 5d87695f37678f96492b258bbab36486c59866b4 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 24 May 2019 11:40:17 +0200 Subject: BASELINE: Update Chromium to 75.0.3770.56 Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f Reviewed-by: Alexandru Croitor --- chromium/components/guest_view/browser/guest_view_base.cc | 3 +-- chromium/components/guest_view/renderer/guest_view_container.cc | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'chromium/components/guest_view') diff --git a/chromium/components/guest_view/browser/guest_view_base.cc b/chromium/components/guest_view/browser/guest_view_base.cc index 1bf94187e29..693a50850fd 100644 --- a/chromium/components/guest_view/browser/guest_view_base.cc +++ b/chromium/components/guest_view/browser/guest_view_base.cc @@ -701,8 +701,7 @@ bool GuestViewBase::PreHandleGestureEvent(WebContents* source, // Pinch events which cause a scale change should not be routed to a guest. // We still allow synthetic wheel events for touchpad pinch to go to the page. DCHECK(!blink::WebInputEvent::IsPinchGestureEventType(event.GetType()) || - (event.SourceDevice() == - blink::WebGestureDevice::kWebGestureDeviceTouchpad && + (event.SourceDevice() == blink::WebGestureDevice::kTouchpad && event.NeedsWheelEvent())); return false; } diff --git a/chromium/components/guest_view/renderer/guest_view_container.cc b/chromium/components/guest_view/renderer/guest_view_container.cc index 1a15b9bce56..e25468299e7 100644 --- a/chromium/components/guest_view/renderer/guest_view_container.cc +++ b/chromium/components/guest_view/renderer/guest_view_container.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/lazy_instance.h" #include "base/macros.h" -#include "base/threading/thread_task_runner_handle.h" #include "components/guest_view/common/guest_view_constants.h" #include "components/guest_view/common/guest_view_messages.h" #include "components/guest_view/renderer/guest_view_request.h" @@ -248,8 +247,9 @@ void GuestViewContainer::DidResizeElement(const gfx::Size& new_size) { if (element_resize_callback_.IsEmpty()) return; - base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::BindOnce(&GuestViewContainer::CallElementResizeCallback, + render_frame_->GetTaskRunner(blink::TaskType::kInternalDefault) + ->PostTask(FROM_HERE, + base::BindOnce(&GuestViewContainer::CallElementResizeCallback, weak_ptr_factory_.GetWeakPtr(), new_size)); } -- cgit v1.2.1