Changeset 97308 in webkit
- Timestamp:
- Oct 12, 2011 3:14:33 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 12 deleted
- 74 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r97306 r97308 1 2011-10-12 Mihnea Ovidenie <mihnea@adobe.com> 2 3 [CSS Regions]Remove -webkit-content-order property 4 https://bugs.webkit.org/show_bug.cgi?id=69848 5 6 Reviewed by Tony Chang. 7 8 -webkit-content-order property is removed from latest CSS Regions spec. 9 10 * fast/css/getComputedStyle/computed-style-expected.txt: 11 * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: 12 * fast/regions/content-flowed-into-regions-with-dyn-index-expected.txt: Removed. 13 * fast/regions/content-flowed-into-regions-with-dyn-index.html: Removed. 14 * fast/regions/content-flowed-into-regions-with-index-dom-expected.txt: Removed. 15 * fast/regions/content-flowed-into-regions-with-index-dom.html: Removed. 16 * fast/regions/content-flowed-into-regions-with-index-expected.txt: Removed. 17 * fast/regions/content-flowed-into-regions-with-index.html: Removed. 18 * fast/regions/script-tests/webkit-content-order-parsing.js: Removed. 19 * fast/regions/webkit-content-order-parsing-expected.txt: Removed. 20 * fast/regions/webkit-content-order-parsing.html: Removed. 21 * platform/chromium-cg-mac/fast/repaint/japanese-rl-selection-repaint-in-regions-expected.txt: 22 * platform/gtk/fast/repaint/japanese-rl-selection-repaint-in-regions-expected.txt: 23 * platform/gtk/fast/repaint/line-flow-with-floats-in-regions-expected.txt: 24 * platform/gtk/fast/repaint/overflow-flipped-writing-mode-block-in-regions-expected.txt: 25 * platform/mac/fast/regions/bottom-overflow-out-of-first-region-expected.txt: 26 * platform/mac/fast/regions/content-flowed-into-regions-dynamically-inserted-expected.txt: 27 * platform/mac/fast/regions/content-flowed-into-regions-with-dyn-index-expected.png: Removed. 28 * platform/mac/fast/regions/content-flowed-into-regions-with-index-dom-expected.png: Removed. 29 * platform/mac/fast/regions/content-flowed-into-regions-with-index-expected.png: Removed. 30 * platform/mac/fast/regions/floats-basic-in-variable-width-regions-expected.txt: 31 * platform/mac/fast/regions/flow-content-basic-expected.txt: 32 * platform/mac/fast/regions/flow-content-basic-vertical-expected.txt: 33 * platform/mac/fast/regions/flow-content-basic-vertical-rl-expected.txt: 34 * platform/mac/fast/regions/flows-dependency-dynamic-remove-expected.txt: 35 * platform/mac/fast/regions/flows-dependency-same-flow-expected.txt: 36 * platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt: 37 * platform/mac/fast/regions/outline-sides-in-region-expected.txt: 38 * platform/mac/fast/regions/overflow-in-uniform-regions-dynamic-expected.txt: 39 * platform/mac/fast/regions/overflow-in-uniform-regions-expected.txt: 40 * platform/mac/fast/regions/overflow-in-variable-width-regions-expected.txt: 41 * platform/mac/fast/regions/overflow-moving-below-floats-in-variable-width-regions-expected.txt: 42 * platform/mac/fast/regions/overflow-not-moving-below-floats-in-variable-width-regions-expected.txt: 43 * platform/mac/fast/regions/overflow-rtl-in-variable-width-regions-expected.txt: 44 * platform/mac/fast/regions/overflow-size-change-in-variable-width-regions-expected.txt: 45 * platform/mac/fast/regions/overflow-size-change-with-stacking-context-expected.txt: 46 * platform/mac/fast/regions/percentage-margins-mixed-ltr-dominant-regions-expected.txt: 47 * platform/mac/fast/regions/percentage-margins-mixed-rtl-dominant-regions-expected.txt: 48 * platform/mac/fast/regions/percentage-margins-rtl-variable-width-regions-expected.txt: 49 * platform/mac/fast/regions/percentage-margins-variable-width-regions-expected.txt: 50 * platform/mac/fast/regions/positioned-objects-block-static-in-regions-expected.txt: 51 * platform/mac/fast/regions/positioned-objects-block-static-in-rtl-regions-expected.txt: 52 * platform/mac/fast/regions/positioned-objects-in-regions-expected.txt: 53 * platform/mac/fast/regions/positioned-objects-in-rtl-regions-expected.txt: 54 * platform/mac/fast/regions/positioned-objects-inline-static-in-regions-expected.txt: 55 * platform/mac/fast/regions/positioned-objects-inline-static-in-rtl-regions-expected.txt: 56 * platform/mac/fast/regions/positioned-objects-perpendicular-flows-in-regions-expected.txt: 57 * platform/mac/fast/regions/region-overflow-auto-overflow-hidden-expected.txt: 58 * platform/mac/fast/regions/region-overflow-auto-overflow-visible-expected.txt: 59 * platform/mac/fast/regions/region-overflow-break-expected.txt: 60 * platform/mac/fast/regions/render-region-renderer-expected.txt: 61 * platform/mac/fast/regions/text-region-split-small-pagination-expected.txt: 62 * platform/mac/fast/regions/top-overflow-out-of-second-region-expected.txt: 63 * platform/mac/fast/regions/webkit-flow-double-pagination-float-push-expected.txt: 64 * platform/mac/fast/regions/webkit-flow-float-pushed-to-last-region-expected.txt: 65 * platform/mac/fast/regions/webkit-flow-float-unable-to-push-expected.txt: 66 * platform/mac/fast/regions/webkit-flow-floats-inside-regions-bounds-expected.txt: 67 * platform/mac/fast/regions/webkit-flow-inlines-dynamic-expected.txt: 68 * platform/mac/fast/regions/webkit-flow-inlines-inside-regions-bounds-expected.txt: 69 * platform/mac/fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical-expected.txt: 70 * platform/mac/fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical-rl-expected.txt: 71 * platform/mac/fast/regions/webkit-flow-renderer-expected.txt: 72 * platform/mac/fast/regions/webkit-flow-renderer-layer-expected.txt: 73 * platform/mac/fast/regions/webkit-flow-renderer-nested-expected.txt: 74 * platform/mac/fast/repaint/japanese-rl-selection-repaint-in-regions-expected.txt: 75 * platform/mac/fast/repaint/line-flow-with-floats-in-regions-expected.txt: 76 * platform/mac/fast/repaint/overflow-flipped-writing-mode-block-in-regions-expected.txt: 77 * platform/qt/fast/repaint/line-flow-with-floats-in-regions-expected.txt: 78 * platform/qt/fast/repaint/overflow-flipped-writing-mode-block-in-regions-expected.txt: 79 * platform/win/fast/repaint/japanese-rl-selection-repaint-in-regions-expected.txt: 80 * svg/css/getComputedStyle-basic-expected.txt: 81 1 82 2011-10-12 Dimitri Glazkov <dglazkov@chromium.org> 2 83 -
trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
r95096 r97308 199 199 -webkit-writing-mode: horizontal-tb; 200 200 -webkit-flow: auto; 201 -webkit-content-order: 0;202 201 -webkit-region-overflow: auto; 203 202 -webkit-region-break-after: auto; -
trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r95096 r97308 198 198 -webkit-writing-mode: horizontal-tb 199 199 -webkit-flow: auto 200 -webkit-content-order: 0201 200 -webkit-region-overflow: auto 202 201 -webkit-region-break-after: auto -
trunk/LayoutTests/platform/chromium-cg-mac/fast/repaint/japanese-rl-selection-repaint-in-regions-expected.txt
r96687 r97308 28 28 text run at (453,0) width 191: "\x{30B9}\x{3060}\x{3051}\x{3067}\x{306A}\x{304F}\x{3001}\x{8A2A}\x{554F}" 29 29 Regions for flow 'thread' 30 RenderRegion {DIV} with index 030 RenderRegion {DIV} 31 31 selection start: position 28 of child 0 {#text} of child 1 {DIV} of body 32 32 selection end: position 226 of child 0 {#text} of child 1 {DIV} of body -
trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt
r95149 r97308 199 199 -webkit-writing-mode: horizontal-tb; 200 200 -webkit-flow: auto; 201 -webkit-content-order: 0;202 201 -webkit-region-overflow: auto; 203 202 -webkit-region-break-after: auto; -
trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r95149 r97308 198 198 -webkit-writing-mode: horizontal-tb 199 199 -webkit-flow: auto 200 -webkit-content-order: 0201 200 -webkit-region-overflow: auto 202 201 -webkit-region-break-after: auto -
trunk/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt
r95149 r97308 395 395 rect: style.getPropertyValue(-webkit-flow) : auto 396 396 rect: style.getPropertyCSSValue(-webkit-flow) : [object CSSPrimitiveValue] 397 rect: style.getPropertyValue(-webkit-content-order) : 0398 rect: style.getPropertyCSSValue(-webkit-content-order) : [object CSSPrimitiveValue]399 397 rect: style.getPropertyValue(-webkit-region-overflow) : auto 400 398 rect: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue] … … 875 873 g: style.getPropertyValue(-webkit-flow) : auto 876 874 g: style.getPropertyCSSValue(-webkit-flow) : [object CSSPrimitiveValue] 877 g: style.getPropertyValue(-webkit-content-order) : 0878 g: style.getPropertyCSSValue(-webkit-content-order) : [object CSSPrimitiveValue]879 875 g: style.getPropertyValue(-webkit-region-overflow) : auto 880 876 g: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue] -
trunk/LayoutTests/platform/gtk/fast/repaint/japanese-rl-selection-repaint-in-regions-expected.txt
r93874 r97308 22 22 text run at (192,0) width 291: "\x{307E}\x{3059}\x{304B} \x{306A}\x{3089}\x{30BF}\x{30A4}\x{30C8}\x{30EB}\x{3068}\x{30A2}\x{30C9}\x{30EC}\x{30B9}\x{3060}\x{3051}\x{3067}\x{306A}\x{304F}\x{3001}\x{8A2A}\x{554F}" 23 23 Regions for flow 'thread' 24 RenderRegion {DIV} with index 024 RenderRegion {DIV} 25 25 selection start: position 1 of child 0 {#text} of child 1 {DIV} of body 26 26 selection end: position 46 of child 0 {#text} of child 1 {DIV} of body -
trunk/LayoutTests/platform/gtk/fast/repaint/line-flow-with-floats-in-regions-expected.txt
r93874 r97308 86 86 text run at (99,500) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}" 87 87 Regions for flow 'thread' 88 RenderRegion {DIV} with index 088 RenderRegion {DIV} -
trunk/LayoutTests/platform/gtk/fast/repaint/overflow-flipped-writing-mode-block-in-regions-expected.txt
r93874 r97308 15 15 RenderBlock {DIV} at (0,0) size 100x50 [bgcolor=#FF0000] 16 16 Regions for flow 'thread' 17 RenderRegion {DIV} with index 017 RenderRegion {DIV} -
trunk/LayoutTests/platform/mac/fast/regions/bottom-overflow-out-of-first-region-expected.txt
r96975 r97308 40 40 text run at (116,37) width 44: "region." 41 41 Regions for flow 'flow1' 42 RenderRegion {DIV} #region1 with index 043 RenderRegion {DIV} #region2 with index 044 RenderRegion {DIV} #region3 with index 042 RenderRegion {DIV} #region1 43 RenderRegion {DIV} #region2 44 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/content-flowed-into-regions-dynamically-inserted-expected.txt
r95741 r97308 16 16 RenderBlock {DIV} at (0,100) size 50x50 [bgcolor=#FFA500] 17 17 Regions for flow 'article' 18 RenderRegion {DIV} with index 019 RenderRegion {DIV} #region with index 020 RenderRegion {DIV} with index 018 RenderRegion {DIV} 19 RenderRegion {DIV} #region 20 RenderRegion {DIV} -
trunk/LayoutTests/platform/mac/fast/regions/floats-basic-in-variable-width-regions-expected.txt
r96620 r97308 33 33 text run at (0,54) width 271: "These lines will not spill out of the regions." 34 34 Regions for flow 'flow1' 35 RenderRegion {DIV} #region1 with index 036 RenderRegion {DIV} #region2 with index 037 RenderRegion {DIV} #region3 with index 035 RenderRegion {DIV} #region1 36 RenderRegion {DIV} #region2 37 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/flow-content-basic-expected.txt
r92969 r97308 26 26 text run at (0,0) width 79: "flow content" 27 27 Regions for flow 'main-thread' 28 RenderRegion {DIV} #region1 with index 028 RenderRegion {DIV} #region1 -
trunk/LayoutTests/platform/mac/fast/regions/flow-content-basic-vertical-expected.txt
r92981 r97308 28 28 text run at (0,0) width 79: "flow content" 29 29 Regions for flow 'main-thread' 30 RenderRegion {DIV} #region1 with index 030 RenderRegion {DIV} #region1 -
trunk/LayoutTests/platform/mac/fast/regions/flow-content-basic-vertical-rl-expected.txt
r92969 r97308 32 32 text run at (0,0) width 127: "second flow content" 33 33 Regions for flow 'main-thread' 34 RenderRegion {DIV} #region1 with index 035 RenderRegion {DIV} #region2 with index 034 RenderRegion {DIV} #region1 35 RenderRegion {DIV} #region2 -
trunk/LayoutTests/platform/mac/fast/regions/flows-dependency-dynamic-remove-expected.txt
r95741 r97308 9 9 Thread with flow-name 'flowA' 10 10 Regions for flow 'flowA' 11 RenderRegion {DIV} with index 112 RenderRegion {DIV} with index 211 RenderRegion {DIV} 12 RenderRegion {DIV} 13 13 Thread with flow-name 'flowB' 14 14 Regions for flow 'flowB' 15 RenderRegion {DIV} with index 115 RenderRegion {DIV} -
trunk/LayoutTests/platform/mac/fast/regions/flows-dependency-same-flow-expected.txt
r95741 r97308 10 10 Thread with flow-name 'flowB' 11 11 Regions for flow 'flowB' 12 RenderRegion {DIV} invalid with index 113 RenderRegion {DIV} with index 212 RenderRegion {DIV} invalid 13 RenderRegion {DIV} 14 14 Thread with flow-name 'flowC' 15 15 Regions for flow 'flowC' 16 RenderRegion {DIV} with index 117 RenderRegion {DIV} with index 316 RenderRegion {DIV} 17 RenderRegion {DIV} 18 18 Thread with flow-name 'flowA' 19 19 Regions for flow 'flowA' 20 RenderRegion {DIV} with index 221 RenderRegion {DIV} with index 320 RenderRegion {DIV} 21 RenderRegion {DIV} -
trunk/LayoutTests/platform/mac/fast/regions/multiple-directionality-changes-in-variable-width-regions-expected.txt
r96431 r97308 32 32 text run at (0,0) width 304: "This line of text should not get out of the region." 33 33 Regions for flow 'flow1' 34 RenderRegion {DIV} #region1 with index 035 RenderRegion {DIV} #region2 with index 036 RenderRegion {DIV} #region3 with index 034 RenderRegion {DIV} #region1 35 RenderRegion {DIV} #region2 36 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/outline-sides-in-region-expected.txt
r96718 r97308 18 18 text run at (0,0) width 8: " " 19 19 Regions for flow 'body' 20 RenderRegion {DIV} #region with index 020 RenderRegion {DIV} #region -
trunk/LayoutTests/platform/mac/fast/regions/overflow-in-uniform-regions-dynamic-expected.txt
r96620 r97308 36 36 text run at (0,70) width 73: "the regions." 37 37 Regions for flow 'flow1' 38 RenderRegion {DIV} #region1 with index 039 RenderRegion {DIV} #region2 with index 040 RenderRegion {DIV} #region3 with index 038 RenderRegion {DIV} #region1 39 RenderRegion {DIV} #region2 40 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/overflow-in-uniform-regions-expected.txt
r96620 r97308 37 37 text run at (0,70) width 50: "regions." 38 38 Regions for flow 'flow1' 39 RenderRegion {DIV} #region1 with index 040 RenderRegion {DIV} #region2 with index 041 RenderRegion {DIV} #region3 with index 039 RenderRegion {DIV} #region1 40 RenderRegion {DIV} #region2 41 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/overflow-in-variable-width-regions-expected.txt
r96620 r97308 35 35 text run at (0,0) width 286: "Clipped line of text that should not be visible." 36 36 Regions for flow 'flow1' 37 RenderRegion {DIV} #region1 with index 038 RenderRegion {DIV} #region2 with index 039 RenderRegion {DIV} #region3 with index 037 RenderRegion {DIV} #region1 38 RenderRegion {DIV} #region2 39 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/overflow-moving-below-floats-in-variable-width-regions-expected.txt
r96620 r97308 41 41 text run at (-22,0) width 286: "Clipped line of text that should not be visible." 42 42 Regions for flow 'flow1' 43 RenderRegion {DIV} #region1 with index 044 RenderRegion {DIV} #region2 with index 045 RenderRegion {DIV} #region3 with index 043 RenderRegion {DIV} #region1 44 RenderRegion {DIV} #region2 45 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/overflow-not-moving-below-floats-in-variable-width-regions-expected.txt
r96620 r97308 43 43 text run at (0,0) width 286: "Clipped line of text that should not be visible." 44 44 Regions for flow 'flow1' 45 RenderRegion {DIV} #region1 with index 046 RenderRegion {DIV} #region2 with index 047 RenderRegion {DIV} #region3 with index 045 RenderRegion {DIV} #region1 46 RenderRegion {DIV} #region2 47 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/overflow-rtl-in-variable-width-regions-expected.txt
r96620 r97308 35 35 text run at (0,0) width 286: "Clipped line of text that should not be visible." 36 36 Regions for flow 'flow1' 37 RenderRegion {DIV} #region1 with index 038 RenderRegion {DIV} #region2 with index 039 RenderRegion {DIV} #region3 with index 037 RenderRegion {DIV} #region1 38 RenderRegion {DIV} #region2 39 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/overflow-size-change-in-variable-width-regions-expected.txt
r96620 r97308 46 46 text run at (-23,0) width 286: "Clipped line of text that should not be visible." 47 47 Regions for flow 'flow1' 48 RenderRegion {DIV} #region1 with index 049 RenderRegion {DIV} #region2 with index 050 RenderRegion {DIV} #region3 with index 048 RenderRegion {DIV} #region1 49 RenderRegion {DIV} #region2 50 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/overflow-size-change-with-stacking-context-expected.txt
r97282 r97308 48 48 text run at (-23,0) width 286: "Clipped line of text that should not be visible." 49 49 Regions for flow 'flow1' 50 RenderRegion {DIV} #region1 with index 051 RenderRegion {DIV} #region2 with index 052 RenderRegion {DIV} #region3 with index 050 RenderRegion {DIV} #region1 51 RenderRegion {DIV} #region2 52 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/percentage-margins-mixed-ltr-dominant-regions-expected.txt
r96675 r97308 52 52 text run at (6,90) width 40: "region" 53 53 Regions for flow 'flow1' 54 RenderRegion {DIV} #region1 with index 055 RenderRegion {DIV} #region2 with index 056 RenderRegion {DIV} #region3 with index 054 RenderRegion {DIV} #region1 55 RenderRegion {DIV} #region2 56 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/percentage-margins-mixed-rtl-dominant-regions-expected.txt
r96675 r97308 49 49 text run at (162,90) width 44: "region." 50 50 Regions for flow 'flow1' 51 RenderRegion {DIV} #region1 with index 052 RenderRegion {DIV} #region2 with index 053 RenderRegion {DIV} #region3 with index 051 RenderRegion {DIV} #region1 52 RenderRegion {DIV} #region2 53 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/percentage-margins-rtl-variable-width-regions-expected.txt
r96675 r97308 52 52 text run at (186,90) width 40: "region" 53 53 Regions for flow 'flow1' 54 RenderRegion {DIV} #region1 with index 055 RenderRegion {DIV} #region2 with index 056 RenderRegion {DIV} #region3 with index 054 RenderRegion {DIV} #region1 55 RenderRegion {DIV} #region2 56 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/percentage-margins-variable-width-regions-expected.txt
r96675 r97308 49 49 text run at (-18,90) width 44: "region." 50 50 Regions for flow 'flow1' 51 RenderRegion {DIV} #region1 with index 052 RenderRegion {DIV} #region2 with index 053 RenderRegion {DIV} #region3 with index 051 RenderRegion {DIV} #region1 52 RenderRegion {DIV} #region2 53 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/positioned-objects-block-static-in-regions-expected.txt
r97282 r97308 22 22 RenderBlock (positioned) {DIV} at (30,0) size 160x150 [bgcolor=#008000] 23 23 Regions for flow 'flow1' 24 RenderRegion {DIV} #region1 with index 025 RenderRegion {DIV} #region2 with index 026 RenderRegion {DIV} #region3 with index 024 RenderRegion {DIV} #region1 25 RenderRegion {DIV} #region2 26 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/positioned-objects-block-static-in-rtl-regions-expected.txt
r97282 r97308 23 23 RenderBlock (positioned) {DIV} at (110,0) size 160x150 [bgcolor=#008000] 24 24 Regions for flow 'flow1' 25 RenderRegion {DIV} #region1 with index 026 RenderRegion {DIV} #region2 with index 027 RenderRegion {DIV} #region3 with index 025 RenderRegion {DIV} #region1 26 RenderRegion {DIV} #region2 27 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/positioned-objects-in-regions-expected.txt
r96452 r97308 21 21 RenderBlock (positioned) {DIV} at (0,0) size 100x150 [bgcolor=#008000] 22 22 Regions for flow 'flow1' 23 RenderRegion {DIV} #region1 with index 024 RenderRegion {DIV} #region2 with index 025 RenderRegion {DIV} #region3 with index 023 RenderRegion {DIV} #region1 24 RenderRegion {DIV} #region2 25 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/positioned-objects-in-rtl-regions-expected.txt
r96452 r97308 21 21 RenderBlock (positioned) {DIV} at (200,0) size 100x150 [bgcolor=#008000] 22 22 Regions for flow 'flow1' 23 RenderRegion {DIV} #region1 with index 024 RenderRegion {DIV} #region2 with index 025 RenderRegion {DIV} #region3 with index 023 RenderRegion {DIV} #region1 24 RenderRegion {DIV} #region2 25 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/positioned-objects-inline-static-in-regions-expected.txt
r97282 r97308 21 21 RenderBlock (positioned) {SPAN} at (110,0) size 100x150 [bgcolor=#008000] 22 22 Regions for flow 'flow1' 23 RenderRegion {DIV} #region1 with index 024 RenderRegion {DIV} #region2 with index 025 RenderRegion {DIV} #region3 with index 023 RenderRegion {DIV} #region1 24 RenderRegion {DIV} #region2 25 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/positioned-objects-inline-static-in-rtl-regions-expected.txt
r97282 r97308 21 21 RenderBlock (positioned) {SPAN} at (90,0) size 100x150 [bgcolor=#008000] 22 22 Regions for flow 'flow1' 23 RenderRegion {DIV} #region1 with index 024 RenderRegion {DIV} #region2 with index 025 RenderRegion {DIV} #region3 with index 023 RenderRegion {DIV} #region1 24 RenderRegion {DIV} #region2 25 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/positioned-objects-perpendicular-flows-in-regions-expected.txt
r96452 r97308 21 21 RenderBlock (positioned) {DIV} at (100,0) size 100x150 [bgcolor=#008000] 22 22 Regions for flow 'flow1' 23 RenderRegion {DIV} #region1 with index 024 RenderRegion {DIV} #region2 with index 025 RenderRegion {DIV} #region3 with index 023 RenderRegion {DIV} #region1 24 RenderRegion {DIV} #region2 25 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/region-overflow-auto-overflow-hidden-expected.txt
r96675 r97308 53 53 RenderText {#text} at (0,0) size 0x0 54 54 Regions for flow 'article' 55 RenderRegion {DIV} #region_1 with index 056 RenderRegion {DIV} #region_2 with index 055 RenderRegion {DIV} #region_1 56 RenderRegion {DIV} #region_2 -
trunk/LayoutTests/platform/mac/fast/regions/region-overflow-auto-overflow-visible-expected.txt
r96675 r97308 53 53 RenderText {#text} at (0,0) size 0x0 54 54 Regions for flow 'article' 55 RenderRegion {DIV} #region_1 with index 056 RenderRegion {DIV} #region_2 with index 055 RenderRegion {DIV} #region_1 56 RenderRegion {DIV} #region_2 -
trunk/LayoutTests/platform/mac/fast/regions/region-overflow-break-expected.txt
r96675 r97308 53 53 RenderText {#text} at (0,0) size 0x0 54 54 Regions for flow 'article' 55 RenderRegion {DIV} #region_1 with index 056 RenderRegion {DIV} #region_2 with index 055 RenderRegion {DIV} #region_1 56 RenderRegion {DIV} #region_2 -
trunk/LayoutTests/platform/mac/fast/regions/render-region-renderer-expected.txt
r95741 r97308 17 17 RenderFlowThread at (0,0) size 50x250 18 18 Regions for flow 'no-flow' 19 RenderRegion {DIV} with index 020 RenderRegion {DIV} with index 021 RenderRegion {DIV} with index 022 RenderRegion {DIV} with index 023 RenderRegion {DIV} with index 024 RenderRegion {DIV} with index 019 RenderRegion {DIV} 20 RenderRegion {DIV} 21 RenderRegion {DIV} 22 RenderRegion {DIV} 23 RenderRegion {DIV} 24 RenderRegion {DIV} -
trunk/LayoutTests/platform/mac/fast/regions/text-region-split-small-pagination-expected.txt
r96675 r97308 32 32 text run at (0,100) width 139: "region after this line." 33 33 Regions for flow 'flow' 34 RenderRegion {DIV} #region1 with index 035 RenderRegion {DIV} #region2 with index 036 RenderRegion {DIV} #region3 with index 037 RenderRegion {DIV} #region4 with index 034 RenderRegion {DIV} #region1 35 RenderRegion {DIV} #region2 36 RenderRegion {DIV} #region3 37 RenderRegion {DIV} #region4 -
trunk/LayoutTests/platform/mac/fast/regions/top-overflow-out-of-second-region-expected.txt
r96975 r97308 34 34 text run at (112,36) width 44: "region." 35 35 Regions for flow 'flow1' 36 RenderRegion {DIV} #region1 with index 037 RenderRegion {DIV} #region2 with index 038 RenderRegion {DIV} #region3 with index 036 RenderRegion {DIV} #region1 37 RenderRegion {DIV} #region2 38 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/webkit-flow-double-pagination-float-push-expected.txt
r96149 r97308 41 41 text run at (0,0) width 304: "This line of text should not get out of the region." 42 42 Regions for flow 'flow1' 43 RenderRegion {DIV} #region1 with index 044 RenderRegion {DIV} #region2 with index 045 RenderRegion {DIV} #region3 with index 043 RenderRegion {DIV} #region1 44 RenderRegion {DIV} #region2 45 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/webkit-flow-float-pushed-to-last-region-expected.txt
r96162 r97308 35 35 text run at (0,0) width 304: "This line of text should not get out of the region." 36 36 Regions for flow 'flow1' 37 RenderRegion {DIV} #region1 with index 038 RenderRegion {DIV} #region2 with index 039 RenderRegion {DIV} #region3 with index 037 RenderRegion {DIV} #region1 38 RenderRegion {DIV} #region2 39 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/webkit-flow-float-unable-to-push-expected.txt
r95855 r97308 37 37 text run at (0,0) width 304: "This line of text should not get out of the region." 38 38 Regions for flow 'flow1' 39 RenderRegion {DIV} #region1 with index 040 RenderRegion {DIV} #region2 with index 041 RenderRegion {DIV} #region3 with index 039 RenderRegion {DIV} #region1 40 RenderRegion {DIV} #region2 41 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/webkit-flow-floats-inside-regions-bounds-expected.txt
r96675 r97308 46 46 text run at (0,54) width 67: "the region." 47 47 Regions for flow 'flow1' 48 RenderRegion {DIV} #region1 with index 049 RenderRegion {DIV} #region2 with index 050 RenderRegion {DIV} #region3 with index 048 RenderRegion {DIV} #region1 49 RenderRegion {DIV} #region2 50 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/webkit-flow-inlines-dynamic-expected.txt
r96675 r97308 48 48 RenderBR {BR} at (1,408) size 0x18 49 49 Regions for flow 'flow1' 50 RenderRegion {DIV} #region1 with index 051 RenderRegion {DIV} #region2 with index 052 RenderRegion {DIV} #region3 with index 050 RenderRegion {DIV} #region1 51 RenderRegion {DIV} #region2 52 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/webkit-flow-inlines-inside-regions-bounds-expected.txt
r95750 r97308 37 37 text run at (0,54) width 67: "the region." 38 38 Regions for flow 'flow1' 39 RenderRegion {DIV} #region1 with index 040 RenderRegion {DIV} #region2 with index 041 RenderRegion {DIV} #region3 with index 039 RenderRegion {DIV} #region1 40 RenderRegion {DIV} #region2 41 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical-expected.txt
r95741 r97308 50 50 text run at (54,0) width 67: "the region." 51 51 Regions for flow 'flow1' 52 RenderRegion {DIV} #region1 with index 053 RenderRegion {DIV} #region2 with index 054 RenderRegion {DIV} #region3 with index 052 RenderRegion {DIV} #region1 53 RenderRegion {DIV} #region2 54 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical-rl-expected.txt
r95741 r97308 50 50 text run at (54,0) width 67: "the region." 51 51 Regions for flow 'flow1' 52 RenderRegion {DIV} #region1 with index 053 RenderRegion {DIV} #region2 with index 054 RenderRegion {DIV} #region3 with index 052 RenderRegion {DIV} #region1 53 RenderRegion {DIV} #region2 54 RenderRegion {DIV} #region3 -
trunk/LayoutTests/platform/mac/fast/regions/webkit-flow-renderer-expected.txt
r95741 r97308 18 18 text run at (0,0) width 91: "DIV1 - flowA" 19 19 Regions for flow 'flowA' 20 RenderRegion {DIV} #REGION1 with index 020 RenderRegion {DIV} #REGION1 21 21 Thread with flow-name 'flowB' 22 22 layer at (0,0) size 784x100 … … 36 36 text run at (0,0) width 90: "DIV6 - flowB" 37 37 Regions for flow 'flowB' 38 RenderRegion {DIV} #REGION2 with index 038 RenderRegion {DIV} #REGION2 39 39 Thread with flow-name 'flowC' 40 40 layer at (0,0) size 784x100 … … 47 47 text run at (0,0) width 90: "DIV8 - flowC" 48 48 Regions for flow 'flowC' 49 RenderRegion {DIV} #REGION3 with index 049 RenderRegion {DIV} #REGION3 -
trunk/LayoutTests/platform/mac/fast/regions/webkit-flow-renderer-layer-expected.txt
r95741 r97308 16 16 text run at (0,0) width 91: "DIV1 - flowA" 17 17 Regions for flow 'flowA' 18 RenderRegion {DIV} #REGION1 with index 018 RenderRegion {DIV} #REGION1 19 19 Thread with flow-name 'flowB' 20 20 layer at (0,0) size 784x100 … … 25 25 text run at (0,0) width 90: "DIV2 - flowB" 26 26 Regions for flow 'flowB' 27 RenderRegion {DIV} #REGION2 with index 027 RenderRegion {DIV} #REGION2 28 28 Thread with flow-name 'flowC' 29 29 layer at (0,0) size 784x100 layerType: background only … … 42 42 text run at (0,0) width 90: "DIV5 - flowC" 43 43 Regions for flow 'flowC' 44 RenderRegion {DIV} #REGION3 with index 044 RenderRegion {DIV} #REGION3 -
trunk/LayoutTests/platform/mac/fast/regions/webkit-flow-renderer-nested-expected.txt
r95741 r97308 21 21 text run at (0,0) width 91: "DIV3 - flowA" 22 22 Regions for flow 'flowA' 23 RenderRegion {DIV} #REGION1 with index 023 RenderRegion {DIV} #REGION1 24 24 Thread with flow-name 'flowB' 25 25 layer at (0,0) size 784x100 … … 29 29 text run at (0,0) width 90: "DIV2 - flowB" 30 30 Regions for flow 'flowB' 31 RenderRegion {DIV} #REGION2 with index 031 RenderRegion {DIV} #REGION2 -
trunk/LayoutTests/platform/mac/fast/repaint/japanese-rl-selection-repaint-in-regions-expected.txt
r97182 r97308 28 28 text run at (453,0) width 191: "\x{30B9}\x{3060}\x{3051}\x{3067}\x{306A}\x{304F}\x{3001}\x{8A2A}\x{554F}" 29 29 Regions for flow 'thread' 30 RenderRegion {DIV} with index 030 RenderRegion {DIV} 31 31 selection start: position 28 of child 0 {#text} of child 1 {DIV} of body 32 32 selection end: position 226 of child 0 {#text} of child 1 {DIV} of body -
trunk/LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-in-regions-expected.txt
r93144 r97308 86 86 text run at (99,474) width 261: "wonder is, that there\x{2018}s any one left alive!\x{2019}" 87 87 Regions for flow 'thread' 88 RenderRegion {DIV} with index 088 RenderRegion {DIV} -
trunk/LayoutTests/platform/mac/fast/repaint/overflow-flipped-writing-mode-block-in-regions-expected.txt
r93144 r97308 15 15 RenderBlock {DIV} at (0,0) size 100x50 [bgcolor=#FF0000] 16 16 Regions for flow 'thread' 17 RenderRegion {DIV} with index 017 RenderRegion {DIV} -
trunk/LayoutTests/platform/qt/fast/repaint/line-flow-with-floats-in-regions-expected.txt
r93198 r97308 87 87 text run at (6,622) width 41: "alive!\x{2019}" 88 88 Regions for flow 'thread' 89 RenderRegion {DIV} with index 089 RenderRegion {DIV} -
trunk/LayoutTests/platform/qt/fast/repaint/overflow-flipped-writing-mode-block-in-regions-expected.txt
r93198 r97308 15 15 RenderBlock {DIV} at (0,0) size 100x50 [bgcolor=#FF0000] 16 16 Regions for flow 'thread' 17 RenderRegion {DIV} with index 017 RenderRegion {DIV} -
trunk/LayoutTests/platform/win/fast/repaint/japanese-rl-selection-repaint-in-regions-expected.txt
r93205 r97308 26 26 text run at (288,0) width 197: "\x{30C9}\x{30EC}\x{30B9}\x{3060}\x{3051}\x{3067}\x{306A}\x{304F}\x{3001}\x{8A2A}\x{554F}" 27 27 Regions for flow 'thread' 28 RenderRegion {DIV} with index 028 RenderRegion {DIV} 29 29 selection start: position 1 of child 0 {#text} of child 1 {DIV} of body 30 30 selection end: position 30 of child 0 {#text} of child 1 {DIV} of body -
trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
r95096 r97308 395 395 rect: style.getPropertyValue(-webkit-flow) : auto 396 396 rect: style.getPropertyCSSValue(-webkit-flow) : [object CSSPrimitiveValue] 397 rect: style.getPropertyValue(-webkit-content-order) : 0398 rect: style.getPropertyCSSValue(-webkit-content-order) : [object CSSPrimitiveValue]399 397 rect: style.getPropertyValue(-webkit-region-overflow) : auto 400 398 rect: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue] … … 875 873 g: style.getPropertyValue(-webkit-flow) : auto 876 874 g: style.getPropertyCSSValue(-webkit-flow) : [object CSSPrimitiveValue] 877 g: style.getPropertyValue(-webkit-content-order) : 0878 g: style.getPropertyCSSValue(-webkit-content-order) : [object CSSPrimitiveValue]879 875 g: style.getPropertyValue(-webkit-region-overflow) : auto 880 876 g: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue] -
trunk/Source/WebCore/ChangeLog
r97305 r97308 1 2011-10-12 Mihnea Ovidenie <mihnea@adobe.com> 2 3 [CSS Regions]Remove -webkit-content-order property 4 https://bugs.webkit.org/show_bug.cgi?id=69848 5 6 Reviewed by Tony Chang. 7 8 -webkit-content-order property is removed from latest CSS Regions spec. 9 10 * css/CSSComputedStyleDeclaration.cpp: 11 (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): 12 * css/CSSParser.cpp: 13 (WebCore::CSSParser::parseValue): 14 * css/CSSPropertyNames.in: 15 * css/CSSStyleSelector.cpp: 16 (WebCore::CSSStyleSelector::applyProperty): 17 * dom/Node.cpp: 18 (WebCore::Node::diff): 19 * rendering/RenderFlowThread.cpp: 20 (WebCore::compareRenderRegions): 21 * rendering/RenderTreeAsText.cpp: 22 (WebCore::writeRenderFlowThreads): 23 * rendering/style/RenderStyle.h: 24 * rendering/style/StyleRareNonInheritedData.cpp: 25 (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData): 26 (WebCore::StyleRareNonInheritedData::operator==): 27 * rendering/style/StyleRareNonInheritedData.h: 28 1 29 2011-10-12 Adam Bergkvist <adam.bergkvist@ericsson.com> 2 30 -
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
r96775 r97308 276 276 CSSPropertyWebkitWritingMode, 277 277 CSSPropertyWebkitFlow, 278 CSSPropertyWebkitContentOrder,279 278 CSSPropertyWebkitRegionOverflow, 280 279 CSSPropertyWebkitRegionBreakAfter, … … 1989 1988 return primitiveValueCache->createIdentifierValue(CSSValueAuto); 1990 1989 return primitiveValueCache->createValue(style->flowThread(), CSSPrimitiveValue::CSS_STRING); 1991 case CSSPropertyWebkitContentOrder:1992 return primitiveValueCache->createValue(style->regionIndex(), CSSPrimitiveValue::CSS_NUMBER);1993 1990 case CSSPropertyWebkitRegionOverflow: 1994 1991 return primitiveValueCache->createValue(style->regionOverflow()); -
trunk/Source/WebCore/css/CSSParser.cpp
r96952 r97308 1643 1643 case CSSPropertyWebkitFlow: 1644 1644 return parseFlowThread(propId, important); 1645 case CSSPropertyWebkitContentOrder:1646 validPrimitive = validUnit(value, FInteger, m_strict);1647 break;1648 1645 case CSSPropertyWebkitRegionOverflow: 1649 1646 if (id == CSSValueAuto || id == CSSValueBreak) -
trunk/Source/WebCore/css/CSSPropertyNames.in
r96433 r97308 350 350 -webkit-user-select 351 351 -webkit-flow 352 -webkit-content-order353 352 -webkit-region-overflow 354 353 -webkit-wrap-shape -
trunk/Source/WebCore/css/CSSStyleSelector.cpp
r97248 r97308 3450 3450 else 3451 3451 m_style->setFlowThread(primitiveValue->getStringValue()); 3452 return;3453 case CSSPropertyWebkitContentOrder:3454 HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(regionIndex, RegionIndex);3455 3452 return; 3456 3453 case CSSPropertyWebkitRegionOverflow: -
trunk/Source/WebCore/dom/Node.cpp
r96880 r97308 365 365 // When either the region thread or the region index has changed, 366 366 // we need to prepare a separate render region object. 367 if ((s1 && s2) && ( (s1->regionThread() != s2->regionThread() || (s1->regionIndex() != s2->regionIndex()))))367 if ((s1 && s2) && (s1->regionThread() != s2->regionThread())) 368 368 ch = Detach; 369 369 -
trunk/Source/WebCore/rendering/RenderFlowThread.cpp
r96975 r97308 145 145 // Compare two regions to determine in which one the content should flow first. 146 146 // The function returns true if the first passed region is "less" than the second passed region. 147 // If the first region index < second region index, then the first region is "less" than the second region. 148 // If the first region index == second region index and first region appears before second region in DOM, 147 // If the first region appears before second region in DOM, 149 148 // the first region is "less" than the second region. 150 149 // If the first region is "less" than the second region, the first region receives content before second region. … … 153 152 ASSERT(firstRegion); 154 153 ASSERT(secondRegion); 155 156 // First, compare only region-index properties.157 if (firstRegion->style()->regionIndex() != secondRegion->style()->regionIndex())158 return (firstRegion->style()->regionIndex() < secondRegion->style()->regionIndex());159 154 160 155 // If the regions have the same region-index, compare their position in dom. -
trunk/Source/WebCore/rendering/RenderTreeAsText.cpp
r96620 r97308 688 688 if (!renderRegion->isValid()) 689 689 ts << " invalid"; 690 ts << " with index " << renderRegion->style()->regionIndex() << "\n";690 ts << "\n"; 691 691 } 692 692 } -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r97046 r97308 802 802 const AtomicString& flowThread() const { return rareNonInheritedData->m_flowThread; } 803 803 const AtomicString& regionThread() const { return rareNonInheritedData->m_regionThread; } 804 int regionIndex() const { return rareNonInheritedData->m_regionIndex; }805 804 RegionOverflow regionOverflow() const { return static_cast<RegionOverflow>(rareNonInheritedData->m_regionOverflow); } 806 805 … … 1185 1184 void setFlowThread(const AtomicString& flowThread) { SET_VAR(rareNonInheritedData, m_flowThread, flowThread); } 1186 1185 void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInheritedData, m_regionThread, regionThread); } 1187 void setRegionIndex(int regionIndex) { SET_VAR(rareNonInheritedData, m_regionIndex, regionIndex); }1188 1186 void setRegionOverflow(RegionOverflow regionOverflow) { SET_VAR(rareNonInheritedData, m_regionOverflow, regionOverflow); } 1189 1187 … … 1466 1464 static const AtomicString& initialFlowThread() { return nullAtom; } 1467 1465 static const AtomicString& initialRegionThread() { return nullAtom; } 1468 static int initialRegionIndex() { return 0; }1469 1466 static RegionOverflow initialRegionOverflow() { return AutoRegionOverflow; } 1470 1467 -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
r96972 r97308 47 47 , m_flowThread(RenderStyle::initialFlowThread()) 48 48 , m_regionThread(RenderStyle::initialRegionThread()) 49 , m_regionIndex(RenderStyle::initialRegionIndex())50 49 , m_regionOverflow(RenderStyle::initialRegionOverflow()) 51 50 , m_regionBreakAfter(RenderStyle::initialPageBreak()) … … 101 100 , m_flowThread(o.m_flowThread) 102 101 , m_regionThread(o.m_regionThread) 103 , m_regionIndex(o.m_regionIndex)104 102 , m_regionOverflow(o.m_regionOverflow) 105 103 , m_regionBreakAfter(o.m_regionBreakAfter) … … 174 172 && (m_flowThread == o.m_flowThread) 175 173 && (m_regionThread == o.m_regionThread) 176 && (m_regionIndex == o.m_regionIndex)177 174 && (m_regionOverflow == o.m_regionOverflow) 178 175 && (m_wrapShape == o.m_wrapShape) -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
r96972 r97308 133 133 AtomicString m_flowThread; 134 134 AtomicString m_regionThread; 135 int m_regionIndex;136 135 unsigned m_regionOverflow : 1; // RegionOverflow 137 136
Note: See TracChangeset
for help on using the changeset viewer.