diff options
author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 20:48:21 +0000 |
---|---|---|
committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 20:48:21 +0000 |
commit | f1838111a9450d701d18f00e9fd3f687a2685466 (patch) | |
tree | b11dd4afc02036f17eb02c3e3ec45852c8cda57f | |
parent | 37a5a1cbb9331f9353139c2fdae6da0645252a26 (diff) | |
download | chromium_src-f1838111a9450d701d18f00e9fd3f687a2685466.zip chromium_src-f1838111a9450d701d18f00e9fd3f687a2685466.tar.gz chromium_src-f1838111a9450d701d18f00e9fd3f687a2685466.tar.bz2 |
Rebaseline test due to upstream change http://trac.webkit.org/changeset/41993.
R=gwilson
BUG=10466
TEST=no layout test regressions.
Review URL: http://codereview.chromium.org/113777
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16789 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed, 79 insertions, 61 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt index 10e06f1..daa69905 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt @@ -21,6 +21,7 @@ border-top-width: 0px; bottom: auto; caption-side: top; clear: none; +clip: auto; color: rgb(0, 0, 0); cursor: auto; direction: ltr; @@ -78,6 +79,7 @@ visibility: visible; white-space: normal; widows: 2; width: 784px; +word-break: normal; word-spacing: 0px; word-wrap: normal; z-index: auto; @@ -90,13 +92,17 @@ zoom: 1; -webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1); -webkit-appearance: none; -webkit-backface-visibility: visible; --webkit-background-clip: border; +-webkit-background-clip: border-box; -webkit-background-composite: source-over; --webkit-background-origin: padding; +-webkit-background-origin: padding-box; -webkit-background-size: auto auto; +-webkit-border-bottom-left-radius: 0px; +-webkit-border-bottom-right-radius: 0px; -webkit-border-fit: border; --webkit-border-image: none; -webkit-border-horizontal-spacing: 0px; +-webkit-border-image: none; +-webkit-border-top-left-radius: 0px; +-webkit-border-top-right-radius: 0px; -webkit-border-vertical-spacing: 0px; -webkit-box-align: stretch; -webkit-box-direction: normal; @@ -129,12 +135,12 @@ zoom: 1; -webkit-marquee-style: scroll; -webkit-mask-attachment: scroll; -webkit-mask-box-image: none; +-webkit-mask-clip: border-box; +-webkit-mask-composite: source-over; -webkit-mask-image: none; +-webkit-mask-origin: border-box; -webkit-mask-position: 0% 0%; -webkit-mask-repeat: repeat; --webkit-mask-clip: border; --webkit-mask-composite: source-over; --webkit-mask-origin: border; -webkit-mask-size: auto auto; -webkit-nbsp-mode: normal; -webkit-perspective: none; @@ -155,10 +161,6 @@ zoom: 1; -webkit-user-drag: auto; -webkit-user-modify: read-only; -webkit-user-select: text; --webkit-border-bottom-left-radius: 0px; --webkit-border-bottom-right-radius: 0px; --webkit-border-top-left-radius: 0px; --webkit-border-top-right-radius: 0px; clip-path: none; clip-rule: nonzero; mask: none; @@ -199,9 +201,12 @@ glyph-orientation-vertical: auto; Other attributes that the computed style class supports: -background-position: 0% 0%; +background-position-x: 0%; +background-position-y: 0%; border-spacing: 0px 0px; overflow: visible; +-webkit-mask-position-x: 0%; +-webkit-mask-position-y: 0%; -webkit-match-nearest-mail-blockquote-color: normal; -webkit-text-size-adjust: auto; diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt index 72f5311..e7e3ae8 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt @@ -20,6 +20,7 @@ Computed style of an element whose parent's 'display' value is 'none': bottom: auto caption-side: top clear: none + clip: auto color: rgb(0, 0, 0) cursor: auto direction: ltr @@ -77,6 +78,7 @@ Computed style of an element whose parent's 'display' value is 'none': white-space: normal widows: 2 width: 50% + word-break: normal word-spacing: 0px word-wrap: normal z-index: auto @@ -89,13 +91,17 @@ Computed style of an element whose parent's 'display' value is 'none': -webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1) -webkit-appearance: none -webkit-backface-visibility: visible - -webkit-background-clip: border + -webkit-background-clip: border-box -webkit-background-composite: source-over - -webkit-background-origin: padding + -webkit-background-origin: padding-box -webkit-background-size: auto auto + -webkit-border-bottom-left-radius: 0px + -webkit-border-bottom-right-radius: 0px -webkit-border-fit: border - -webkit-border-image: none -webkit-border-horizontal-spacing: 0px + -webkit-border-image: none + -webkit-border-top-left-radius: 0px + -webkit-border-top-right-radius: 0px -webkit-border-vertical-spacing: 0px -webkit-box-align: stretch -webkit-box-direction: normal @@ -128,12 +134,12 @@ Computed style of an element whose parent's 'display' value is 'none': -webkit-marquee-style: scroll -webkit-mask-attachment: scroll -webkit-mask-box-image: none + -webkit-mask-clip: border-box + -webkit-mask-composite: source-over -webkit-mask-image: none + -webkit-mask-origin: border-box -webkit-mask-position: 0% 0% -webkit-mask-repeat: repeat - -webkit-mask-clip: border - -webkit-mask-composite: source-over - -webkit-mask-origin: border -webkit-mask-size: auto auto -webkit-nbsp-mode: normal -webkit-perspective: none @@ -154,10 +160,6 @@ Computed style of an element whose parent's 'display' value is 'none': -webkit-user-drag: auto -webkit-user-modify: read-only -webkit-user-select: text - -webkit-border-bottom-left-radius: 0px - -webkit-border-bottom-right-radius: 0px - -webkit-border-top-left-radius: 0px - -webkit-border-top-right-radius: 0px clip-path: none clip-rule: nonzero mask: none @@ -195,9 +197,12 @@ Computed style of an element whose parent's 'display' value is 'none': writing-mode: lr-tb glyph-orientation-horizontal: 0deg glyph-orientation-vertical: auto - background-position: 0% 0% + background-position-x: 0% + background-position-y: 0% border-spacing: 0px 0px overflow: visible + -webkit-mask-position-x: 0% + -webkit-mask-position-y: 0% -webkit-match-nearest-mail-blockquote-color: normal -webkit-text-size-adjust: auto diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt index 6b76943..9bae990 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/css/getComputedStyle-basic-expected.txt @@ -40,6 +40,8 @@ rect: style.getPropertyValue(caption-side) : top rect: style.getPropertyCSSValue(caption-side) : [object CSSPrimitiveValue] rect: style.getPropertyValue(clear) : none rect: style.getPropertyCSSValue(clear) : [object CSSPrimitiveValue] +rect: style.getPropertyValue(clip) : auto +rect: style.getPropertyCSSValue(clip) : [object CSSPrimitiveValue] rect: style.getPropertyValue(color) : rgb(0, 0, 0) rect: style.getPropertyCSSValue(color) : [object CSSPrimitiveValue] rect: style.getPropertyValue(cursor) : auto @@ -154,6 +156,8 @@ rect: style.getPropertyValue(widows) : 2 rect: style.getPropertyCSSValue(widows) : [object CSSPrimitiveValue] rect: style.getPropertyValue(width) : 0px rect: style.getPropertyCSSValue(width) : [object CSSPrimitiveValue] +rect: style.getPropertyValue(word-break) : normal +rect: style.getPropertyCSSValue(word-break) : [object CSSPrimitiveValue] rect: style.getPropertyValue(word-spacing) : 0px rect: style.getPropertyCSSValue(word-spacing) : [object CSSPrimitiveValue] rect: style.getPropertyValue(word-wrap) : normal @@ -178,20 +182,28 @@ rect: style.getPropertyValue(-webkit-appearance) : none rect: style.getPropertyCSSValue(-webkit-appearance) : [object CSSPrimitiveValue] rect: style.getPropertyValue(-webkit-backface-visibility) : visible rect: style.getPropertyCSSValue(-webkit-backface-visibility) : [object CSSPrimitiveValue] -rect: style.getPropertyValue(-webkit-background-clip) : border +rect: style.getPropertyValue(-webkit-background-clip) : border-box rect: style.getPropertyCSSValue(-webkit-background-clip) : [object CSSPrimitiveValue] rect: style.getPropertyValue(-webkit-background-composite) : source-over rect: style.getPropertyCSSValue(-webkit-background-composite) : [object CSSPrimitiveValue] -rect: style.getPropertyValue(-webkit-background-origin) : padding +rect: style.getPropertyValue(-webkit-background-origin) : padding-box rect: style.getPropertyCSSValue(-webkit-background-origin) : [object CSSPrimitiveValue] rect: style.getPropertyValue(-webkit-background-size) : auto auto rect: style.getPropertyCSSValue(-webkit-background-size) : [object CSSValueList] +rect: style.getPropertyValue(-webkit-border-bottom-left-radius) : 0px +rect: style.getPropertyCSSValue(-webkit-border-bottom-left-radius) : [object CSSPrimitiveValue] +rect: style.getPropertyValue(-webkit-border-bottom-right-radius) : 0px +rect: style.getPropertyCSSValue(-webkit-border-bottom-right-radius) : [object CSSPrimitiveValue] rect: style.getPropertyValue(-webkit-border-fit) : border rect: style.getPropertyCSSValue(-webkit-border-fit) : [object CSSPrimitiveValue] -rect: style.getPropertyValue(-webkit-border-image) : none -rect: style.getPropertyCSSValue(-webkit-border-image) : [object CSSPrimitiveValue] rect: style.getPropertyValue(-webkit-border-horizontal-spacing) : 0px rect: style.getPropertyCSSValue(-webkit-border-horizontal-spacing) : [object CSSPrimitiveValue] +rect: style.getPropertyValue(-webkit-border-image) : none +rect: style.getPropertyCSSValue(-webkit-border-image) : [object CSSPrimitiveValue] +rect: style.getPropertyValue(-webkit-border-top-left-radius) : 0px +rect: style.getPropertyCSSValue(-webkit-border-top-left-radius) : [object CSSPrimitiveValue] +rect: style.getPropertyValue(-webkit-border-top-right-radius) : 0px +rect: style.getPropertyCSSValue(-webkit-border-top-right-radius) : [object CSSPrimitiveValue] rect: style.getPropertyValue(-webkit-border-vertical-spacing) : 0px rect: style.getPropertyCSSValue(-webkit-border-vertical-spacing) : [object CSSPrimitiveValue] rect: style.getPropertyValue(-webkit-box-align) : stretch @@ -256,18 +268,18 @@ rect: style.getPropertyValue(-webkit-mask-attachment) : scroll rect: style.getPropertyCSSValue(-webkit-mask-attachment) : [object CSSPrimitiveValue] rect: style.getPropertyValue(-webkit-mask-box-image) : none rect: style.getPropertyCSSValue(-webkit-mask-box-image) : [object CSSPrimitiveValue] +rect: style.getPropertyValue(-webkit-mask-clip) : border-box +rect: style.getPropertyCSSValue(-webkit-mask-clip) : [object CSSPrimitiveValue] +rect: style.getPropertyValue(-webkit-mask-composite) : source-over +rect: style.getPropertyCSSValue(-webkit-mask-composite) : [object CSSPrimitiveValue] rect: style.getPropertyValue(-webkit-mask-image) : none rect: style.getPropertyCSSValue(-webkit-mask-image) : [object CSSPrimitiveValue] +rect: style.getPropertyValue(-webkit-mask-origin) : border-box +rect: style.getPropertyCSSValue(-webkit-mask-origin) : [object CSSPrimitiveValue] rect: style.getPropertyValue(-webkit-mask-position) : 0% 0% rect: style.getPropertyCSSValue(-webkit-mask-position) : [object CSSValueList] rect: style.getPropertyValue(-webkit-mask-repeat) : repeat rect: style.getPropertyCSSValue(-webkit-mask-repeat) : [object CSSPrimitiveValue] -rect: style.getPropertyValue(-webkit-mask-clip) : border -rect: style.getPropertyCSSValue(-webkit-mask-clip) : [object CSSPrimitiveValue] -rect: style.getPropertyValue(-webkit-mask-composite) : source-over -rect: style.getPropertyCSSValue(-webkit-mask-composite) : [object CSSPrimitiveValue] -rect: style.getPropertyValue(-webkit-mask-origin) : border -rect: style.getPropertyCSSValue(-webkit-mask-origin) : [object CSSPrimitiveValue] rect: style.getPropertyValue(-webkit-mask-size) : auto auto rect: style.getPropertyCSSValue(-webkit-mask-size) : [object CSSValueList] rect: style.getPropertyValue(-webkit-nbsp-mode) : normal @@ -308,14 +320,6 @@ rect: style.getPropertyValue(-webkit-user-modify) : read-only rect: style.getPropertyCSSValue(-webkit-user-modify) : [object CSSPrimitiveValue] rect: style.getPropertyValue(-webkit-user-select) : text rect: style.getPropertyCSSValue(-webkit-user-select) : [object CSSPrimitiveValue] -rect: style.getPropertyValue(-webkit-border-bottom-left-radius) : 0px -rect: style.getPropertyCSSValue(-webkit-border-bottom-left-radius) : [object CSSPrimitiveValue] -rect: style.getPropertyValue(-webkit-border-bottom-right-radius) : 0px -rect: style.getPropertyCSSValue(-webkit-border-bottom-right-radius) : [object CSSPrimitiveValue] -rect: style.getPropertyValue(-webkit-border-top-left-radius) : 0px -rect: style.getPropertyCSSValue(-webkit-border-top-left-radius) : [object CSSPrimitiveValue] -rect: style.getPropertyValue(-webkit-border-top-right-radius) : 0px -rect: style.getPropertyCSSValue(-webkit-border-top-right-radius) : [object CSSPrimitiveValue] rect: style.getPropertyValue(clip-path) : none rect: style.getPropertyCSSValue(clip-path) : [object CSSPrimitiveValue] rect: style.getPropertyValue(clip-rule) : nonzero @@ -432,6 +436,8 @@ g: style.getPropertyValue(caption-side) : top g: style.getPropertyCSSValue(caption-side) : [object CSSPrimitiveValue] g: style.getPropertyValue(clear) : none g: style.getPropertyCSSValue(clear) : [object CSSPrimitiveValue] +g: style.getPropertyValue(clip) : auto +g: style.getPropertyCSSValue(clip) : [object CSSPrimitiveValue] g: style.getPropertyValue(color) : rgb(0, 0, 0) g: style.getPropertyCSSValue(color) : [object CSSPrimitiveValue] g: style.getPropertyValue(cursor) : auto @@ -546,6 +552,8 @@ g: style.getPropertyValue(widows) : 2 g: style.getPropertyCSSValue(widows) : [object CSSPrimitiveValue] g: style.getPropertyValue(width) : 0px g: style.getPropertyCSSValue(width) : [object CSSPrimitiveValue] +g: style.getPropertyValue(word-break) : normal +g: style.getPropertyCSSValue(word-break) : [object CSSPrimitiveValue] g: style.getPropertyValue(word-spacing) : 0px g: style.getPropertyCSSValue(word-spacing) : [object CSSPrimitiveValue] g: style.getPropertyValue(word-wrap) : normal @@ -570,20 +578,28 @@ g: style.getPropertyValue(-webkit-appearance) : none g: style.getPropertyCSSValue(-webkit-appearance) : [object CSSPrimitiveValue] g: style.getPropertyValue(-webkit-backface-visibility) : visible g: style.getPropertyCSSValue(-webkit-backface-visibility) : [object CSSPrimitiveValue] -g: style.getPropertyValue(-webkit-background-clip) : border +g: style.getPropertyValue(-webkit-background-clip) : border-box g: style.getPropertyCSSValue(-webkit-background-clip) : [object CSSPrimitiveValue] g: style.getPropertyValue(-webkit-background-composite) : source-over g: style.getPropertyCSSValue(-webkit-background-composite) : [object CSSPrimitiveValue] -g: style.getPropertyValue(-webkit-background-origin) : padding +g: style.getPropertyValue(-webkit-background-origin) : padding-box g: style.getPropertyCSSValue(-webkit-background-origin) : [object CSSPrimitiveValue] g: style.getPropertyValue(-webkit-background-size) : auto auto g: style.getPropertyCSSValue(-webkit-background-size) : [object CSSValueList] +g: style.getPropertyValue(-webkit-border-bottom-left-radius) : 0px +g: style.getPropertyCSSValue(-webkit-border-bottom-left-radius) : [object CSSPrimitiveValue] +g: style.getPropertyValue(-webkit-border-bottom-right-radius) : 0px +g: style.getPropertyCSSValue(-webkit-border-bottom-right-radius) : [object CSSPrimitiveValue] g: style.getPropertyValue(-webkit-border-fit) : border g: style.getPropertyCSSValue(-webkit-border-fit) : [object CSSPrimitiveValue] -g: style.getPropertyValue(-webkit-border-image) : none -g: style.getPropertyCSSValue(-webkit-border-image) : [object CSSPrimitiveValue] g: style.getPropertyValue(-webkit-border-horizontal-spacing) : 0px g: style.getPropertyCSSValue(-webkit-border-horizontal-spacing) : [object CSSPrimitiveValue] +g: style.getPropertyValue(-webkit-border-image) : none +g: style.getPropertyCSSValue(-webkit-border-image) : [object CSSPrimitiveValue] +g: style.getPropertyValue(-webkit-border-top-left-radius) : 0px +g: style.getPropertyCSSValue(-webkit-border-top-left-radius) : [object CSSPrimitiveValue] +g: style.getPropertyValue(-webkit-border-top-right-radius) : 0px +g: style.getPropertyCSSValue(-webkit-border-top-right-radius) : [object CSSPrimitiveValue] g: style.getPropertyValue(-webkit-border-vertical-spacing) : 0px g: style.getPropertyCSSValue(-webkit-border-vertical-spacing) : [object CSSPrimitiveValue] g: style.getPropertyValue(-webkit-box-align) : stretch @@ -648,18 +664,18 @@ g: style.getPropertyValue(-webkit-mask-attachment) : scroll g: style.getPropertyCSSValue(-webkit-mask-attachment) : [object CSSPrimitiveValue] g: style.getPropertyValue(-webkit-mask-box-image) : none g: style.getPropertyCSSValue(-webkit-mask-box-image) : [object CSSPrimitiveValue] +g: style.getPropertyValue(-webkit-mask-clip) : border-box +g: style.getPropertyCSSValue(-webkit-mask-clip) : [object CSSPrimitiveValue] +g: style.getPropertyValue(-webkit-mask-composite) : source-over +g: style.getPropertyCSSValue(-webkit-mask-composite) : [object CSSPrimitiveValue] g: style.getPropertyValue(-webkit-mask-image) : none g: style.getPropertyCSSValue(-webkit-mask-image) : [object CSSPrimitiveValue] +g: style.getPropertyValue(-webkit-mask-origin) : border-box +g: style.getPropertyCSSValue(-webkit-mask-origin) : [object CSSPrimitiveValue] g: style.getPropertyValue(-webkit-mask-position) : 0% 0% g: style.getPropertyCSSValue(-webkit-mask-position) : [object CSSValueList] g: style.getPropertyValue(-webkit-mask-repeat) : repeat g: style.getPropertyCSSValue(-webkit-mask-repeat) : [object CSSPrimitiveValue] -g: style.getPropertyValue(-webkit-mask-clip) : border -g: style.getPropertyCSSValue(-webkit-mask-clip) : [object CSSPrimitiveValue] -g: style.getPropertyValue(-webkit-mask-composite) : source-over -g: style.getPropertyCSSValue(-webkit-mask-composite) : [object CSSPrimitiveValue] -g: style.getPropertyValue(-webkit-mask-origin) : border -g: style.getPropertyCSSValue(-webkit-mask-origin) : [object CSSPrimitiveValue] g: style.getPropertyValue(-webkit-mask-size) : auto auto g: style.getPropertyCSSValue(-webkit-mask-size) : [object CSSValueList] g: style.getPropertyValue(-webkit-nbsp-mode) : normal @@ -700,14 +716,6 @@ g: style.getPropertyValue(-webkit-user-modify) : read-only g: style.getPropertyCSSValue(-webkit-user-modify) : [object CSSPrimitiveValue] g: style.getPropertyValue(-webkit-user-select) : text g: style.getPropertyCSSValue(-webkit-user-select) : [object CSSPrimitiveValue] -g: style.getPropertyValue(-webkit-border-bottom-left-radius) : 0px -g: style.getPropertyCSSValue(-webkit-border-bottom-left-radius) : [object CSSPrimitiveValue] -g: style.getPropertyValue(-webkit-border-bottom-right-radius) : 0px -g: style.getPropertyCSSValue(-webkit-border-bottom-right-radius) : [object CSSPrimitiveValue] -g: style.getPropertyValue(-webkit-border-top-left-radius) : 0px -g: style.getPropertyCSSValue(-webkit-border-top-left-radius) : [object CSSPrimitiveValue] -g: style.getPropertyValue(-webkit-border-top-right-radius) : 0px -g: style.getPropertyCSSValue(-webkit-border-top-right-radius) : [object CSSPrimitiveValue] g: style.getPropertyValue(clip-path) : none g: style.getPropertyCSSValue(clip-path) : [object CSSPrimitiveValue] g: style.getPropertyValue(clip-rule) : nonzero diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 3d36a4e..2f819e0 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -1968,9 +1968,9 @@ BUG10465 LINUX : LayoutTests/fast/borders/border-image-border-radius.html = FAIL BUG10465 LINUX : LayoutTests/fast/clip/overflow-border-radius-clip.html = FAIL // Need rebaseline, see WebKit 41993. -BUG10466 WIN LINUX : LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html = FAIL -BUG10466 WIN LINUX : LayoutTests/fast/css/getComputedStyle/computed-style.html = FAIL -BUG10466 WIN LINUX : LayoutTests/svg/css/getComputedStyle-basic.xhtml = FAIL +BUG10466 LINUX : LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html = FAIL +BUG10466 LINUX : LayoutTests/fast/css/getComputedStyle/computed-style.html = FAIL +BUG10466 LINUX : LayoutTests/svg/css/getComputedStyle-basic.xhtml = FAIL // Needs rebaseline. See WebKit 41972. BUG10467 WIN LINUX : LayoutTests/fast/forms/slider-thumb-stylability.html = FAIL |