Adaptations for Chromium 59

Change-Id: I472053e316bfa782d0a6fb8903f4901be12247ae
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 91 insertions, 69 deletions

diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 8d79a1869..bf96b1d9b 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -105,9 +105,9 @@ enum ImStateFlags {
 static inline ui::LatencyInfo CreateLatencyInfo(const blink::WebInputEvent& event) {
   ui::LatencyInfo latency_info;
   // The latency number should only be added if the timestamp is valid.
-  if (event.timeStampSeconds()) {
+  if (event.TimeStampSeconds()) {
     const int64_t time_micros = static_cast<int64_t>(
-        event.timeStampSeconds() * base::Time::kMicrosecondsPerSecond);
+        event.TimeStampSeconds() * base::Time::kMicrosecondsPerSecond);
     latency_info.AddLatencyNumberWithTimestamp(
         ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT,
         0,
@@ -261,12 +261,14 @@ RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost* widget
     , m_needsDelegatedFrameAck(false)
     , m_loadVisuallyCommittedState(NotCommitted)
     , m_adapterClient(0)
+    , m_rendererCompositorFrameSink(0)
     , m_imeInProgress(false)
     , m_receivedEmptyImeText(false)
     , m_initPending(false)
     , m_beginFrameSource(nullptr)
     , m_needsBeginFrames(false)
     , m_addedFrameObserver(false)
+    , m_backgroundColor(SK_ColorWHITE)
     , m_imState(0)
     , m_anchorPositionWithinSelection(-1)
     , m_cursorPositionWithinSelection(-1)
@@ -444,12 +446,20 @@ gfx::Rect RenderWidgetHostViewQt::GetViewBounds() const
     return gfx::BoundingRect(p1, p2);
 }
 
+SkColor RenderWidgetHostViewQt::background_color() const
+{
+    return m_backgroundColor;
+}
+
 void RenderWidgetHostViewQt::SetBackgroundColor(SkColor color)
 {
-    RenderWidgetHostViewBase::SetBackgroundColor(color);
+    if (m_backgroundColor == color)
+        return;
+    m_backgroundColor = color;
     // Set the background of the compositor if necessary
     m_delegate->setClearColor(toQt(color));
     // Set the background of the blink::FrameView
+    m_host->SetBackgroundOpaque(SkColorGetA(color) == SK_AlphaOPAQUE);
     m_host->Send(new RenderViewObserverQt_SetBackgroundColor(m_host->GetRoutingID(), color));
 }
 
@@ -473,119 +483,119 @@ void RenderWidgetHostViewQt::UnlockMouse()
 
 void RenderWidgetHostViewQt::UpdateCursor(const content::WebCursor &webCursor)
 {
-    content::WebCursor::CursorInfo cursorInfo;
+    content::CursorInfo cursorInfo;
     webCursor.GetCursorInfo(&cursorInfo);
     Qt::CursorShape shape = Qt::ArrowCursor;
 #if defined(USE_AURA)
     int auraType = -1;
 #endif
     switch (cursorInfo.type) {
-    case blink::WebCursorInfo::TypePointer:
+    case blink::WebCursorInfo::kTypePointer:
         shape = Qt::ArrowCursor;
         break;
-    case blink::WebCursorInfo::TypeCross:
+    case blink::WebCursorInfo::kTypeCross:
         shape = Qt::CrossCursor;
         break;
-    case blink::WebCursorInfo::TypeHand:
+    case blink::WebCursorInfo::kTypeHand:
         shape = Qt::PointingHandCursor;
         break;
-    case blink::WebCursorInfo::TypeIBeam:
+    case blink::WebCursorInfo::kTypeIBeam:
         shape = Qt::IBeamCursor;
         break;
-    case blink::WebCursorInfo::TypeWait:
+    case blink::WebCursorInfo::kTypeWait:
         shape = Qt::WaitCursor;
         break;
-    case blink::WebCursorInfo::TypeHelp:
+    case blink::WebCursorInfo::kTypeHelp:
         shape = Qt::WhatsThisCursor;
         break;
-    case blink::WebCursorInfo::TypeEastResize:
-    case blink::WebCursorInfo::TypeWestResize:
-    case blink::WebCursorInfo::TypeEastWestResize:
-    case blink::WebCursorInfo::TypeEastPanning:
-    case blink::WebCursorInfo::TypeWestPanning:
+    case blink::WebCursorInfo::kTypeEastResize:
+    case blink::WebCursorInfo::kTypeWestResize:
+    case blink::WebCursorInfo::kTypeEastWestResize:
+    case blink::WebCursorInfo::kTypeEastPanning:
+    case blink::WebCursorInfo::kTypeWestPanning:
         shape = Qt::SizeHorCursor;
         break;
-    case blink::WebCursorInfo::TypeNorthResize:
-    case blink::WebCursorInfo::TypeSouthResize:
-    case blink::WebCursorInfo::TypeNorthSouthResize:
-    case blink::WebCursorInfo::TypeNorthPanning:
-    case blink::WebCursorInfo::TypeSouthPanning:
+    case blink::WebCursorInfo::kTypeNorthResize:
+    case blink::WebCursorInfo::kTypeSouthResize:
+    case blink::WebCursorInfo::kTypeNorthSouthResize:
+    case blink::WebCursorInfo::kTypeNorthPanning:
+    case blink::WebCursorInfo::kTypeSouthPanning:
         shape = Qt::SizeVerCursor;
         break;
-    case blink::WebCursorInfo::TypeNorthEastResize:
-    case blink::WebCursorInfo::TypeSouthWestResize:
-    case blink::WebCursorInfo::TypeNorthEastSouthWestResize:
-    case blink::WebCursorInfo::TypeNorthEastPanning:
-    case blink::WebCursorInfo::TypeSouthWestPanning:
+    case blink::WebCursorInfo::kTypeNorthEastResize:
+    case blink::WebCursorInfo::kTypeSouthWestResize:
+    case blink::WebCursorInfo::kTypeNorthEastSouthWestResize:
+    case blink::WebCursorInfo::kTypeNorthEastPanning:
+    case blink::WebCursorInfo::kTypeSouthWestPanning:
         shape = Qt::SizeBDiagCursor;
         break;
-    case blink::WebCursorInfo::TypeNorthWestResize:
-    case blink::WebCursorInfo::TypeSouthEastResize:
-    case blink::WebCursorInfo::TypeNorthWestSouthEastResize:
-    case blink::WebCursorInfo::TypeNorthWestPanning:
-    case blink::WebCursorInfo::TypeSouthEastPanning:
+    case blink::WebCursorInfo::kTypeNorthWestResize:
+    case blink::WebCursorInfo::kTypeSouthEastResize:
+    case blink::WebCursorInfo::kTypeNorthWestSouthEastResize:
+    case blink::WebCursorInfo::kTypeNorthWestPanning:
+    case blink::WebCursorInfo::kTypeSouthEastPanning:
         shape = Qt::SizeFDiagCursor;
         break;
-    case blink::WebCursorInfo::TypeColumnResize:
+    case blink::WebCursorInfo::kTypeColumnResize:
         shape = Qt::SplitHCursor;
         break;
-    case blink::WebCursorInfo::TypeRowResize:
+    case blink::WebCursorInfo::kTypeRowResize:
         shape = Qt::SplitVCursor;
         break;
-    case blink::WebCursorInfo::TypeMiddlePanning:
-    case blink::WebCursorInfo::TypeMove:
+    case blink::WebCursorInfo::kTypeMiddlePanning:
+    case blink::WebCursorInfo::kTypeMove:
         shape = Qt::SizeAllCursor;
         break;
-    case blink::WebCursorInfo::TypeProgress:
+    case blink::WebCursorInfo::kTypeProgress:
         shape = Qt::BusyCursor;
         break;
 #if defined(USE_AURA)
-    case blink::WebCursorInfo::TypeVerticalText:
+    case blink::WebCursorInfo::kTypeVerticalText:
         auraType = ui::kCursorVerticalText;
         break;
-    case blink::WebCursorInfo::TypeCell:
+    case blink::WebCursorInfo::kTypeCell:
         auraType = ui::kCursorCell;
         break;
-    case blink::WebCursorInfo::TypeContextMenu:
+    case blink::WebCursorInfo::kTypeContextMenu:
         auraType = ui::kCursorContextMenu;
         break;
-    case blink::WebCursorInfo::TypeAlias:
+    case blink::WebCursorInfo::kTypeAlias:
         auraType = ui::kCursorAlias;
         break;
-    case blink::WebCursorInfo::TypeCopy:
+    case blink::WebCursorInfo::kTypeCopy:
         auraType = ui::kCursorCopy;
         break;
-    case blink::WebCursorInfo::TypeZoomIn:
+    case blink::WebCursorInfo::kTypeZoomIn:
         auraType = ui::kCursorZoomIn;
         break;
-    case blink::WebCursorInfo::TypeZoomOut:
+    case blink::WebCursorInfo::kTypeZoomOut:
         auraType = ui::kCursorZoomOut;
         break;
 #else
-    case blink::WebCursorInfo::TypeVerticalText:
-    case blink::WebCursorInfo::TypeCell:
-    case blink::WebCursorInfo::TypeContextMenu:
-    case blink::WebCursorInfo::TypeAlias:
-    case blink::WebCursorInfo::TypeCopy:
-    case blink::WebCursorInfo::TypeZoomIn:
-    case blink::WebCursorInfo::TypeZoomOut:
+    case blink::WebCursorInfo::kTypeVerticalText:
+    case blink::WebCursorInfo::kTypeCell:
+    case blink::WebCursorInfo::kTypeContextMenu:
+    case blink::WebCursorInfo::kTypeAlias:
+    case blink::WebCursorInfo::kTypeCopy:
+    case blink::WebCursorInfo::kTypeZoomIn:
+    case blink::WebCursorInfo::kTypeZoomOut:
         // FIXME: Support on OS X
         break;
 #endif
-    case blink::WebCursorInfo::TypeNoDrop:
-    case blink::WebCursorInfo::TypeNotAllowed:
+    case blink::WebCursorInfo::kTypeNoDrop:
+    case blink::WebCursorInfo::kTypeNotAllowed:
         shape = Qt::ForbiddenCursor;
         break;
-    case blink::WebCursorInfo::TypeNone:
+    case blink::WebCursorInfo::kTypeNone:
         shape = Qt::BlankCursor;
         break;
-    case blink::WebCursorInfo::TypeGrab:
+    case blink::WebCursorInfo::kTypeGrab:
         shape = Qt::OpenHandCursor;
         break;
-    case blink::WebCursorInfo::TypeGrabbing:
+    case blink::WebCursorInfo::kTypeGrabbing:
         shape = Qt::ClosedHandCursor;
         break;
-    case blink::WebCursorInfo::TypeCustom:
+    case blink::WebCursorInfo::kTypeCustom:
         if (cursorInfo.custom_image.colorType() == SkColorType::kN32_SkColorType) {
             QImage cursor = toQImage(cursorInfo.custom_image, QImage::Format_ARGB32);
             m_delegate->updateCursor(QCursor(QPixmap::fromImage(cursor), cursorInfo.hotspot.x(), cursorInfo.hotspot.y()));
@@ -645,15 +655,28 @@ bool RenderWidgetHostViewQt::HasAcceleratedSurface(const gfx::Size&)
     return false;
 }
 
-void RenderWidgetHostViewQt::OnSwapCompositorFrame(uint32_t output_surface_id, cc::CompositorFrame frame)
+void RenderWidgetHostViewQt::DidCreateNewRendererCompositorFrameSink(cc::mojom::MojoCompositorFrameSinkClient *frameSink)
+{
+    // Accumulated resources belong to the old RendererCompositorFrameSink and
+    // should not be returned.
+    m_resourcesToRelease.clear();
+    m_rendererCompositorFrameSink = frameSink;
+}
+
+void RenderWidgetHostViewQt::SubmitCompositorFrame(const cc::LocalSurfaceId &local_surface_id, cc::CompositorFrame frame)
 {
     bool scrollOffsetChanged = (m_lastScrollOffset != frame.metadata.root_scroll_offset);
     bool contentsSizeChanged = (m_lastContentsSize != frame.metadata.root_layer_size);
     m_lastScrollOffset = frame.metadata.root_scroll_offset;
     m_lastContentsSize = frame.metadata.root_layer_size;
+    m_backgroundColor = frame.metadata.root_background_color;
+    if (m_localSurfaceId != local_surface_id) {
+        m_localSurfaceId = local_surface_id;
+        // FIXME: update frame_size and device_scale_factor?
+        // FIXME: showPrimarySurface()?
+    }
     Q_ASSERT(!m_needsDelegatedFrameAck);
     m_needsDelegatedFrameAck = true;
-    m_pendingOutputSurfaceId = output_surface_id;
     m_chromiumCompositorData->previousFrameData = std::move(m_chromiumCompositorData->frameData);
     m_chromiumCompositorData->frameDevicePixelRatio = frame.metadata.device_scale_factor;
     m_chromiumCompositorData->frameData = std::move(frame);
@@ -984,7 +1007,7 @@ QVariant RenderWidgetHostViewQt::inputMethodQuery(Qt::InputMethodQuery query)
 void RenderWidgetHostViewQt::ProcessAckedTouchEvent(const content::TouchEventWithLatencyInfo &touch, content::InputEventAckState ack_result) {
     Q_UNUSED(touch);
     const bool eventConsumed = ack_result == content::INPUT_EVENT_ACK_STATE_CONSUMED;
-    m_gestureProvider.OnTouchEventAck(touch.event.uniqueTouchEventId, eventConsumed);
+    m_gestureProvider.OnTouchEventAck(touch.event.unique_touch_event_id, eventConsumed);
 }
 
 void RenderWidgetHostViewQt::sendDelegatedFrameAck()
@@ -993,9 +1016,8 @@ void RenderWidgetHostViewQt::sendDelegatedFrameAck()
     m_beginFrameSource->DidFinishFrame(this, ack);
     cc::ReturnedResourceArray resources;
     m_resourcesToRelease.swap(resources);
-    content::RenderWidgetHostImpl::SendReclaimCompositorResources(
-        m_host->GetRoutingID(), m_pendingOutputSurfaceId,
-        m_host->GetProcess()->GetID(), true, resources);
+    if (m_rendererCompositorFrameSink)
+        m_rendererCompositorFrameSink->DidReceiveCompositorFrameAck(resources);
 }
 
 void RenderWidgetHostViewQt::processMotionEvent(const ui::MotionEvent &motionEvent)
@@ -1035,7 +1057,7 @@ float RenderWidgetHostViewQt::dpiScale() const
 
 bool RenderWidgetHostViewQt::IsPopup() const
 {
-    return popup_type_ != blink::WebPopupTypeNone;
+    return popup_type_ != blink::kWebPopupTypeNone;
 }
 
 void RenderWidgetHostViewQt::handleMouseEvent(QMouseEvent* event)
@@ -1048,8 +1070,8 @@ void RenderWidgetHostViewQt::handleMouseEvent(QMouseEvent* event)
         return;
 
     blink::WebMouseEvent webEvent = WebEventFactory::toWebMouseEvent(event, dpiScale());
-    if ((webEvent.type() == blink::WebInputEvent::MouseDown || webEvent.type() == blink::WebInputEvent::MouseUp)
-            && webEvent.button == blink::WebMouseEvent::Button::NoButton) {
+    if ((webEvent.GetType() == blink::WebInputEvent::kMouseDown || webEvent.GetType() == blink::WebInputEvent::kMouseUp)
+            && webEvent.button == blink::WebMouseEvent::Button::kNoButton) {
         // Blink can only handle the 3 main mouse-buttons and may assert when processing mouse-down for no button.
         return;
     }
@@ -1062,13 +1084,13 @@ void RenderWidgetHostViewQt::handleMouseEvent(QMouseEvent* event)
             m_clickHelper.clickCounter = 0;
 
         m_clickHelper.lastPressTimestamp = event->timestamp();
-        webEvent.clickCount = ++m_clickHelper.clickCounter;
+        webEvent.click_count = ++m_clickHelper.clickCounter;
         m_clickHelper.lastPressButton = event->button();
         m_clickHelper.lastPressPosition = QPointF(event->pos()).toPoint();
     }
 
-    webEvent.movementX = event->globalX() - m_previousMousePosition.x();
-    webEvent.movementY = event->globalY() - m_previousMousePosition.y();
+    webEvent.movement_x = event->globalX() - m_previousMousePosition.x();
+    webEvent.movement_y = event->globalY() - m_previousMousePosition.y();
 
     if (IsMouseLocked())
         QCursor::setPos(m_previousMousePosition);
@@ -1119,7 +1141,7 @@ void RenderWidgetHostViewQt::handleKeyEvent(QKeyEvent *ev)
     }
 
     content::NativeWebKeyboardEvent webEvent = WebEventFactory::toWebKeyboardEvent(ev);
-    bool keyDownTextInsertion = webEvent.type() == blink::WebInputEvent::RawKeyDown && webEvent.text[0];
+    bool keyDownTextInsertion = webEvent.GetType() == blink::WebInputEvent::kRawKeyDown && webEvent.text[0];
     webEvent.skip_in_browser = keyDownTextInsertion;
     m_host->ForwardKeyboardEvent(webEvent);
 
@@ -1128,7 +1150,7 @@ void RenderWidgetHostViewQt::handleKeyEvent(QKeyEvent *ev)
         // The RawKeyDown is skipped on the way back (see above).
         // The same os_event will be set on both NativeWebKeyboardEvents.
         webEvent.skip_in_browser = false;
-        webEvent.setType(blink::WebInputEvent::Char);
+        webEvent.SetType(blink::WebInputEvent::kChar);
         m_host->ForwardKeyboardEvent(webEvent);
     }
 }