Changeset 64308 in webkit

Timestamp:

Jul 29, 2010 2:35:23 PM (14 years ago)

Author:

jamesr@google.com

Message:

2010-07-29 James Robinson <​jamesr@chromium.org>

Reviewed by Simon Fraser.

Ask a canvas' rendering context if it is accelerated instead tying it directly to webgl
​https://bugs.webkit.org/show_bug.cgi?id=43206

This unifies the logic for whether a canvas is accelerated or not into one place
and makes it easier to expand the logic in the future to, for example, cover some
2d canvases.

Just a refactoring, no change in behavior so no new tests.

• html/canvas/CanvasRenderingContext.h: (WebCore::CanvasRenderingContext::isAccelerated):
• html/canvas/WebGLRenderingContext.h: (WebCore::WebGLRenderingContext::isAccelerated):
• rendering/RenderHTMLCanvas.cpp: (WebCore::RenderHTMLCanvas::requiresLayer):
• rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::requiresCompositingForCanvas):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/CanvasRenderingContext.h (modified) (1 diff)
• html/canvas/WebGLRenderingContext.h (modified) (1 diff)
• rendering/RenderHTMLCanvas.cpp (modified) (2 diffs)
• rendering/RenderLayerCompositor.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-29  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Simon Fraser.
+
+        Ask a canvas' rendering context if it is accelerated instead tying it directly to webgl
+        https://bugs.webkit.org/show_bug.cgi?id=43206
+
+        This unifies the logic for whether a canvas is accelerated or not into one place
+        and makes it easier to expand the logic in the future to, for example, cover some
+        2d canvases.
+
+        Just a refactoring, no change in behavior so no new tests.
+
+        * html/canvas/CanvasRenderingContext.h:
+        (WebCore::CanvasRenderingContext::isAccelerated):
+        * html/canvas/WebGLRenderingContext.h:
+        (WebCore::WebGLRenderingContext::isAccelerated):
+        * rendering/RenderHTMLCanvas.cpp:
+        (WebCore::RenderHTMLCanvas::requiresLayer):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::requiresCompositingForCanvas):
+
 2010-07-29  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/html/canvas/CanvasRenderingContext.h

@@ -47 +47 @@
         virtual bool is2d() const { return false; }
         virtual bool is3d() const { return false; }
+        virtual bool isAccelerated() const { return false; }
 
     private:

trunk/WebCore/html/canvas/WebGLRenderingContext.h

@@ -59 +59 @@
 
         virtual bool is3d() const { return true; }
+        virtual bool isAccelerated() const { return true; }
 
         // Helper to return the size in bytes of OpenGL data types

trunk/WebCore/rendering/RenderHTMLCanvas.cpp

@@ -27 +27 @@
 #include "RenderHTMLCanvas.h"
 
+#include "CanvasRenderingContext.h"
 #include "Document.h"
 #include "GraphicsContext.h"
@@ -49 +50 @@
         return true;
     
-#if ENABLE(3D_CANVAS)
     HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(node());
-    return canvas && canvas->is3D();
-#else
-    return false;
-#endif
+    return canvas && canvas->renderingContext() && canvas->renderingContext()->isAccelerated();
 }
 

trunk/WebCore/rendering/RenderLayerCompositor.cpp

@@ -30 +30 @@
 
 #include "AnimationController.h"
+#include "CanvasRenderingContext.h"
 #include "CSSPropertyNames.h"
 #include "Chrome.h"
@@ -1186 +1187 @@
 bool RenderLayerCompositor::requiresCompositingForCanvas(RenderObject* renderer) const
 {
-#if ENABLE(3D_CANVAS)    
     if (renderer->isCanvas()) {
         HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(renderer->node());
-        return canvas->is3D();
-    }
-#else
-    UNUSED_PARAM(renderer);
-#endif
+        return canvas->renderingContext() && canvas->renderingContext()->isAccelerated();
+    }
     return false;
 }