Title: [118110] trunk/Source
Revision
118110
Author
[email protected]
Date
2012-05-22 20:23:22 -0700 (Tue, 22 May 2012)

Log Message

[Chromium] Call canAccelerate2dCanvas directly
https://bugs.webkit.org/show_bug.cgi?id=86893

Reviewed by James Robinson.

Part of a refactoring series. See tracking bug 82948.

Source/Platform:

* chromium/public/Platform.h:
(Platform):
(WebKit::Platform::canAccelerate2dCanvas):

Source/WebCore:

* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::shouldAccelerate):
* platform/chromium/PlatformSupport.h:

Source/WebKit/chromium:

* public/platform/WebKitPlatformSupport.h:
(WebKitPlatformSupport):
* src/PlatformSupport.cpp:
(WebCore):

Modified Paths

Diff

Modified: trunk/Source/Platform/ChangeLog (118109 => 118110)


--- trunk/Source/Platform/ChangeLog	2012-05-23 03:23:01 UTC (rev 118109)
+++ trunk/Source/Platform/ChangeLog	2012-05-23 03:23:22 UTC (rev 118110)
@@ -1,5 +1,18 @@
 2012-05-22  Mark Pilgrim  <[email protected]>
 
+        [Chromium] Call canAccelerate2dCanvas directly
+        https://bugs.webkit.org/show_bug.cgi?id=86893
+
+        Reviewed by James Robinson.
+
+        Part of a refactoring series. See tracking bug 82948.
+
+        * chromium/public/Platform.h:
+        (Platform):
+        (WebKit::Platform::canAccelerate2dCanvas):
+
+2012-05-22  Mark Pilgrim  <[email protected]>
+
         [Chromium] Move cookieJar to Platform.h
         https://bugs.webkit.org/show_bug.cgi?id=86755
 

Modified: trunk/Source/Platform/chromium/public/Platform.h (118109 => 118110)


--- trunk/Source/Platform/chromium/public/Platform.h	2012-05-23 03:23:01 UTC (rev 118109)
+++ trunk/Source/Platform/chromium/public/Platform.h	2012-05-23 03:23:22 UTC (rev 118110)
@@ -317,7 +317,14 @@
     // Returns newly allocated and initialized offscreen WebGraphicsContext3D instance.
     virtual WebGraphicsContext3D* createOffscreenGraphicsContext3D(const WebGraphicsContext3D::Attributes&) { return 0; }
 
+    // Returns true if the platform is capable of producing an offscreen context suitable for accelerating 2d canvas.
+    // This will return false if the platform cannot promise that contexts will be preserved across operations like
+    // locking the screen or if the platform cannot provide a context with suitable performance characteristics.
+    //
+    // This value must be checked again after a context loss event as the platform's capabilities may have changed.
+    virtual bool canAccelerate2dCanvas() { return false; }
 
+    
     // WebRTC ----------------------------------------------------------
 
     // DEPRECATED

Modified: trunk/Source/WebCore/ChangeLog (118109 => 118110)


--- trunk/Source/WebCore/ChangeLog	2012-05-23 03:23:01 UTC (rev 118109)
+++ trunk/Source/WebCore/ChangeLog	2012-05-23 03:23:22 UTC (rev 118110)
@@ -1,3 +1,16 @@
+2012-05-22  Mark Pilgrim  <[email protected]>
+
+        [Chromium] Call canAccelerate2dCanvas directly
+        https://bugs.webkit.org/show_bug.cgi?id=86893
+
+        Reviewed by James Robinson.
+
+        Part of a refactoring series. See tracking bug 82948.
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::shouldAccelerate):
+        * platform/chromium/PlatformSupport.h:
+
 2012-05-22  Jason Liu  <[email protected]>
 
         [BlackBerry] Possible to clobber httponly cookie.

Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (118109 => 118110)


--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp	2012-05-23 03:23:01 UTC (rev 118109)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp	2012-05-23 03:23:22 UTC (rev 118110)
@@ -59,7 +59,7 @@
 #endif
 
 #if PLATFORM(CHROMIUM)
-#include "PlatformSupport.h"
+#include <public/Platform.h>
 #endif
 
 namespace WebCore {
@@ -485,7 +485,7 @@
         return false;
 
 #if PLATFORM(CHROMIUM)
-    if (!PlatformSupport::canAccelerate2dCanvas())
+    if (!WebKit::Platform::current()->canAccelerate2dCanvas())
         return false;
 #endif
 

Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (118109 => 118110)


--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h	2012-05-23 03:23:01 UTC (rev 118109)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h	2012-05-23 03:23:22 UTC (rev 118110)
@@ -371,8 +371,6 @@
 
     static void didStartWorkerRunLoop(WorkerRunLoop*);
     static void didStopWorkerRunLoop(WorkerRunLoop*);
-
-    static bool canAccelerate2dCanvas();
 };
 
 } // namespace WebCore

Modified: trunk/Source/WebKit/chromium/ChangeLog (118109 => 118110)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-05-23 03:23:01 UTC (rev 118109)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-05-23 03:23:22 UTC (rev 118110)
@@ -1,3 +1,17 @@
+2012-05-22  Mark Pilgrim  <[email protected]>
+
+        [Chromium] Call canAccelerate2dCanvas directly
+        https://bugs.webkit.org/show_bug.cgi?id=86893
+
+        Reviewed by James Robinson.
+
+        Part of a refactoring series. See tracking bug 82948.
+
+        * public/platform/WebKitPlatformSupport.h:
+        (WebKitPlatformSupport):
+        * src/PlatformSupport.cpp:
+        (WebCore):
+
 2012-05-22  Dana Jansens  <[email protected]>
 
         [chromium] Don't drop children of a RenderSurface from the renderSurfaceLayerList when then position of the surface in its clipRect is not known

Modified: trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h (118109 => 118110)


--- trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h	2012-05-23 03:23:01 UTC (rev 118109)
+++ trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h	2012-05-23 03:23:22 UTC (rev 118110)
@@ -132,16 +132,7 @@
 
     virtual WebSharedWorkerRepository* sharedWorkerRepository() { return 0; }
 
-    // GPU ----------------------------------------------------------------
 
-    // Returns true if the platform is capable of producing an offscreen context suitable for accelerating 2d canvas.
-    // This will return false if the platform cannot promise that contexts will be preserved across operations like
-    // locking the screen or if the platform cannot provide a context with suitable performance characteristics.
-    //
-    // This value must be checked again after a context loss event as the platform's capabilities may have changed.
-    virtual bool canAccelerate2dCanvas() { return false; }
-
-
 protected:
     ~WebKitPlatformSupport() { }
 };

Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (118109 => 118110)


--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp	2012-05-23 03:23:01 UTC (rev 118109)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp	2012-05-23 03:23:22 UTC (rev 118110)
@@ -916,9 +916,4 @@
 }
 #endif
 
-bool PlatformSupport::canAccelerate2dCanvas()
-{
-    return webKitPlatformSupport()->canAccelerate2dCanvas();
-}
-
 } // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to