summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/delegated_frame_node.cpp29
-rw-r--r--src/core/delegated_frame_node.h14
-rw-r--r--src/core/render_widget_host_view_qt.cpp53
-rw-r--r--src/core/render_widget_host_view_qt.h9
-rw-r--r--src/core/render_widget_host_view_qt_delegate.h4
-rw-r--r--src/core/web_contents_adapter.cpp12
-rw-r--r--src/core/web_contents_adapter.h3
-rw-r--r--src/webengine/api/qquickwebengineview.cpp12
-rw-r--r--src/webengine/api/qquickwebengineview_p.h1
-rw-r--r--src/webengine/render_widget_host_view_qt_delegate_quick.cpp18
-rw-r--r--src/webengine/render_widget_host_view_qt_delegate_quick.h8
-rw-r--r--src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp11
-rw-r--r--src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h2
13 files changed, 104 insertions, 72 deletions
diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp
index c770f388d..c7d3d7e27 100644
--- a/src/core/delegated_frame_node.cpp
+++ b/src/core/delegated_frame_node.cpp
@@ -293,7 +293,7 @@ void DelegatedFrameNode::preprocess()
// We can now wait for the Chromium GPU thread to produce textures that will be
// rendered on our quads and fetch the IDs from the mailboxes we were given.
QList<MailboxTexture *> mailboxesToFetch;
- Q_FOREACH (const QSharedPointer<MailboxTexture> &mailboxTexture, m_mailboxTextures.values())
+ Q_FOREACH (const QSharedPointer<MailboxTexture> &mailboxTexture, m_data->mailboxTextures.values())
if (mailboxTexture->needsToFetch())
mailboxesToFetch.append(mailboxTexture.data());
@@ -315,13 +315,18 @@ void DelegatedFrameNode::preprocess()
renderPass->grab();
}
-void DelegatedFrameNode::commit(cc::DelegatedFrameData *frameData, cc::TransferableResourceArray *resourcesToRelease)
+void DelegatedFrameNode::commit(DelegatedFrameNodeData* data, cc::ReturnedResourceArray *resourcesToRelease)
{
+ m_data = data;
+ cc::DelegatedFrameData* frameData = m_data->frameData.get();
+ if (!frameData)
+ return;
+
// Keep the old texture lists around to find the ones we can re-use.
QList<QSharedPointer<RenderPassTexture> > oldRenderPassTextures;
m_renderPassTextures.swap(oldRenderPassTextures);
- QMap<int, QSharedPointer<MailboxTexture> > mailboxTextureCandidates;
- m_mailboxTextures.swap(mailboxTextureCandidates);
+ QHash<unsigned, QSharedPointer<MailboxTexture> > mailboxTextureCandidates;
+ m_data->mailboxTextures.swap(mailboxTextureCandidates);
// A frame's resource_list only contains the new resources to be added to the scene. Quads can
// still reference resources that were added in previous frames. Add them to the list of
@@ -332,6 +337,8 @@ void DelegatedFrameNode::commit(cc::DelegatedFrameData *frameData, cc::Transfera
mailboxTextureCandidates[res.id] = QSharedPointer<MailboxTexture>(new MailboxTexture(res));
}
+ frameData->resource_list.clear();
+
// The RenderPasses list is actually a tree where a parent RenderPass is connected
// to its dependencies through a RenderPass::Id reference in one or more RenderPassQuads.
// The list is already ordered with intermediate RenderPasses placed before their
@@ -392,7 +399,7 @@ void DelegatedFrameNode::commit(cc::DelegatedFrameData *frameData, cc::Transfera
break;
} case cc::DrawQuad::TEXTURE_CONTENT: {
const cc::TextureDrawQuad *tquad = cc::TextureDrawQuad::MaterialCast(quad);
- QSharedPointer<MailboxTexture> &texture = m_mailboxTextures[tquad->resource_id] = mailboxTextureCandidates.take(tquad->resource_id);
+ QSharedPointer<MailboxTexture> &texture = m_data->mailboxTextures[tquad->resource_id] = mailboxTextureCandidates.take(tquad->resource_id);
Q_ASSERT(texture);
// FIXME: TransferableResource::size isn't always set properly for TextureDrawQuads, use the size of its DrawQuad::rect instead.
@@ -431,7 +438,7 @@ void DelegatedFrameNode::commit(cc::DelegatedFrameData *frameData, cc::Transfera
break;
} case cc::DrawQuad::TILED_CONTENT: {
const cc::TileDrawQuad *tquad = cc::TileDrawQuad::MaterialCast(quad);
- QSharedPointer<MailboxTexture> &texture = m_mailboxTextures[tquad->resource_id] = mailboxTextureCandidates.take(tquad->resource_id);
+ QSharedPointer<MailboxTexture> &texture = m_data->mailboxTextures[tquad->resource_id] = mailboxTextureCandidates.take(tquad->resource_id);
Q_ASSERT(texture);
if (!quad->visible_rect.IsEmpty() && !quad->opaque_rect.Contains(quad->visible_rect))
@@ -449,16 +456,16 @@ void DelegatedFrameNode::commit(cc::DelegatedFrameData *frameData, cc::Transfera
break;
} case cc::DrawQuad::YUV_VIDEO_CONTENT: {
const cc::YUVVideoDrawQuad *vquad = cc::YUVVideoDrawQuad::MaterialCast(quad);
- QSharedPointer<MailboxTexture> &yTexture = m_mailboxTextures[vquad->y_plane_resource_id] = mailboxTextureCandidates.take(vquad->y_plane_resource_id);
- QSharedPointer<MailboxTexture> &uTexture = m_mailboxTextures[vquad->u_plane_resource_id] = mailboxTextureCandidates.take(vquad->u_plane_resource_id);
- QSharedPointer<MailboxTexture> &vTexture = m_mailboxTextures[vquad->v_plane_resource_id] = mailboxTextureCandidates.take(vquad->v_plane_resource_id);
+ QSharedPointer<MailboxTexture> &yTexture = m_data->mailboxTextures[vquad->y_plane_resource_id] = mailboxTextureCandidates.take(vquad->y_plane_resource_id);
+ QSharedPointer<MailboxTexture> &uTexture = m_data->mailboxTextures[vquad->u_plane_resource_id] = mailboxTextureCandidates.take(vquad->u_plane_resource_id);
+ QSharedPointer<MailboxTexture> &vTexture = m_data->mailboxTextures[vquad->v_plane_resource_id] = mailboxTextureCandidates.take(vquad->v_plane_resource_id);
Q_ASSERT(yTexture && uTexture && vTexture);
// Do not use a reference for this one, it might be null.
QSharedPointer<MailboxTexture> aTexture;
// This currently requires --enable-vp8-alpha-playback and needs a video with alpha data to be triggered.
if (vquad->a_plane_resource_id)
- aTexture = m_mailboxTextures[vquad->a_plane_resource_id] = mailboxTextureCandidates.take(vquad->a_plane_resource_id);
+ aTexture = m_data->mailboxTextures[vquad->a_plane_resource_id] = mailboxTextureCandidates.take(vquad->a_plane_resource_id);
YUVVideoNode *videoNode = new YUVVideoNode(yTexture.data(), uTexture.data(), vTexture.data(), aTexture.data(), toQt(vquad->tex_scale));
videoNode->setRect(toQt(quad->rect));
@@ -481,7 +488,7 @@ void DelegatedFrameNode::commit(cc::DelegatedFrameData *frameData, cc::Transfera
// for us (mainly to clean the output of --enable-gpu-service-logging).
mailboxTexture->resource().sync_point = 0;
- resourcesToRelease->push_back(mailboxTexture->resource());
+ resourcesToRelease->push_back(mailboxTexture->resource().ToReturnedResource());
}
}
diff --git a/src/core/delegated_frame_node.h b/src/core/delegated_frame_node.h
index b73370874..2a4ae53d0 100644
--- a/src/core/delegated_frame_node.h
+++ b/src/core/delegated_frame_node.h
@@ -42,9 +42,11 @@
#ifndef DELEGATED_FRAME_NODE_H
#define DELEGATED_FRAME_NODE_H
+#include "base/memory/scoped_ptr.h"
#include "cc/resources/transferable_resource.h"
#include <QMutex>
#include <QSGNode>
+#include <QSharedData>
#include <QSharedPointer>
#include <QWaitCondition>
@@ -61,17 +63,25 @@ class DelegatedFrameData;
class MailboxTexture;
class RenderPassTexture;
+// Separating this data allows another DelegatedFrameNode to reconstruct the QSGNode tree from the mailbox textures
+// and render pass information.
+class DelegatedFrameNodeData : public QSharedData {
+public:
+ QHash<unsigned, QSharedPointer<MailboxTexture> > mailboxTextures;
+ scoped_ptr<cc::DelegatedFrameData> frameData;
+};
+
class DelegatedFrameNode : public QSGNode {
public:
DelegatedFrameNode(QQuickWindow *window);
~DelegatedFrameNode();
void preprocess();
- void commit(cc::DelegatedFrameData *frameData, cc::TransferableResourceArray *resourcesToRelease);
+ void commit(DelegatedFrameNodeData* data, cc::ReturnedResourceArray *resourcesToRelease);
private:
+ QExplicitlySharedDataPointer<DelegatedFrameNodeData> m_data;
QQuickWindow *m_window;
QList<QSharedPointer<RenderPassTexture> > m_renderPassTextures;
- QMap<int, QSharedPointer<MailboxTexture> > m_mailboxTextures;
int m_numPendingSyncPoints;
QWaitCondition m_mailboxesFetchedWaitCond;
QMutex m_mutex;
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 0e85c5857..9279c57b0 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -141,11 +141,12 @@ RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost* widget
: m_host(content::RenderWidgetHostImpl::From(widget))
, m_gestureRecognizer(ui::GestureRecognizer::Create(this))
, m_backingStore(0)
+ , m_frameNodeData(new DelegatedFrameNodeData)
+ , m_needsDelegatedFrameAck(false)
, m_adapterClient(0)
, m_anchorPositionWithinSelection(0)
, m_cursorPositionWithinSelection(0)
, m_initPending(false)
- , m_readyForSurface(false)
{
m_host->SetView(this);
}
@@ -244,8 +245,7 @@ gfx::NativeView RenderWidgetHostViewQt::GetNativeView() const
gfx::NativeViewId RenderWidgetHostViewQt::GetNativeViewId() const
{
- const_cast<RenderWidgetHostViewQt *>(this)->m_readyForSurface = true;
- return m_delegate->nativeWindowIdForCompositor();
+ return 0;
}
gfx::NativeViewAccessible RenderWidgetHostViewQt::GetNativeViewAccessible()
@@ -333,17 +333,11 @@ gfx::NativeView RenderWidgetHostViewQt::BuildInputMethodsGtkMenu()
void RenderWidgetHostViewQt::WasShown()
{
- if (m_delegate->isVisible())
- return;
-
m_host->WasShown();
}
void RenderWidgetHostViewQt::WasHidden()
{
- if (!m_delegate->isVisible())
- return;
-
m_host->WasHidden();
}
@@ -584,10 +578,12 @@ bool RenderWidgetHostViewQt::HasAcceleratedSurface(const gfx::Size&)
void RenderWidgetHostViewQt::OnSwapCompositorFrame(uint32 output_surface_id, scoped_ptr<cc::CompositorFrame> frame)
{
- Q_ASSERT(!m_pendingFrameData);
- Q_ASSERT(frame->delegated_frame_data);
+ Q_ASSERT(!m_needsDelegatedFrameAck);
+ m_needsDelegatedFrameAck = true;
m_pendingOutputSurfaceId = output_surface_id;
- m_pendingFrameData = frame->delegated_frame_data.Pass();
+ Q_ASSERT(frame->delegated_frame_data);
+ Q_ASSERT(!m_frameNodeData->frameData || m_frameNodeData->frameData->resource_list.empty());
+ m_frameNodeData->frameData = frame->delegated_frame_data.Pass();
m_delegate->update();
}
@@ -611,12 +607,9 @@ gfx::Rect RenderWidgetHostViewQt::GetBoundsInRootWindow()
gfx::GLSurfaceHandle RenderWidgetHostViewQt::GetCompositingSurface()
{
- gfx::NativeViewId nativeViewId = GetNativeViewId();
-#if defined(OS_WIN)
- return nativeViewId ? gfx::GLSurfaceHandle(reinterpret_cast<gfx::PluginWindowHandle>(nativeViewId), gfx::NATIVE_TRANSPORT) : gfx::GLSurfaceHandle();
-#else
- return nativeViewId ? gfx::GLSurfaceHandle(nativeViewId, gfx::NATIVE_TRANSPORT) : gfx::GLSurfaceHandle();
-#endif
+ if (!m_delegate->supportsHardwareAcceleration())
+ return gfx::GLSurfaceHandle();
+ return gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::TEXTURE_TRANSPORT);
}
void RenderWidgetHostViewQt::SetHasHorizontalScrollbar(bool) { }
@@ -648,20 +641,19 @@ void RenderWidgetHostViewQt::paint(QPainter *painter, const QRectF& boundingRect
QSGNode *RenderWidgetHostViewQt::updatePaintNode(QSGNode *oldNode, QQuickWindow *window)
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
- if (!m_pendingFrameData)
- return oldNode;
-
DelegatedFrameNode *frameNode = static_cast<DelegatedFrameNode *>(oldNode);
if (!frameNode)
frameNode = new DelegatedFrameNode(window);
- frameNode->commit(m_pendingFrameData.get(), &m_resourcesToRelease);
- m_pendingFrameData.reset();
+ frameNode->commit(m_frameNodeData.data(), &m_resourcesToRelease);
// This is possibly called from the Qt render thread, post the ack back to the UI
// to tell the child compositors to release resources and trigger a new frame.
- content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
- base::Bind(&RenderWidgetHostViewQt::sendDelegatedFrameAck, AsWeakPtr()));
+ if (m_needsDelegatedFrameAck) {
+ m_needsDelegatedFrameAck = false;
+ content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
+ base::Bind(&RenderWidgetHostViewQt::sendDelegatedFrameAck, AsWeakPtr()));
+ }
return frameNode;
#else
@@ -743,11 +735,10 @@ QVariant RenderWidgetHostViewQt::inputMethodQuery(Qt::InputMethodQuery query) co
}
}
-void RenderWidgetHostViewQt::compositingSurfaceUpdated()
+void RenderWidgetHostViewQt::windowChanged()
{
- // Don't report an update until we get asked at least once.
- if (m_readyForSurface)
- m_host->CompositingSurfaceUpdated();
+ if (m_delegate->window())
+ m_host->NotifyScreenInfoChanged();
}
void RenderWidgetHostViewQt::ProcessAckedTouchEvent(const content::TouchEventWithLatencyInfo &touch, content::InputEventAckState ack_result) {
@@ -767,12 +758,10 @@ void RenderWidgetHostViewQt::ProcessAckedTouchEvent(const content::TouchEventWit
void RenderWidgetHostViewQt::sendDelegatedFrameAck()
{
cc::CompositorFrameAck ack;
- cc::TransferableResource::ReturnResources(m_resourcesToRelease, &ack.resources);
+ m_resourcesToRelease.swap(ack.resources);
content::RenderWidgetHostImpl::SendSwapCompositorFrameAck(
m_host->GetRoutingID(), m_pendingOutputSurfaceId,
m_host->GetProcess()->GetID(), ack);
-
- m_resourcesToRelease.clear();
}
void RenderWidgetHostViewQt::Paint(const gfx::Rect& damage_rect)
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index 6938b7060..861315e8a 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -48,6 +48,7 @@
#include "base/memory/weak_ptr.h"
#include "cc/resources/transferable_resource.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "delegated_frame_node.h"
#include "ui/base/gestures/gesture_recognizer.h"
#include "ui/base/gestures/gesture_types.h"
#include <QMap>
@@ -171,7 +172,7 @@ public:
virtual void notifyResize() Q_DECL_OVERRIDE;
virtual bool forwardEvent(QEvent *) Q_DECL_OVERRIDE;
virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE;
- virtual void compositingSurfaceUpdated() Q_DECL_OVERRIDE;
+ virtual void windowChanged() Q_DECL_OVERRIDE;
void handleMouseEvent(QMouseEvent*);
void handleKeyEvent(QKeyEvent*);
@@ -221,8 +222,9 @@ private:
scoped_ptr<RenderWidgetHostViewQtDelegate> m_delegate;
BackingStoreQt *m_backingStore;
- scoped_ptr<cc::DelegatedFrameData> m_pendingFrameData;
- cc::TransferableResourceArray m_resourcesToRelease;
+ QExplicitlySharedDataPointer<DelegatedFrameNodeData> m_frameNodeData;
+ cc::ReturnedResourceArray m_resourcesToRelease;
+ bool m_needsDelegatedFrameAck;
uint32 m_pendingOutputSurfaceId;
WebContentsAdapterClient *m_adapterClient;
@@ -234,7 +236,6 @@ private:
size_t m_cursorPositionWithinSelection;
bool m_initPending;
- bool m_readyForSurface;
};
#endif // RENDER_WIDGET_HOST_VIEW_QT_H
diff --git a/src/core/render_widget_host_view_qt_delegate.h b/src/core/render_widget_host_view_qt_delegate.h
index 74151fdbf..7ed895f0b 100644
--- a/src/core/render_widget_host_view_qt_delegate.h
+++ b/src/core/render_widget_host_view_qt_delegate.h
@@ -68,7 +68,7 @@ public:
virtual void notifyResize() = 0;
virtual bool forwardEvent(QEvent *) = 0;
virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const = 0;
- virtual void compositingSurfaceUpdated() = 0;
+ virtual void windowChanged() = 0;
};
class QWEBENGINE_EXPORT RenderWidgetHostViewQtDelegate {
@@ -82,12 +82,12 @@ public:
virtual void show() = 0;
virtual void hide() = 0;
virtual bool isVisible() const = 0;
- virtual WId nativeWindowIdForCompositor() const = 0;
virtual QWindow* window() const = 0;
virtual void update(const QRect& rect = QRect()) = 0;
virtual void updateCursor(const QCursor &) = 0;
virtual void resize(int width, int height) = 0;
virtual void inputMethodStateChanged(bool editorVisible) = 0;
+ virtual bool supportsHardwareAcceleration() const = 0;
};
#endif // RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_H
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 4c197090c..dfd924e66 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -415,6 +415,18 @@ quint64 WebContentsAdapter::fetchDocumentInnerText()
return d->lastRequestId;
}
+void WebContentsAdapter::wasShown()
+{
+ Q_D(WebContentsAdapter);
+ d->webContents->WasShown();
+}
+
+void WebContentsAdapter::wasHidden()
+{
+ Q_D(WebContentsAdapter);
+ d->webContents->WasHidden();
+}
+
void WebContentsAdapter::dpiScaleChanged()
{
Q_D(WebContentsAdapter);
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h
index e70aae259..f39599d93 100644
--- a/src/core/web_contents_adapter.h
+++ b/src/core/web_contents_adapter.h
@@ -89,6 +89,9 @@ public:
quint64 fetchDocumentMarkup();
quint64 fetchDocumentInnerText();
+ void wasShown();
+ void wasHidden();
+
void dpiScaleChanged();
private:
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 792102631..049e353b6 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -453,6 +453,18 @@ void QQuickWebEngineView::geometryChanged(const QRectF &newGeometry, const QRect
}
}
+void QQuickWebEngineView::itemChange(ItemChange change, const ItemChangeData &value)
+{
+ Q_D(QQuickWebEngineView);
+ if (change == ItemSceneChange || change == ItemVisibleHasChanged) {
+ if (window() && isVisible())
+ d->adapter->wasShown();
+ else
+ d->adapter->wasHidden();
+ }
+ QQuickItem::itemChange(change, value);
+}
+
QQuickWebEngineViewHandle::QQuickWebEngineViewHandle()
{
}
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 6b7b44e63..abc46d55f 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -111,6 +111,7 @@ Q_SIGNALS:
protected:
void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+ void itemChange(ItemChange, const ItemChangeData &);
private:
Q_DECLARE_PRIVATE(QQuickWebEngineView)
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index 8d0f5f0cc..9a983a2b7 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -48,21 +48,21 @@ RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(RenderW
setFlag(ItemHasContents);
}
-WId RenderWidgetHostViewQtDelegateQuick::nativeWindowIdForCompositor() const
+void RenderWidgetHostViewQtDelegateQuick::update(const QRect&)
{
- return QQuickItem::window() ? QQuickItem::window()->winId() : 0;
+ QQuickItem::update();
}
-void RenderWidgetHostViewQtDelegateQuick::update(const QRect&)
+bool RenderWidgetHostViewQtDelegateQuick::supportsHardwareAcceleration() const
{
- QQuickItem::update();
+ return true;
}
void RenderWidgetHostViewQtDelegateQuick::itemChange(ItemChange change, const ItemChangeData &value)
{
QQuickItem::itemChange(change, value);
- if (change == QQuickItem::ItemSceneChange && value.window)
- m_client->compositingSurfaceUpdated();
+ if (change == QQuickItem::ItemSceneChange)
+ m_client->windowChanged();
}
QSGNode *RenderWidgetHostViewQtDelegateQuick::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
@@ -76,12 +76,6 @@ RenderWidgetHostViewQtDelegateQuickPainted::RenderWidgetHostViewQtDelegateQuickP
{
}
-WId RenderWidgetHostViewQtDelegateQuickPainted::nativeWindowIdForCompositor() const
-{
- // This causes a failure of the compositor initialization which ends up disabling it completely.
- return 0;
-}
-
void RenderWidgetHostViewQtDelegateQuickPainted::update(const QRect& rect)
{
polish();
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h
index b31a9c873..9c7bba35e 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h
@@ -126,6 +126,11 @@ public:
this->setSize(QSizeF(width, height));
}
+ virtual bool supportsHardwareAcceleration() const Q_DECL_OVERRIDE
+ {
+ return false;
+ }
+
void focusInEvent(QFocusEvent *event)
{
m_client->forwardEvent(event);
@@ -214,8 +219,8 @@ class RenderWidgetHostViewQtDelegateQuick : public RenderWidgetHostViewQtDelegat
public:
RenderWidgetHostViewQtDelegateQuick(RenderWidgetHostViewQtDelegateClient *client, QQuickItem *parent = 0);
- virtual WId nativeWindowIdForCompositor() const;
virtual void update(const QRect& rect = QRect()) Q_DECL_OVERRIDE;
+ virtual bool supportsHardwareAcceleration() const Q_DECL_OVERRIDE;
virtual void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE;
virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
@@ -228,7 +233,6 @@ class RenderWidgetHostViewQtDelegateQuickPainted : public RenderWidgetHostViewQt
public:
RenderWidgetHostViewQtDelegateQuickPainted(RenderWidgetHostViewQtDelegateClient *client, QQuickItem *parent = 0);
- virtual WId nativeWindowIdForCompositor() const Q_DECL_OVERRIDE;
virtual void update(const QRect& rect = QRect()) Q_DECL_OVERRIDE;
void paint(QPainter *painter);
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index c7b831853..d0bc44a5b 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -111,12 +111,6 @@ bool RenderWidgetHostViewQtDelegateWidget::isVisible() const
return QWidget::isVisible();
}
-WId RenderWidgetHostViewQtDelegateWidget::nativeWindowIdForCompositor() const
-{
- // The QtWidgets API doesn't support hardware acceleration.
- return 0;
-}
-
QWindow* RenderWidgetHostViewQtDelegateWidget::window() const
{
const QWidget* root = QWidget::window();
@@ -153,6 +147,11 @@ QVariant RenderWidgetHostViewQtDelegateWidget::inputMethodQuery(Qt::InputMethodQ
return m_client->inputMethodQuery(query);
}
+bool RenderWidgetHostViewQtDelegateWidget::supportsHardwareAcceleration() const
+{
+ return false;
+}
+
void RenderWidgetHostViewQtDelegateWidget::paintEvent(QPaintEvent * event)
{
QPainter painter(this);
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
index 7ec91931f..5102fe0e7 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
@@ -66,12 +66,12 @@ public:
virtual void show() Q_DECL_OVERRIDE;
virtual void hide() Q_DECL_OVERRIDE;
virtual bool isVisible() const Q_DECL_OVERRIDE;
- virtual WId nativeWindowIdForCompositor() const Q_DECL_OVERRIDE;
virtual QWindow* window() const Q_DECL_OVERRIDE;
virtual void update(const QRect& rect = QRect()) Q_DECL_OVERRIDE;
virtual void updateCursor(const QCursor &) Q_DECL_OVERRIDE;
virtual void resize(int width, int height) Q_DECL_OVERRIDE;
virtual void inputMethodStateChanged(bool editorVisible) Q_DECL_OVERRIDE;
+ virtual bool supportsHardwareAcceleration() const Q_DECL_OVERRIDE;
protected:
void paintEvent(QPaintEvent * event);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 09:17:14 +0000