Index: third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/window-expected.txt |
diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/window-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/window-expected.txt |
index 56aca0734adaa15726c9ed70392951d1104321c6..2ec6c58bbe634ef915b13574a172c78922ec57ed 100644 |
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/window-expected.txt |
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/window-expected.txt |
@@ -17,66 +17,66 @@ |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer g id='bigWindow'", |
- "rect": [38, 143, 549, 392], |
+ "object": "LayoutSVGRect rect", |
+ "rect": [36, 141, 553, 396], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer g id='windowMainGroupbigWindow'", |
- "rect": [38, 143, 549, 392], |
+ "object": "LayoutSVGRect rect id='titleBarbigWindow'", |
+ "rect": [36, 141, 553, 19], |
"reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGRect rect", |
+ "rect": [36, 521, 553, 16], |
+ "reason": "layoutObject insertion" |
+ }, |
+ { |
+ "object": "LayoutSVGContainer g id='bigWindow'", |
"rect": [38, 143, 549, 392], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer g id='windowTitlebarGroupbigWindow'", |
- "rect": [38, 143, 549, 15], |
+ "object": "LayoutSVGContainer g id='windowMainGroupbigWindow'", |
+ "rect": [38, 143, 549, 392], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect id='titleBarbigWindow'", |
+ "object": "LayoutSVGContainer g id='windowTitlebarGroupbigWindow'", |
"rect": [38, 143, 549, 15], |
"reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGRect rect", |
- "rect": [38, 523, 549, 12], |
+ "rect": [75, 180, 319, 240], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer g id='nestedWindow'", |
- "rect": [77, 182, 315, 236], |
+ "object": "LayoutSVGRect rect id='titleBarnestedWindow'", |
+ "rect": [75, 180, 319, 19], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer g id='windowMainGroupnestedWindow'", |
- "rect": [77, 182, 315, 236], |
+ "object": "LayoutSVGRect rect", |
+ "rect": [75, 404, 319, 16], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect", |
+ "object": "LayoutSVGContainer g id='nestedWindow'", |
"rect": [77, 182, 315, 236], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer g id='windowTitlebarGroupnestedWindow'", |
- "rect": [77, 182, 315, 15], |
+ "object": "LayoutSVGContainer g id='windowMainGroupnestedWindow'", |
+ "rect": [77, 182, 315, 236], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect id='titleBarnestedWindow'", |
+ "object": "LayoutSVGContainer g id='windowTitlebarGroupnestedWindow'", |
"rect": [77, 182, 315, 15], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect", |
- "rect": [77, 406, 315, 12], |
- "reason": "layoutObject insertion" |
- }, |
- { |
"object": "LayoutSVGContainer g id='navWindow'", |
"rect": [613, 81, 185, 169], |
"reason": "bounds change" |
@@ -97,32 +97,47 @@ |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer g id='navWindow'", |
- "rect": [624, 92, 174, 158], |
+ "object": "LayoutSVGRect rect", |
+ "rect": [622, 90, 178, 162], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer g id='windowMainGroupnavWindow'", |
- "rect": [624, 92, 174, 158], |
+ "object": "LayoutSVGRect rect", |
+ "rect": [75, 193, 178, 147], |
+ "reason": "layoutObject insertion" |
+ }, |
+ { |
+ "object": "LayoutSVGRect rect id='titleBarcolourPickerWindow'", |
+ "rect": [75, 193, 178, 19], |
+ "reason": "layoutObject insertion" |
+ }, |
+ { |
+ "object": "LayoutSVGRect rect", |
+ "rect": [622, 236, 178, 16], |
"reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGRect rect", |
+ "rect": [75, 324, 178, 16], |
+ "reason": "layoutObject insertion" |
+ }, |
+ { |
+ "object": "LayoutSVGContainer g id='navWindow'", |
"rect": [624, 92, 174, 158], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer g id='colourPickerWindow'", |
- "rect": [77, 195, 174, 143], |
+ "object": "LayoutSVGContainer g id='windowMainGroupnavWindow'", |
+ "rect": [624, 92, 174, 158], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer g id='windowMainGroupcolourPickerWindow'", |
+ "object": "LayoutSVGContainer g id='colourPickerWindow'", |
"rect": [77, 195, 174, 143], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect", |
+ "object": "LayoutSVGContainer g id='windowMainGroupcolourPickerWindow'", |
"rect": [77, 195, 174, 143], |
"reason": "layoutObject insertion" |
}, |
@@ -132,18 +147,18 @@ |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect id='titleBarcolourPickerWindow'", |
- "rect": [77, 195, 174, 15], |
+ "object": "LayoutSVGRect rect", |
+ "rect": [310, 375, 162, 147], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect", |
- "rect": [624, 238, 174, 12], |
+ "object": "LayoutSVGRect rect id='titleBarsmallWindow'", |
+ "rect": [310, 375, 162, 19], |
"reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGRect rect", |
- "rect": [77, 326, 174, 12], |
+ "rect": [310, 506, 162, 16], |
"reason": "layoutObject insertion" |
}, |
{ |
@@ -232,23 +247,18 @@ |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect", |
- "rect": [312, 377, 158, 143], |
- "reason": "layoutObject insertion" |
- }, |
- { |
"object": "LayoutSVGContainer g id='windowTitlebarGroupsmallWindow'", |
"rect": [312, 377, 158, 16], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect id='titleBarsmallWindow'", |
- "rect": [312, 377, 158, 15], |
+ "object": "LayoutSVGRect rect", |
+ "rect": [247, 342, 147, 68], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect", |
- "rect": [312, 508, 158, 12], |
+ "object": "LayoutSVGRect rect id='titleBarstatusWindow'", |
+ "rect": [247, 342, 147, 19], |
"reason": "layoutObject insertion" |
}, |
{ |
@@ -262,21 +272,11 @@ |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect", |
- "rect": [249, 344, 143, 64], |
- "reason": "layoutObject insertion" |
- }, |
- { |
"object": "LayoutSVGContainer g id='windowTitlebarGroupstatusWindow'", |
"rect": [249, 344, 143, 15], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect id='titleBarstatusWindow'", |
- "rect": [249, 344, 143, 15], |
- "reason": "layoutObject insertion" |
- }, |
- { |
"object": "LayoutSVGContainer g", |
"rect": [320, 398, 136, 65], |
"reason": "layoutObject insertion" |
@@ -352,6 +352,11 @@ |
"reason": "layoutObject insertion" |
}, |
{ |
+ "object": "LayoutSVGRect rect", |
+ "rect": [37, 474, 123, 52], |
+ "reason": "layoutObject insertion" |
+ }, |
+ { |
"object": "LayoutSVGInlineText #text", |
"rect": [80, 406, 121, 11], |
"reason": "layoutObject insertion" |
@@ -372,11 +377,6 @@ |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect", |
- "rect": [39, 476, 119, 48], |
- "reason": "layoutObject insertion" |
- }, |
- { |
"object": "LayoutSVGContainer g", |
"rect": [257, 364, 118, 40], |
"reason": "layoutObject insertion" |
@@ -527,153 +527,223 @@ |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGInlineText #text", |
- "rect": [616, 153, 13, 81], |
- "reason": "layoutObject insertion" |
+ "object": "LayoutSVGRect rect", |
+ "rect": [767, 92, 15, 15], |
+ "reason": "bounds change" |
}, |
{ |
- "object": "LayoutSVGText text", |
- "rect": [616, 153, 13, 81], |
+ "object": "LayoutSVGRect rect", |
+ "rect": [767, 92, 15, 15], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'", |
- "rect": [769, 94, 11, 11], |
- "reason": "full" |
+ "object": "LayoutSVGRect rect", |
+ "rect": [556, 143, 15, 15], |
+ "reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'", |
- "rect": [769, 94, 11, 11], |
+ "object": "LayoutSVGRect rect", |
+ "rect": [361, 182, 15, 15], |
"reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGRect rect", |
- "rect": [769, 94, 11, 11], |
- "reason": "bounds change" |
+ "rect": [439, 378, 15, 14], |
+ "reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGRect rect", |
- "rect": [769, 94, 11, 11], |
+ "rect": [374, 344, 15, 14], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGViewportContainer svg id='maximizeButton'", |
- "rect": [769, 94, 11, 11], |
- "reason": "full" |
+ "object": "LayoutSVGPath line", |
+ "rect": [375, 182, 14, 15], |
+ "reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGViewportContainer svg id='maximizeButton'", |
- "rect": [769, 94, 11, 11], |
+ "object": "LayoutSVGPath line", |
+ "rect": [375, 182, 14, 15], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer use id='maximizeButtonbigWindow'", |
- "rect": [558, 145, 11, 11], |
- "reason": "layoutObject insertion" |
+ "object": "LayoutSVGPath line", |
+ "rect": [781, 93, 14, 14], |
+ "reason": "bounds change" |
}, |
{ |
- "object": "LayoutSVGRect rect", |
- "rect": [558, 145, 11, 11], |
+ "object": "LayoutSVGPath line", |
+ "rect": [781, 93, 14, 14], |
+ "reason": "bounds change" |
+ }, |
+ { |
+ "object": "LayoutSVGPath line", |
+ "rect": [781, 93, 14, 14], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGViewportContainer svg id='maximizeButton'", |
- "rect": [558, 145, 11, 11], |
+ "object": "LayoutSVGPath line", |
+ "rect": [781, 93, 14, 14], |
"reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGRect rect", |
- "rect": [441, 379, 11, 11], |
+ "rect": [614, 98, 14, 14], |
+ "reason": "bounds change" |
+ }, |
+ { |
+ "object": "LayoutSVGPath line", |
+ "rect": [614, 82, 14, 14], |
+ "reason": "bounds change" |
+ }, |
+ { |
+ "object": "LayoutSVGPath line", |
+ "rect": [614, 82, 14, 14], |
+ "reason": "bounds change" |
+ }, |
+ { |
+ "object": "LayoutSVGPath line", |
+ "rect": [570, 143, 14, 14], |
"reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGPath line", |
- "rect": [376, 184, 11, 11], |
+ "rect": [570, 143, 14, 14], |
"reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGPath line", |
- "rect": [376, 184, 11, 11], |
+ "rect": [453, 378, 14, 14], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer use id='maximizeButtonnestedWindow'", |
- "rect": [363, 184, 11, 11], |
+ "object": "LayoutSVGPath line", |
+ "rect": [453, 378, 14, 14], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect", |
- "rect": [363, 184, 11, 11], |
+ "object": "LayoutSVGPath line", |
+ "rect": [234, 196, 14, 14], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGViewportContainer svg id='maximizeButton'", |
- "rect": [363, 184, 11, 11], |
+ "object": "LayoutSVGPath line", |
+ "rect": [234, 196, 14, 14], |
"reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGRect rect", |
- "rect": [222, 197, 11, 11], |
+ "rect": [221, 196, 14, 14], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer use id='maximizeButtonsmallWindow'", |
- "rect": [441, 380, 11, 10], |
+ "object": "LayoutSVGPath line", |
+ "rect": [426, 386, 14, 6], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGViewportContainer svg id='maximizeButton'", |
- "rect": [441, 380, 11, 10], |
+ "object": "LayoutSVGPath line", |
+ "rect": [348, 191, 14, 6], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGContainer use id='maximizeButtonstatusWindow'", |
- "rect": [376, 346, 11, 10], |
- "reason": "layoutObject insertion" |
+ "object": "LayoutSVGPath line", |
+ "rect": [614, 122, 14, 5], |
+ "reason": "bounds change" |
}, |
{ |
- "object": "LayoutSVGRect rect", |
- "rect": [376, 346, 11, 10], |
+ "object": "LayoutSVGInlineText #text", |
+ "rect": [616, 153, 13, 81], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGViewportContainer svg id='maximizeButton'", |
- "rect": [376, 346, 11, 10], |
+ "object": "LayoutSVGText text", |
+ "rect": [616, 153, 13, 81], |
"reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGPath line", |
- "rect": [783, 94, 10, 11], |
+ "rect": [755, 101, 13, 6], |
"reason": "bounds change" |
}, |
{ |
"object": "LayoutSVGPath line", |
- "rect": [783, 94, 10, 11], |
- "reason": "bounds change" |
+ "rect": [755, 101, 13, 6], |
+ "reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGPath line", |
- "rect": [783, 94, 10, 11], |
+ "rect": [544, 152, 13, 6], |
"reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGPath line", |
- "rect": [783, 94, 10, 11], |
+ "rect": [208, 204, 13, 6], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGRect rect", |
- "rect": [616, 99, 10, 11], |
- "reason": "bounds change" |
+ "object": "LayoutSVGPath line", |
+ "rect": [362, 353, 13, 5], |
+ "reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGPath line", |
- "rect": [572, 145, 10, 11], |
+ "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'", |
+ "rect": [769, 94, 11, 11], |
+ "reason": "full" |
+ }, |
+ { |
+ "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'", |
+ "rect": [769, 94, 11, 11], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGPath line", |
- "rect": [572, 145, 10, 11], |
+ "object": "LayoutSVGViewportContainer svg id='maximizeButton'", |
+ "rect": [769, 94, 11, 11], |
+ "reason": "full" |
+ }, |
+ { |
+ "object": "LayoutSVGViewportContainer svg id='maximizeButton'", |
+ "rect": [769, 94, 11, 11], |
+ "reason": "layoutObject insertion" |
+ }, |
+ { |
+ "object": "LayoutSVGContainer use id='maximizeButtonbigWindow'", |
+ "rect": [558, 145, 11, 11], |
+ "reason": "layoutObject insertion" |
+ }, |
+ { |
+ "object": "LayoutSVGViewportContainer svg id='maximizeButton'", |
+ "rect": [558, 145, 11, 11], |
+ "reason": "layoutObject insertion" |
+ }, |
+ { |
+ "object": "LayoutSVGContainer use id='maximizeButtonnestedWindow'", |
+ "rect": [363, 184, 11, 11], |
+ "reason": "layoutObject insertion" |
+ }, |
+ { |
+ "object": "LayoutSVGViewportContainer svg id='maximizeButton'", |
+ "rect": [363, 184, 11, 11], |
+ "reason": "layoutObject insertion" |
+ }, |
+ { |
+ "object": "LayoutSVGContainer use id='maximizeButtonsmallWindow'", |
+ "rect": [441, 380, 11, 10], |
+ "reason": "layoutObject insertion" |
+ }, |
+ { |
+ "object": "LayoutSVGViewportContainer svg id='maximizeButton'", |
+ "rect": [441, 380, 11, 10], |
+ "reason": "layoutObject insertion" |
+ }, |
+ { |
+ "object": "LayoutSVGContainer use id='maximizeButtonstatusWindow'", |
+ "rect": [376, 346, 11, 10], |
+ "reason": "layoutObject insertion" |
+ }, |
+ { |
+ "object": "LayoutSVGViewportContainer svg id='maximizeButton'", |
+ "rect": [376, 346, 11, 10], |
"reason": "layoutObject insertion" |
}, |
{ |
@@ -722,16 +792,6 @@ |
"reason": "full" |
}, |
{ |
- "object": "LayoutSVGPath line", |
- "rect": [616, 84, 10, 10], |
- "reason": "bounds change" |
- }, |
- { |
- "object": "LayoutSVGPath line", |
- "rect": [616, 84, 10, 10], |
- "reason": "bounds change" |
- }, |
- { |
"object": "LayoutSVGRect rect", |
"rect": [616, 84, 10, 10], |
"reason": "bounds change" |
@@ -757,16 +817,6 @@ |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGPath line", |
- "rect": [455, 380, 10, 10], |
- "reason": "layoutObject insertion" |
- }, |
- { |
- "object": "LayoutSVGPath line", |
- "rect": [455, 380, 10, 10], |
- "reason": "layoutObject insertion" |
- }, |
- { |
"object": "LayoutSVGRect rect", |
"rect": [455, 380, 10, 10], |
"reason": "layoutObject insertion" |
@@ -807,16 +857,6 @@ |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGPath line", |
- "rect": [236, 198, 10, 10], |
- "reason": "layoutObject insertion" |
- }, |
- { |
- "object": "LayoutSVGPath line", |
- "rect": [236, 198, 10, 10], |
- "reason": "layoutObject insertion" |
- }, |
- { |
"object": "LayoutSVGRect rect", |
"rect": [236, 198, 10, 10], |
"reason": "layoutObject insertion" |
@@ -873,37 +913,17 @@ |
}, |
{ |
"object": "LayoutSVGPath line", |
- "rect": [756, 103, 10, 2], |
- "reason": "bounds change" |
- }, |
- { |
- "object": "LayoutSVGPath line", |
- "rect": [756, 103, 10, 2], |
- "reason": "layoutObject insertion" |
- }, |
- { |
- "object": "LayoutSVGPath line", |
- "rect": [616, 124, 10, 2], |
- "reason": "bounds change" |
- }, |
- { |
- "object": "LayoutSVGPath line", |
- "rect": [545, 154, 10, 2], |
- "reason": "layoutObject insertion" |
- }, |
- { |
- "object": "LayoutSVGPath line", |
- "rect": [428, 388, 10, 2], |
+ "rect": [-2, 19, 9, 15], |
"reason": "layoutObject insertion" |
}, |
{ |
"object": "LayoutSVGPath line", |
- "rect": [363, 354, 10, 2], |
+ "rect": [-2, 19, 9, 15], |
"reason": "layoutObject insertion" |
}, |
{ |
- "object": "LayoutSVGPath line", |
- "rect": [350, 193, 10, 2], |
+ "object": "LayoutSVGRect rect", |
+ "rect": [-2, 19, 9, 15], |
"reason": "layoutObject insertion" |
}, |
{ |
@@ -988,22 +1008,7 @@ |
}, |
{ |
"object": "LayoutSVGPath line", |
- "rect": [210, 206, 9, 2], |
- "reason": "layoutObject insertion" |
- }, |
- { |
- "object": "LayoutSVGPath line", |
- "rect": [0, 21, 5, 11], |
- "reason": "layoutObject insertion" |
- }, |
- { |
- "object": "LayoutSVGPath line", |
- "rect": [0, 21, 5, 11], |
- "reason": "layoutObject insertion" |
- }, |
- { |
- "object": "LayoutSVGRect rect", |
- "rect": [0, 21, 5, 11], |
+ "rect": [-2, 28, 9, 6], |
"reason": "layoutObject insertion" |
}, |
{ |
@@ -1015,11 +1020,6 @@ |
"object": "LayoutSVGRect rect", |
"rect": [0, 22, 5, 9], |
"reason": "layoutObject insertion" |
- }, |
- { |
- "object": "LayoutSVGPath line", |
- "rect": [0, 30, 5, 2], |
- "reason": "layoutObject insertion" |
} |
] |
} |