[webkit-changes] [98990] trunk

Tue, 01 Nov 2011 12:19:07 -0700

Title: [98990] trunk
Revision
98990
Author
[email protected]
Date
2011-11-01 12:18:58 -0700 (Tue, 01 Nov 2011)

Log Message

[chromium] Add testing for --enable-accelerated-drawing
https://bugs.webkit.org/show_bug.cgi?id=70822

Reviewed by James Robinson.

Source/WebCore:

Test: platform/chromium/compositing/accelerated-drawing/alpha.html

* WebCore.exp.in:
* page/Settings.cpp:
* page/Settings.h:
(WebCore::Settings::setAcceleratedDrawingEnabled):
* testing/Internals.cpp:
(WebCore::Internals::setAcceleratedDrawingEnabled):
* testing/Internals.h:
* testing/Internals.idl:

LayoutTests:

* platform/chromium/compositing/accelerated-drawing: Added.
* platform/chromium/compositing/accelerated-drawing/alpha-expected.png: Added.
* platform/chromium/compositing/accelerated-drawing/alpha-expected.txt: Added.
* platform/chromium/compositing/accelerated-drawing/alpha.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (98989 => 98990)


--- trunk/LayoutTests/ChangeLog	2011-11-01 19:13:54 UTC (rev 98989)
+++ trunk/LayoutTests/ChangeLog	2011-11-01 19:18:58 UTC (rev 98990)
@@ -1,3 +1,15 @@
+2011-11-01  Alok Priyadarshi  <[email protected]>
+
+        [chromium] Add testing for --enable-accelerated-drawing
+        https://bugs.webkit.org/show_bug.cgi?id=70822
+
+        Reviewed by James Robinson.
+
+        * platform/chromium/compositing/accelerated-drawing: Added.
+        * platform/chromium/compositing/accelerated-drawing/alpha-expected.png: Added.
+        * platform/chromium/compositing/accelerated-drawing/alpha-expected.txt: Added.
+        * platform/chromium/compositing/accelerated-drawing/alpha.html: Added.
+
 2011-11-01  Tim Horton  <[email protected]>
 
         SVG Filter on a group doesn't invalidate when children are moved

Added: trunk/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha-expected.png (0 => 98990)


--- trunk/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha-expected.png	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha-expected.png	2011-11-01 19:18:58 UTC (rev 98990)
@@ -0,0 +1,6 @@
+\x89PNG
+
+
+IHDR X')tEXtchecksum4070ebf6ba9edacbfd84709f7d2b8c07\x9C\xF2#\xAA
+\xD0IDATx\x9C\xED\xD8\xC1	\xC3@\xC1\x93Q\xAC
+Jɮs0\x8D\x8E\xAA\xFF\xC2<\x9B\xBDff\xD0\xF9\xECp\x81X1\x81X1\x81X1\x81X\xB1\xFB\xB7\xB3w\xBD\xED\xFE\xECY\xCF\xEE	p,,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\x98\xC0\x88	,\x80\xD853\xBB7\xC5 &\xB0b &\xB0b &\xB0b &\xB0b v\xFFv\xF6\xAE\xB7\xDD\xC1\x9F=\xEB\xD9=\x8E\xE5\x83X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81X1\x81\xBBff\xF7\x80\xA3\xF8`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`\xC4@L`ľ\xEC\x83\xA9\x842vlIEND\xAEB`\x82
\ No newline at end of file

Added: trunk/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha-expected.txt (0 => 98990)


--- trunk/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha-expected.txt	2011-11-01 19:18:58 UTC (rev 98990)
@@ -0,0 +1 @@
+

Added: trunk/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha.html (0 => 98990)


--- trunk/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha.html	                        (rev 0)
+++ trunk/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha.html	2011-11-01 19:18:58 UTC (rev 98990)
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+  .box {
+    width: 150px;
+    height: 150px;
+    margin: 10px;
+  }
+  #test {
+    -webkit-transform: translateZ(0);
+    background-color: rgb(0,255,0);
+    opacity: 0.4;
+  }
+  #ref {
+    background-color: rgb(153,255,153);
+  }
+</style>
+<script type="text/_javascript_">
+  if (window.layoutTestController)
+    layoutTestController.dumpAsText(true); // This is only useful as pixel test.
+
+  if (window.internals)
+    window.internals.setAcceleratedDrawingEnabled(document, true);
+</script>
+</head>
+
+<body>
+<!-- You should see two squares of the same color -->
+<div id="test" class="box"></div>
+<div id="ref" class="box"></div>
+</body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (98989 => 98990)


--- trunk/Source/WebCore/ChangeLog	2011-11-01 19:13:54 UTC (rev 98989)
+++ trunk/Source/WebCore/ChangeLog	2011-11-01 19:18:58 UTC (rev 98990)
@@ -1,3 +1,21 @@
+2011-11-01  Alok Priyadarshi  <[email protected]>
+
+        [chromium] Add testing for --enable-accelerated-drawing
+        https://bugs.webkit.org/show_bug.cgi?id=70822
+
+        Reviewed by James Robinson.
+
+        Test: platform/chromium/compositing/accelerated-drawing/alpha.html
+
+        * WebCore.exp.in:
+        * page/Settings.cpp:
+        * page/Settings.h:
+        (WebCore::Settings::setAcceleratedDrawingEnabled):
+        * testing/Internals.cpp:
+        (WebCore::Internals::setAcceleratedDrawingEnabled):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2011-11-01  Tim Horton  <[email protected]>
 
         SVG Filter on a group doesn't invalidate when children are moved

