From 967717af5423377c967781471ee106e2bb4e11c8 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 22 Jul 2010 15:37:06 +0100 Subject: Merge WebKit at r63859 : Initial merge by git. Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62 --- WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp') diff --git a/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp b/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp index 002765f..311d3a3 100644 --- a/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp +++ b/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp @@ -521,6 +521,15 @@ void GraphicsContext3D::makeContextCurrent() void GraphicsContext3D::beginPaint(WebGLRenderingContext* context) { + paintRenderingResultsToCanvas(); +} + +void GraphicsContext3D::endPaint() +{ +} + +void GraphicsContext3D::paintRenderingResultsToCanvas(WebGLRenderingContext* context) +{ m_internal->m_glWidget->makeCurrent(); HTMLCanvasElement* canvas = context->canvas(); ImageBuffer* imageBuffer = canvas->buffer(); @@ -528,10 +537,6 @@ void GraphicsContext3D::beginPaint(WebGLRenderingContext* context) paint(painter, QRect(QPoint(0, 0), QSize(m_currentWidth, m_currentHeight))); } -void GraphicsContext3D::endPaint() -{ -} - void GraphicsContext3D::paint(QPainter* painter, const QRect& rect) const { #if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) -- cgit v1.1