summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornoel <noel@chromium.org>2015-11-09 18:18:24 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-10 02:19:24 +0000
commita86f261491aa0f522c17a1ef30e97d546bcddd8f (patch)
tree698ac22ebb97be391f9e8343e034b753767b1a28
parent9de6d71fc5f2d8d9401808a00603042b66a2b26f (diff)
downloadchromium_src-a86f261491aa0f522c17a1ef30e97d546bcddd8f.zip
chromium_src-a86f261491aa0f522c17a1ef30e97d546bcddd8f.tar.gz
chromium_src-a86f261491aa0f522c17a1ef30e97d546bcddd8f.tar.bz2
Revert of Auto-rebaseline for r358712 (patchset #1 id:1 of https://codereview.chromium.org/1433743003/ )
Reason for revert: Unneeded covered by https://codereview.chromium.org/1432933002 Original issue's description: > Auto-rebaseline for r358712 > > https://chromium.googlesource.com/chromium/src/+/098bf9ac > > BUG=553553 > TBR=leviw@chromium.org > > Committed: https://crrev.com/f6bd7a44ec1796215fcba13d90ef94116655d9a8 > Cr-Commit-Position: refs/heads/master@{#358741} TBR=leviw@chromium.org,wkorman@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=553553 Review URL: https://codereview.chromium.org/1426943008 Cr-Commit-Position: refs/heads/master@{#358754}
-rw-r--r--third_party/WebKit/LayoutTests/TestExpectations8
-rw-r--r--third_party/WebKit/LayoutTests/platform/linux-precise/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 43062 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/linux-x86/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 43371 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/linux-x86/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 43062 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac-lion/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 27663 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac-mavericks/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 27462 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac-mavericks/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 26702 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac-mavericks/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 27663 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac-mountainlion/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 27663 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac-mountainlion/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 27328 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac-retina/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 27328 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac-retina/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 27663 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac-snowleopard/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.pngbin29207 -> 28219 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac/scrollbars/overflow-scrollbar-combinations-expected.pngbin27663 -> 27328 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.pngbin27663 -> 27328 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.pngbin27663 -> 27328 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/win-xp/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 27739 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/win-xp/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 28512 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/win-xp/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 27739 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/scrollbars/overflow-scrollbar-combinations-expected.pngbin28818 -> 28513 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/win7/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 28818 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/win7/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.pngbin0 -> 28513 bytes
22 files changed, 8 insertions, 0 deletions
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index a701f04..2d46dae 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -560,6 +560,10 @@ crbug.com/318978 [ Linux ] http/tests/security/frameNavigation/xss-DENIED-plugin
crbug.com/318978 [ Linux ] permissionclient/plugin-permission.html [ Skip ]
crbug.com/318978 [ Linux ] plugins/ [ Skip ]
+crbug.com/552494 scrollbars/overflow-scrollbar-combinations.html [ Pass Failure ]
+crbug.com/552494 virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations.html [ Pass Failure ]
+crbug.com/552494 virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations.html [ Pass Failure ]
+
crbug.com/380217 [ Linux Win ] fast/shapes/shape-outside-floats/shape-outside-floats-inset-rounded-large-radius.html [ Skip ]
crbug.com/380217 [ Win ] fast/shapes/shape-outside-floats/shape-outside-floats-inset-rounded-bottom-left.html [ Skip ]
@@ -896,6 +900,10 @@ crbug.com/425345 [ Mac ] fast/text/line-break-after-question-mark.html [ Failure
# By about a quarter or less of a pixel.
crbug.com/421412 [ Mac ] fast/text/international/bdo-bidi-width.html [ Failure ]
+crbug.com/553553 scrollbars/overflow-scrollbar-combinations.html [ NeedsRebaseline ]
+crbug.com/553553 virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations.html [ NeedsRebaseline ]
+crbug.com/553553 virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations.html [ NeedsRebaseline ]
+
crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollable-area-frame-overflow-hidden.html [ Failure ]
crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollable-area-frame-overried-inherited-visibility-hidden.html [ Failure ]
crbug.com/417782 virtual/rootlayerscrolls/fast/scrolling/scrollable-area-frame-scrolling-no-overried-inherited-visibility-hidden.html [ Failure ]
diff --git a/third_party/WebKit/LayoutTests/platform/linux-precise/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/linux-precise/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..2e6c436
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux-precise/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux-x86/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/linux-x86/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..e04fab9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux-x86/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux-x86/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/linux-x86/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..2e6c436
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux-x86/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac-lion/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/mac-lion/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..9b5830f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-lion/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac-mavericks/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mavericks/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..c9a9170
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-mavericks/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac-mavericks/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mavericks/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..bdabd97
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-mavericks/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac-mavericks/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mavericks/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..9b5830f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-mavericks/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac-mountainlion/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mountainlion/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..9b5830f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-mountainlion/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac-mountainlion/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mountainlion/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..51dc1bc
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-mountainlion/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac-retina/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/mac-retina/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..51dc1bc
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-retina/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac-retina/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/mac-retina/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..9b5830f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-retina/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac-snowleopard/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/mac-snowleopard/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
index 75147c81..76c2524 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-snowleopard/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-snowleopard/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/mac/scrollbars/overflow-scrollbar-combinations-expected.png
index 9b5830f..51dc1bc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/scrollbars/overflow-scrollbar-combinations-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
index 9b5830f..51dc1bc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png
index 9b5830f..51dc1bc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/win-xp/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..a95f67f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/win-xp/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..e02bf47
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/win-xp/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..a95f67f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/win/scrollbars/overflow-scrollbar-combinations-expected.png
index 654e202..dc0207c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/scrollbars/overflow-scrollbar-combinations-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win7/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/win7/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..654e202
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png
new file mode 100644
index 0000000..dc0207c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/rootlayerscrolls/scrollbars/overflow-scrollbar-combinations-expected.png
Binary files differ