2010-07-09 Aaron Boodman <aa@chromium.org>
authoraa@chromium.org <aa@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Jul 2010 20:05:28 +0000 (20:05 +0000)
committeraa@chromium.org <aa@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Jul 2010 20:05:28 +0000 (20:05 +0000)
        Reviewed by Ojan Vafai.

        Fix regression from r62876.
        https://bugs.webkit.org/show_bug.cgi?id=41928

        * platform/mac/Skipped:
        * printing/page-rule-selection.html:

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

LayoutTests/ChangeLog
LayoutTests/platform/mac/Skipped
LayoutTests/printing/page-rule-selection.html

index 2dd85da..bee1ead 100644 (file)
@@ -1,3 +1,13 @@
+2010-07-09  Aaron Boodman  <aa@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Fix regression from r62876.
+        https://bugs.webkit.org/show_bug.cgi?id=41928
+
+        * platform/mac/Skipped:
+        * printing/page-rule-selection.html:
+
 2010-07-09  Nico Weber  <thakis@chromium.org>
 
         Reviewed by Simon Fraser.
index da8489f..f0345f9 100644 (file)
@@ -299,9 +299,3 @@ fast/forms/input-appearance-speechbutton.html
 # Needs to be fixed at image decoder layer for Safari.
 fast/images/large-size-image-crash.html
 
-# Regression from http://trac.webkit.org/changeset/62876
-# That change is too narly to roll out and Aaron Boodman isn't around to
-# figure out the correct fix.  If this entry stays in this file for more
-# than two days, the first one to point it out to Adam Barth will receive
-# a free beer.
-printing/page-rule-selection.html
index 46e7b66..8ffa336 100644 (file)
@@ -28,7 +28,7 @@
         shouldBeEqualToString("layoutTestController.pageProperty('margin-left', 4)", "auto");
 
         debug("Set margin to 200px via user style sheet.");
-        layoutTestController.addUserStyleSheet("@page { margin:200px; }");
+        layoutTestController.addUserStyleSheet("@page { margin:200px; }", true);
         shouldBeEqualToString("layoutTestController.pageProperty('margin-left', 0)", "200");
         shouldBeEqualToString("layoutTestController.pageProperty('margin-left', 1)", "200");
         shouldBeEqualToString("layoutTestController.pageProperty('margin-left', 2)", "200");