[webkit-changes] [107329] trunk

Thu, 09 Feb 2012 17:45:49 -0800

Title: [107329] trunk
Revision
107329
Author
[email protected]
Date
2012-02-09 17:45:39 -0800 (Thu, 09 Feb 2012)

Log Message

[chromium] Enable mock scrollbars for compositing layout tests
https://bugs.webkit.org/show_bug.cgi?id=78299

Reviewed by Dirk Pranke.

Tools:

This enables mock scrollbars by default for compositing tests. These pixel tests are intended to test the
compositor behavior, not native theming, and having real scrollbars causes us to have to maintain significantly
more pngs than we should and expose weird alpha bugs in our theming that doesn't impact real users.

* DumpRenderTree/chromium/TestShell.cpp:
(TestShell::runFileTest):
* DumpRenderTree/chromium/WebPreferences.cpp:
(WebPreferences::reset):
(WebPreferences::applyTo):
* DumpRenderTree/chromium/WebPreferences.h:
(WebPreferences):

LayoutTests:

* platform/chromium-linux/compositing/direct-image-compositing-expected.png:
* platform/chromium-linux/compositing/geometry/ancestor-overflow-change-expected.png: Removed.
* platform/chromium-linux/compositing/geometry/fixed-in-composited-expected.png:
* platform/chromium-linux/compositing/geometry/tall-page-composited-expected.png: Removed.
* platform/chromium-linux/compositing/iframes/iframe-copy-on-scroll-expected.png:
* platform/chromium-linux/compositing/iframes/iframe-in-composited-layer-expected.png: Removed.
* platform/chromium-linux/compositing/masks/masked-ancestor-expected.png:
* platform/chromium-linux/compositing/masks/multiple-masks-expected.png:
* platform/chromium-linux/compositing/masks/simple-composited-mask-expected.png:
* platform/chromium-linux/compositing/overflow/overflow-scroll-expected.png:
* platform/chromium-linux/compositing/overflow/scrollbar-painting-expected.png:
* platform/chromium-mac/compositing/geometry/tall-page-composited-expected.png: Removed.
* platform/chromium-mac/compositing/iframes/iframe-in-composited-layer-expected.png: Removed.
* platform/chromium-win/compositing/geometry/ancestor-overflow-change-expected.png: Removed.
* platform/chromium-win/compositing/geometry/tall-page-composited-expected.png: Removed.
* platform/chromium-win/compositing/iframes/iframe-in-composited-layer-expected.png: Removed.
* platform/chromium-win/compositing/scaling/tiled-layer-recursion-expected.png: Removed.
* platform/chromium/compositing/geometry/ancestor-overflow-change-expected.png:
* platform/chromium/compositing/geometry/tall-page-composited-expected.png: Renamed from LayoutTests/platform/chromium-linux/compositing/scaling/tiled-layer-recursion-expected.png.
* platform/chromium/compositing/iframes/iframe-in-composited-layer-expected.png: Added.
* platform/chromium/compositing/scaling/tiled-layer-recursion-expected.png:
* platform/chromium/test_expectations.txt:

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (107328 => 107329)


--- trunk/LayoutTests/ChangeLog	2012-02-10 01:44:25 UTC (rev 107328)
+++ trunk/LayoutTests/ChangeLog	2012-02-10 01:45:39 UTC (rev 107329)
@@ -1,3 +1,33 @@
+2012-02-09  James Robinson  <[email protected]>
+
+        [chromium] Enable mock scrollbars for compositing layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=78299
+
+        Reviewed by Dirk Pranke.
+
+        * platform/chromium-linux/compositing/direct-image-compositing-expected.png:
+        * platform/chromium-linux/compositing/geometry/ancestor-overflow-change-expected.png: Removed.
+        * platform/chromium-linux/compositing/geometry/fixed-in-composited-expected.png:
+        * platform/chromium-linux/compositing/geometry/tall-page-composited-expected.png: Removed.
+        * platform/chromium-linux/compositing/iframes/iframe-copy-on-scroll-expected.png:
+        * platform/chromium-linux/compositing/iframes/iframe-in-composited-layer-expected.png: Removed.
+        * platform/chromium-linux/compositing/masks/masked-ancestor-expected.png:
+        * platform/chromium-linux/compositing/masks/multiple-masks-expected.png:
+        * platform/chromium-linux/compositing/masks/simple-composited-mask-expected.png:
+        * platform/chromium-linux/compositing/overflow/overflow-scroll-expected.png:
+        * platform/chromium-linux/compositing/overflow/scrollbar-painting-expected.png:
+        * platform/chromium-mac/compositing/geometry/tall-page-composited-expected.png: Removed.
+        * platform/chromium-mac/compositing/iframes/iframe-in-composited-layer-expected.png: Removed.
+        * platform/chromium-win/compositing/geometry/ancestor-overflow-change-expected.png: Removed.
+        * platform/chromium-win/compositing/geometry/tall-page-composited-expected.png: Removed.
+        * platform/chromium-win/compositing/iframes/iframe-in-composited-layer-expected.png: Removed.
+        * platform/chromium-win/compositing/scaling/tiled-layer-recursion-expected.png: Removed.
+        * platform/chromium/compositing/geometry/ancestor-overflow-change-expected.png:
+        * platform/chromium/compositing/geometry/tall-page-composited-expected.png: Renamed from LayoutTests/platform/chromium-linux/compositing/scaling/tiled-layer-recursion-expected.png.
+        * platform/chromium/compositing/iframes/iframe-in-composited-layer-expected.png: Added.
+        * platform/chromium/compositing/scaling/tiled-layer-recursion-expected.png:
+        * platform/chromium/test_expectations.txt:
+
 2012-02-09  Julien Chaffraix  <[email protected]>
 
         Another unreviewed massive SVG rebaseline (all our windows bots that I missed).

