diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
| commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
| tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp | |
| parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
| download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 | |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp')
| -rw-r--r-- | WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
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) |