Modified: trunk/Source/WebCore/WebCore.exp.in (98989 => 98990)


--- trunk/Source/WebCore/WebCore.exp.in	2011-11-01 19:13:54 UTC (rev 98989)
+++ trunk/Source/WebCore/WebCore.exp.in	2011-11-01 19:18:58 UTC (rev 98990)
@@ -958,7 +958,6 @@
 __ZN7WebCore8Settings27setLoadsImagesAutomaticallyEb
 __ZN7WebCore8Settings27setLocalStorageDatabasePathERKN3WTF6StringE
 __ZN7WebCore8Settings27setSpatialNavigationEnabledEb
-__ZN7WebCore8Settings28setAcceleratedDrawingEnabledEb
 __ZN7WebCore8Settings28setForceFTPDirectoryListingsEb
 __ZN7WebCore8Settings29setAccelerated2dCanvasEnabledEb
 __ZN7WebCore8Settings29setAuthorAndUserStylesEnabledEb

Modified: trunk/Source/WebCore/page/Settings.cpp (98989 => 98990)


--- trunk/Source/WebCore/page/Settings.cpp	2011-11-01 19:13:54 UTC (rev 98989)
+++ trunk/Source/WebCore/page/Settings.cpp	2011-11-01 19:18:58 UTC (rev 98990)
@@ -718,11 +718,6 @@
     m_canvasUsesAcceleratedDrawing = enabled;
 }
 
-void Settings::setAcceleratedDrawingEnabled(bool enabled)
-{
-    m_acceleratedDrawingEnabled = enabled;
-}
-
 void Settings::setAcceleratedCompositingFor3DTransformsEnabled(bool enabled)
 {
     m_acceleratedCompositingFor3DTransformsEnabled = enabled;

Modified: trunk/Source/WebCore/page/Settings.h (98989 => 98990)


--- trunk/Source/WebCore/page/Settings.h	2011-11-01 19:13:54 UTC (rev 98989)
+++ trunk/Source/WebCore/page/Settings.h	2011-11-01 19:18:58 UTC (rev 98990)
@@ -298,9 +298,9 @@
         void setCanvasUsesAcceleratedDrawing(bool);
         bool canvasUsesAcceleratedDrawing() const { return m_canvasUsesAcceleratedDrawing; }
 
-        void setAcceleratedDrawingEnabled(bool);
+        void setAcceleratedDrawingEnabled(bool enabled) { m_acceleratedDrawingEnabled = enabled; }
         bool acceleratedDrawingEnabled() const { return m_acceleratedDrawingEnabled; }
-        
+
         void setAcceleratedCompositingEnabled(bool);
         bool acceleratedCompositingEnabled() const { return m_acceleratedCompositingEnabled; }

Modified: trunk/Source/WebCore/testing/Internals.cpp (98989 => 98990)


--- trunk/Source/WebCore/testing/Internals.cpp	2011-11-01 19:13:54 UTC (rev 98989)
+++ trunk/Source/WebCore/testing/Internals.cpp	2011-11-01 19:18:58 UTC (rev 98990)
@@ -258,6 +258,16 @@
     document->settings()->setAcceleratedCompositingForFixedPositionEnabled(enabled);
 }
 
+void Internals::setAcceleratedDrawingEnabled(Document* document, bool enabled, ExceptionCode& ec)
+{
+    if (!document || !document->settings()) {
+        ec = INVALID_ACCESS_ERR;
+        return;
+    }
+
+    document->settings()->setAcceleratedDrawingEnabled(enabled);
+}
+
 void Internals::setEnableScrollAnimator(Document* document, bool enabled, ExceptionCode& ec)
 {
     if (!document || !document->settings()) {

Modified: trunk/Source/WebCore/testing/Internals.h (98989 => 98990)


--- trunk/Source/WebCore/testing/Internals.h	2011-11-01 19:13:54 UTC (rev 98989)
+++ trunk/Source/WebCore/testing/Internals.h	2011-11-01 19:18:58 UTC (rev 98990)
@@ -77,6 +77,7 @@
 
     void setForceCompositingMode(Document*, bool enabled, ExceptionCode&);
     void setEnableCompositingForFixedPosition(Document*, bool enabled, ExceptionCode&);
+    void setAcceleratedDrawingEnabled(Document*, bool enabled, ExceptionCode&);
 
     void setEnableScrollAnimator(Document*, bool enabled, ExceptionCode&);
     void setZoomAnimatorTransform(Document*, float scale, float tx, float ty, ExceptionCode&);

Modified: trunk/Source/WebCore/testing/Internals.idl (98989 => 98990)


--- trunk/Source/WebCore/testing/Internals.idl	2011-11-01 19:13:54 UTC (rev 98989)
+++ trunk/Source/WebCore/testing/Internals.idl	2011-11-01 19:18:58 UTC (rev 98990)
@@ -51,6 +51,7 @@
 
         void setForceCompositingMode(in Document document, in boolean enabled) raises(DOMException);
         void setEnableCompositingForFixedPosition(in Document document, in boolean enabled) raises(DOMException);
+        void setAcceleratedDrawingEnabled(in Document document, in boolean enabled) raises(DOMException);
         void setEnableScrollAnimator(in Document document, in boolean enabled) raises(DOMException);
         void setZoomAnimatorTransform(in Document document, in float scale, in float tx, in float ty) raises(DOMException);
         float getPageScaleFactor(in Document document) raises(DOMException);

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to