Modified: trunk/LayoutTests/platform/chromium/compositing/geometry/ancestor-overflow-change-expected.png


(Binary files differ)

Copied: trunk/LayoutTests/platform/chromium/compositing/geometry/tall-page-composited-expected.png (from rev 107319, trunk/LayoutTests/platform/chromium-linux/compositing/scaling/tiled-layer-recursion-expected.png)


(Binary files differ)

Property changes: trunk/LayoutTests/platform/chromium/compositing/geometry/tall-page-composited-expected.png

Added: svn:mime-type

Added: trunk/LayoutTests/platform/chromium/compositing/iframes/iframe-in-composited-layer-expected.png


(Binary files differ)
Property changes on: trunk/LayoutTests/platform/chromium/compositing/iframes/iframe-in-composited-layer-expected.png ___________________________________________________________________

Added: svn:mime-type

Modified: trunk/LayoutTests/platform/chromium/compositing/scaling/tiled-layer-recursion-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (107328 => 107329)


--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-02-10 01:44:25 UTC (rev 107328)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-02-10 01:45:39 UTC (rev 107329)
@@ -3907,6 +3907,16 @@
 
 BUGWK77526 WIN LINUX : svg/text/text-align-04-b.svg = PASS IMAGE
 
+// Will need rebaselines for mock scrollbars
+BUGJAMESR WIN MAC : compositing/direct-image-compositing.html = IMAGE
+BUGJAMESR WIN MAC : compositing/geometry/fixed-in-composited.html = IMAGE
+BUGJAMESR WIN MAC : compositing/iframes/iframe-copy-on-scroll.html = IMAGE
+BUGJAMESR WIN MAC: compositing/masks/masked-ancestor.html = IMAGE
+BUGJAMESR WIN MAC : compositing/masks/multiple-masks.html = IMAGE
+BUGJAMESR WIN MAC: compositing/masks/simple-composited-mask.html = IMAGE
+BUGJAMESR WIN MAC : compositing/overflow/overflow-scroll.html = IMAGE
+BUGJAMESR WIN MAC : compositing/overflow/scrollbar-painting.html = IMAGE
+
 BUGWK77534 LINUX : plugins/createScriptableObject-before-start.html = PASS MISSING
 
 // Hitting ASSERT_NOT_REACHED in EventHandler::handleTouchEvent() as of r106554.

Modified: trunk/LayoutTests/platform/chromium-linux/compositing/direct-image-compositing-expected.png


(Binary files differ)

Deleted: trunk/LayoutTests/platform/chromium-linux/compositing/geometry/ancestor-overflow-change-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium-linux/compositing/geometry/fixed-in-composited-expected.png


(Binary files differ)

Deleted: trunk/LayoutTests/platform/chromium-linux/compositing/geometry/tall-page-composited-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium-linux/compositing/iframes/iframe-copy-on-scroll-expected.png


(Binary files differ)

Deleted: trunk/LayoutTests/platform/chromium-linux/compositing/iframes/iframe-in-composited-layer-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium-linux/compositing/masks/masked-ancestor-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium-linux/compositing/masks/multiple-masks-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium-linux/compositing/masks/simple-composited-mask-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium-linux/compositing/overflow/overflow-scroll-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/chromium-linux/compositing/overflow/scrollbar-painting-expected.png


