diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-04-11 17:46:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-11 18:28:15 +0200 |
| commit | 1b4ac98f05eef52756e402d24ef680c464518cd8 (patch) | |
| tree | 5df8986980abd652393132ea2c3e71eff2858411 /Source/WebCore/html | |
| parent | 769a561e2e4bdac702c42c1781d9d3078b498ec1 (diff) | |
[Qt] WebGL does not require accelerated compositing
https://bugs.webkit.org/show_bug.cgi?id=106892
Reviewed by Jocelyn Turcotte.
Allow the creation of WebGL canvas even when accelerated compositing is not enabled.
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::getContext):
Change-Id: If827ac5846ff26583bf30fb3424f4bbfe762a75b
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@139742 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Source/WebCore/html')
| -rw-r--r-- | Source/WebCore/html/HTMLCanvasElement.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp index 006f9ab5f..1e0e0bf89 100644 --- a/Source/WebCore/html/HTMLCanvasElement.cpp +++ b/Source/WebCore/html/HTMLCanvasElement.cpp @@ -188,7 +188,7 @@ CanvasRenderingContext* HTMLCanvasElement::getContext(const String& type, Canvas #if ENABLE(WEBGL) Settings* settings = document()->settings(); if (settings && settings->webGLEnabled() -#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL) +#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(QT) && settings->acceleratedCompositingEnabled() #endif ) { |