Use SetBaseBackgroundColorOverride for setting background color

The normal WebViewImpl::SetBaseBackgroundColor expects to be called only during
certain lifecycle states, otherwise a DCHECK will be triggered. Whereas
the *Override version forces a lifecycle update.

Needs 3rdparty change to stop RenderWidgetHostViewBase::SetBaseBackgroundColor
from clearing the override color when switching between opaque and transparent
colors though.

Change-Id: If4c1e22886d7ebc7d87ca880dd9c6a659855a931
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

2 files changed, 7 insertions, 1 deletions

diff --git a/src/core/renderer/render_view_observer_qt.cpp b/src/core/renderer/render_view_observer_qt.cpp
index 731d8b97d..5b0b9a77d 100644
--- a/src/core/renderer/render_view_observer_qt.cpp
+++ b/src/core/renderer/render_view_observer_qt.cpp
@@ -73,7 +73,7 @@ void RenderViewObserverQt::onFetchDocumentInnerText(quint64 requestId)
 
 void RenderViewObserverQt::onSetBackgroundColor(quint32 color)
 {
-    render_view()->GetWebView()->SetBaseBackgroundColor(color);
+    render_view()->GetWebView()->SetBaseBackgroundColorOverride(color);
 }
 
 void RenderViewObserverQt::OnDestruct()
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index e1d97af25..a6b3e0905 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -4397,6 +4397,7 @@ void tst_QWebEnginePage::backgroundColor()
     QWebEnginePage *page = new QWebEnginePage(&profile, &view);
 
     view.resize(640, 480);
+    view.setStyleSheet("background: yellow");
     view.show();
     QPoint center(view.size().width() / 2, view.size().height() / 2);
 
@@ -4421,6 +4422,11 @@ void tst_QWebEnginePage::backgroundColor()
     QCOMPARE(page->backgroundColor(), Qt::red);
     QCOMPARE(view.grab().toImage().pixelColor(center), Qt::red);
 
+    page->setBackgroundColor(Qt::transparent);
+
+    QCOMPARE(page->backgroundColor(), Qt::transparent);
+    QTRY_COMPARE(view.grab().toImage().pixelColor(center), Qt::yellow);
+
     page->setBackgroundColor(Qt::green);
 
     QCOMPARE(page->backgroundColor(), Qt::green);