(Binary files differ)

Deleted: trunk/LayoutTests/platform/chromium-linux/compositing/scaling/tiled-layer-recursion-expected.png


(Binary files differ)

Deleted: trunk/LayoutTests/platform/chromium-mac/compositing/geometry/tall-page-composited-expected.png


(Binary files differ)

Deleted: trunk/LayoutTests/platform/chromium-mac/compositing/iframes/iframe-in-composited-layer-expected.png


(Binary files differ)

Deleted: trunk/LayoutTests/platform/chromium-win/compositing/geometry/ancestor-overflow-change-expected.png


(Binary files differ)

Deleted: trunk/LayoutTests/platform/chromium-win/compositing/geometry/tall-page-composited-expected.png


(Binary files differ)

Deleted: trunk/LayoutTests/platform/chromium-win/compositing/iframes/iframe-in-composited-layer-expected.png


(Binary files differ)

Deleted: trunk/LayoutTests/platform/chromium-win/compositing/scaling/tiled-layer-recursion-expected.png


(Binary files differ)

Modified: trunk/Tools/ChangeLog (107328 => 107329)


--- trunk/Tools/ChangeLog	2012-02-10 01:44:25 UTC (rev 107328)
+++ trunk/Tools/ChangeLog	2012-02-10 01:45:39 UTC (rev 107329)
@@ -1,3 +1,22 @@
+2012-02-09  James Robinson  <[email protected]>
+
+        [chromium] Enable mock scrollbars for compositing layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=78299
+
+        Reviewed by Dirk Pranke.
+
+        This enables mock scrollbars by default for compositing tests. These pixel tests are intended to test the
+        compositor behavior, not native theming, and having real scrollbars causes us to have to maintain significantly
+        more pngs than we should and expose weird alpha bugs in our theming that doesn't impact real users.
+
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::runFileTest):
+        * DumpRenderTree/chromium/WebPreferences.cpp:
+        (WebPreferences::reset):
+        (WebPreferences::applyTo):
+        * DumpRenderTree/chromium/WebPreferences.h:
+        (WebPreferences):
+
 2012-02-09  Eric Seidel  <[email protected]>
 
         Remove more uses of "os" from our webkitpy code

Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (107328 => 107329)


--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp	2012-02-10 01:44:25 UTC (rev 107328)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp	2012-02-10 01:45:39 UTC (rev 107329)
@@ -240,6 +240,7 @@
         m_prefs.acceleratedCompositingForVideoEnabled = true;
         m_prefs.accelerated2dCanvasEnabled = true;
         m_prefs.deferred2dCanvasEnabled = true;
+        m_prefs.mockScrollbarsEnabled = true;
         m_prefs.applyTo(m_webView);
     }

Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp (107328 => 107329)


--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp	2012-02-10 01:44:25 UTC (rev 107328)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp	2012-02-10 01:45:39 UTC (rev 107329)
@@ -117,6 +117,7 @@
     forceCompositingMode = false;
     hixie76WebSocketProtocolEnabled = true;
     perTilePaintingEnabled = false;
+    mockScrollbarsEnabled = false;
 }
 
 static void setStandardFontFamilyWrapper(WebSettings* settings, const WebKit::WebString& font, UScriptCode script)
@@ -222,6 +223,7 @@
     settings->setAcceleratedPaintingEnabled(acceleratedPaintingEnabled);
     settings->setHixie76WebSocketProtocolEnabled(hixie76WebSocketProtocolEnabled);
     settings->setPerTilePaintingEnabled(perTilePaintingEnabled);
+    settings->setMockScrollbarsEnabled(mockScrollbarsEnabled);
 
     // Fixed values.
     settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
@@ -231,7 +233,6 @@
     settings->setEditableLinkBehaviorNeverLive();
     settings->setEnableScrollAnimator(false);
     settings->setFontRenderingModeNormal();
-    settings->setMockScrollbarsEnabled(false);
     settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
     settings->setUsesEncodingDetector(false);
     settings->setImagesEnabled(true);

Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.h (107328 => 107329)


--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.h	2012-02-10 01:44:25 UTC (rev 107328)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.h	2012-02-10 01:45:39 UTC (rev 107329)
@@ -110,6 +110,7 @@
     bool acceleratedPaintingEnabled;
     bool hixie76WebSocketProtocolEnabled;
     bool perTilePaintingEnabled;
+    bool mockScrollbarsEnabled;
 
     WebPreferences() { reset(); }
     void reset();

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

Reply via email to