[Qt] WebGL does not require accelerated compositing
authorallan.jensen@digia.com <allan.jensen@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Jan 2013 16:01:56 +0000 (16:01 +0000)
committerallan.jensen@digia.com <allan.jensen@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Jan 2013 16:01:56 +0000 (16:01 +0000)
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@139742 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/html/HTMLCanvasElement.cpp

index 8ccb8aa..22df728 100644 (file)
@@ -1,3 +1,15 @@
+2013-01-15  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [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):
+
 2013-01-15  Andrey Lushnikov  <lushnikov@chromium.org>
 
         Web Inspector: refactor DefaultTextEditor's paintLine method
index cf4f6c1..b99d5fc 100644 (file)
@@ -189,7 +189,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
         ) {