Changeset 163021 in webkit


Ignore:
Timestamp:
Jan 29, 2014, 8:26:31 AM (11 years ago)
Author:
Antti Koivisto
Message:

REGRESSION (r162947): Repaint test results are different between WK1 and WK2
​https://bugs.webkit.org/show_bug.cgi?id=127814

Source/WebCore:

Reviewed by Anders Carlsson.

  • page/FrameView.cpp:

(WebCore::FrameView::repaintContentRectangle):

Move repaint rect logging to RenderView.

  • rendering/RenderView.cpp:

(WebCore::RenderView::repaintViewRectangle):

Record raw repaint rects instead of optimized ones.

LayoutTests:

Revert test results changes. We now always log raw repaint rects which are same between platforms.

  • compositing/repaint/resize-repaint-expected.txt:
  • fast/box-shadow/shadow-repaint-expected.txt:
  • fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt:
  • fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt:
  • fast/css-grid-layout/grid-item-change-column-repaint-expected.txt:
  • fast/css-grid-layout/grid-item-change-row-repaint-expected.txt:
  • fast/regions/repaint/element-in-named-flow-absolute-from-fixed-expected.txt:
  • fast/regions/repaint/element-in-named-flow-fixed-from-absolute-expected.txt:
  • fast/regions/repaint/element-inflow-fixed-from-outflow-static-expected.txt:
  • fast/regions/repaint/element-outflow-static-from-inflow-fixed-expected.txt:
  • fast/regions/repaint/invalid-region-repaint-crash-expected.txt:
  • fast/regions/repaint/repaint-element-inside-relative-region-expected.txt:
  • fast/regions/repaint/repaint-regions-overflow-expected.txt:
  • fast/repaint/background-shorthand-with-gradient-and-height-changes-expected.txt:
  • fast/repaint/background-shorthand-with-gradient-and-height-changes.html:
  • fast/repaint/horizontal-bt-overflow-child-expected.txt:
  • fast/repaint/horizontal-bt-overflow-parent-expected.txt:
  • fast/repaint/horizontal-bt-overflow-same-expected.txt:
  • fast/repaint/negative-text-indent-with-overflow-hidden-expected.txt:
  • fast/repaint/overflow-flipped-writing-mode-table-expected.txt:
  • fast/repaint/reflection-table-layout-expected.txt:
  • fast/repaint/transform-table-layout-expected.txt:
  • fast/repaint/vertical-overflow-child-expected.txt:
  • fast/repaint/vertical-overflow-parent-expected.txt:
  • fast/repaint/vertical-overflow-same-expected.txt:
  • platform/mac-wk2/TestExpectations:
  • platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt:
  • platform/mac/fast/images/repaint-subrect-grid-expected.txt:
  • svg/repaint/repaint-webkit-svg-shadow-container-expected.txt:
Location:
trunk
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r163019 r163021  
     12014-01-29  Antti Koivisto  <antti@apple.com>
     2
     3        REGRESSION (r162947): Repaint test results are different between WK1 and WK2
     4        https://bugs.webkit.org/show_bug.cgi?id=127814
     5
     6        Revert test results changes. We now always log raw repaint rects which are same between platforms.
     7
     8        * compositing/repaint/resize-repaint-expected.txt:
     9        * fast/box-shadow/shadow-repaint-expected.txt:
     10        * fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt:
     11        * fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt:
     12        * fast/css-grid-layout/grid-item-change-column-repaint-expected.txt:
     13        * fast/css-grid-layout/grid-item-change-row-repaint-expected.txt:
     14        * fast/regions/repaint/element-in-named-flow-absolute-from-fixed-expected.txt:
     15        * fast/regions/repaint/element-in-named-flow-fixed-from-absolute-expected.txt:
     16        * fast/regions/repaint/element-inflow-fixed-from-outflow-static-expected.txt:
     17        * fast/regions/repaint/element-outflow-static-from-inflow-fixed-expected.txt:
     18        * fast/regions/repaint/invalid-region-repaint-crash-expected.txt:
     19        * fast/regions/repaint/repaint-element-inside-relative-region-expected.txt:
     20        * fast/regions/repaint/repaint-regions-overflow-expected.txt:
     21        * fast/repaint/background-shorthand-with-gradient-and-height-changes-expected.txt:
     22        * fast/repaint/background-shorthand-with-gradient-and-height-changes.html:
     23        * fast/repaint/horizontal-bt-overflow-child-expected.txt:
     24        * fast/repaint/horizontal-bt-overflow-parent-expected.txt:
     25        * fast/repaint/horizontal-bt-overflow-same-expected.txt:
     26        * fast/repaint/negative-text-indent-with-overflow-hidden-expected.txt:
     27        * fast/repaint/overflow-flipped-writing-mode-table-expected.txt:
     28        * fast/repaint/reflection-table-layout-expected.txt:
     29        * fast/repaint/transform-table-layout-expected.txt:
     30        * fast/repaint/vertical-overflow-child-expected.txt:
     31        * fast/repaint/vertical-overflow-parent-expected.txt:
     32        * fast/repaint/vertical-overflow-same-expected.txt:
     33        * platform/mac-wk2/TestExpectations:
     34        * platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt:
     35        * platform/mac/fast/images/repaint-subrect-grid-expected.txt:
     36        * svg/repaint/repaint-webkit-svg-shadow-container-expected.txt:
     37
    1382014-01-29  Antti Koivisto  <antti@apple.com>
    239

  • trunk/LayoutTests/compositing/repaint/resize-repaint-expected.txt

    r162952 r163021  
    11(repaint rects
    2   (rect 8 113 784 13)
     2  (rect 8 113 784 102)
    33  (rect 0 126 800 102)
    44)

  • trunk/LayoutTests/fast/box-shadow/shadow-repaint-expected.txt

    r162952 r163021  
    22
    33(repaint rects
     4  (rect 38 30 100 100)
     5  (rect 20 12 156 156)
    46  (rect 8 12 784 18)
    5   (rect 20 30 156 138)
    67)
    78

  • trunk/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt

    r162952 r163021  
    11This test checks that changing the grid-definition-columns lead to a repaint. The final grid element should be 250px * 50px, the grid item should be 50px * 50px. No trace of the elements before the grid-definition-columns change should be seen.
    22(repaint rects
     3  (rect 8 48 100 50)
     4  (rect 8 48 50 50)
    35  (rect 8 48 250 50)
    46)

  • trunk/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt

    r162952 r163021  
    11This test checks that changing the grid-definition-rows lead to a repaint. The final grid element should be 100px * 150px, the grid item should be 100px * 100px. No trace of the elements before the grid-definition-rows change should be seen.
    22(repaint rects
     3  (rect 8 48 100 50)
     4  (rect 8 48 100 100)
    35  (rect 8 48 100 150)
    46)

  • trunk/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint-expected.txt

    r162952 r163021  
    11This test checks that changing the grid-column on a grid item properly repaint. The final grid item should be 50px * 50px. There should be no trace of the grid item at the old position.
    22(repaint rects
     3  (rect 8 38 100 50)
     4  (rect 8 38 50 50)
    35  (rect 8 38 100 50)
    46  (rect 208 38 50 50)

  • trunk/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint-expected.txt

    r162952 r163021  
    11This test checks that changing the grid-row on a grid item properly repaint. The final grid item should be 100px * 100px. There should be no trace of the grid item at the old position.
    22(repaint rects
    3   (rect 8 38 100 150)
     3  (rect 8 38 100 50)
     4  (rect 8 38 100 100)
     5  (rect 8 38 100 50)
     6  (rect 8 88 100 100)
    47)
    58

  • trunk/LayoutTests/fast/regions/repaint/element-in-named-flow-absolute-from-fixed-expected.txt

    r162952 r163021  
    11(repaint rects
    2   (rect 50 100 250 50)
    3   (rect 100 150 200 150)
     2  (rect 50 100 50 50)
     3  (rect 100 100 200 200)
     4  (rect 150 200 50 50)
     5  (rect 150 200 50 50)
    46)
    57

  • trunk/LayoutTests/fast/regions/repaint/element-in-named-flow-fixed-from-absolute-expected.txt

    r162952 r163021  
    11(repaint rects
    2   (rect 50 100 250 50)
    3   (rect 100 150 200 150)
     2  (rect 150 200 50 50)
     3  (rect 100 100 200 200)
     4  (rect 50 100 50 50)
     5  (rect 50 100 50 50)
    46)
    57

  • trunk/LayoutTests/fast/regions/repaint/element-inflow-fixed-from-outflow-static-expected.txt

    r162952 r163021  
    11(repaint rects
    2   (rect 50 100 250 50)
    3   (rect 100 150 200 150)
    42  (rect 300 300 50 50)
     3  (rect 100 100 200 200)
     4  (rect 50 100 50 50)
     5  (rect 50 100 50 50)
    56)
    67

  • trunk/LayoutTests/fast/regions/repaint/element-outflow-static-from-inflow-fixed-expected.txt

    r162952 r163021  
    11(repaint rects
    2   (rect 50 100 250 50)
    3   (rect 100 150 200 150)
     2  (rect 50 100 50 50)
    43  (rect 300 300 50 50)
     4  (rect 100 100 200 200)
    55)
    66

  • trunk/LayoutTests/fast/regions/repaint/invalid-region-repaint-crash-expected.txt

    r162952 r163021  
    44
    55(repaint rects
    6   (rect 50 50 50 50)
    7   (rect 50 100 100 100)
    8   (rect 100 200 50 50)
     6  (rect 50 50 50 150)
     7  (rect 100 100 50 150)
     8  (rect 50 50 50 150)
     9  (rect 100 100 50 150)
     10  (rect 100 100 50 150)
     11  (rect 100 100 50 100)
     12  (rect 100 100 50 100)
     13  (rect 100 100 50 50)
     14  (rect 100 100 50 100)
     15  (rect 100 100 50 50)
     16  (rect 100 100 50 150)
     17  (rect 100 100 50 100)
     18  (rect 100 100 50 100)
     19  (rect 100 100 50 50)
    920)
    1021

  • trunk/LayoutTests/fast/regions/repaint/repaint-element-inside-relative-region-expected.txt

    r162952 r163021  
    22(repaint rects
    33  (rect 0 0 800 50)
    4   (rect 0 50 400 150)
    54  (rect 0 200 800 50)
     5  (rect 0 200 800 50)
     6  (rect 0 0 400 200)
     7  (rect 0 50 400 200)
     8  (rect 0 50 400 200)
    69)
    710

  • trunk/LayoutTests/fast/regions/repaint/repaint-regions-overflow-expected.txt

    r162952 r163021  
    66
    77(repaint rects
    8   (rect 14 56 300 50)
    9   (rect 14 106 392 94)
    10   (rect 14 200 398 116)
    11   (rect 60 316 352 100)
    12   (rect 100 416 312 50)
     8  (rect 106 306 300 160)
     9  (rect 14 72 300 210)
     10  (rect 106 122 300 210)
     11  (rect 14 298 300 18)
     12  (rect 106 348 300 18)
     13  (rect 14 56 300 260)
     14  (rect 106 106 300 260)
     15  (rect 60 150 312 266)
     16  (rect 100 200 312 266)
     17  (rect 14 56 300 260)
     18  (rect 106 106 300 260)
     19  (rect 14 56 300 260)
     20  (rect 106 106 300 260)
    1321)
    1422

  • trunk/LayoutTests/fast/repaint/background-shorthand-with-gradient-and-height-changes-expected.txt

    r162954 r163021  
    44
    55
    6 PASS repaintRects.indexOf('8 84 40 220') is not -1
     6PASS repaintRects.indexOf('28 84') is not -1
     7PASS repaintRects.indexOf('8 84') is not -1
    78PASS successfullyParsed is true
    89

  • trunk/LayoutTests/fast/repaint/background-shorthand-with-gradient-and-height-changes.html

    r162954 r163021  
    6262    repaintRects = window.internals.repaintRectsAsText();
    6363    window.internals.stopTrackingRepaints();
    64     shouldNotBe("repaintRects.indexOf('8 84 40 220')", "-1");
     64    shouldNotBe("repaintRects.indexOf('28 84')", "-1");
     65    shouldNotBe("repaintRects.indexOf('8 84')", "-1");
    6566    finishJSTest();
    6667}

  • trunk/LayoutTests/fast/repaint/horizontal-bt-overflow-child-expected.txt

    r162952 r163021  
    11(repaint rects
     2  (rect 29 106 100 100)
     3  (rect 29 106 100 100)
    24  (rect 29 106 100 100)
    35)

  • trunk/LayoutTests/fast/repaint/horizontal-bt-overflow-parent-expected.txt

    r162952 r163021  
    11(repaint rects
     2  (rect 29 29 100 100)
     3  (rect 29 29 100 100)
    24  (rect 29 29 100 100)
    35)

  • trunk/LayoutTests/fast/repaint/horizontal-bt-overflow-same-expected.txt

    r162952 r163021  
    11(repaint rects
     2  (rect 29 21 100 100)
     3  (rect 29 21 100 100)
    24  (rect 29 21 100 100)
    35)

  • trunk/LayoutTests/fast/repaint/negative-text-indent-with-overflow-hidden-expected.txt

    r162952 r163021  
    22(repaint rects
    33  (rect 550 8 200 50)
     4  (rect 550 8 200 50)
     5  (rect 550 8 200 50)
    46)
    57

  • trunk/LayoutTests/fast/repaint/overflow-flipped-writing-mode-table-expected.txt

    r162952 r163021  
    11(repaint rects
     2  (rect 8 8 100 50)
     3  (rect 8 8 100 50)
    24  (rect 8 8 100 50)
    35)

  • trunk/LayoutTests/fast/repaint/reflection-table-layout-expected.txt

    r162952 r163021  
    11(repaint rects
    2   (rect -92 8 200 1)
    3   (rect -92 9 884 1)
     2  (rect 7 8 2 1)
     3  (rect 6 8 4 2)
     4  (rect -92 9 200 1)
     5  (rect -92 8 200 2)
     6  (rect 8 9 784 1)
    47  (rect 0 17 800 1)
     8  (rect -92 9 200 1)
     9  (rect -92 9 200 1)
    510)
    611

  • trunk/LayoutTests/fast/repaint/transform-table-layout-expected.txt

    r162952 r163021  
    11(repaint rects
     2  (rect 8 108 1 1)
     3  (rect 8 108 2 2)
     4  (rect 8 109 100 1)
     5  (rect 8 108 100 2)
    26  (rect 8 9 784 1)
    37  (rect 0 17 800 1)
    4   (rect 8 108 100 2)
     8  (rect 8 109 100 1)
    59)
    610

  • trunk/LayoutTests/fast/repaint/vertical-overflow-child-expected.txt

    r162952 r163021  
    11(repaint rects
     2  (rect 214 21 100 100)
     3  (rect 214 21 100 100)
    24  (rect 214 21 100 100)
    35)

  • trunk/LayoutTests/fast/repaint/vertical-overflow-parent-expected.txt

    r162952 r163021  
    11(repaint rects
     2  (rect 29 29 100 100)
     3  (rect 29 29 100 100)
    24  (rect 29 29 100 100)
    35)

  • trunk/LayoutTests/fast/repaint/vertical-overflow-same-expected.txt

    r162952 r163021  
    11(repaint rects
     2  (rect 29 21 100 100)
     3  (rect 29 21 100 100)
    24  (rect 29 21 100 100)
    35)

  • trunk/LayoutTests/platform/mac-wk2/TestExpectations

    r162978 r163021  
    365365webkit.org/b/125996 platform/mac/accessibility/search-when-element-starts-in-table.html [ Failure ]
    366366
    367 webkit.org/b/127814 compositing/repaint/invalidations-on-composited-layers.html [ Failure ]
    368 webkit.org/b/127814 compositing/repaint/resize-repaint.html [ Failure ]
    369 webkit.org/b/127814 fast/box-shadow/shadow-repaint.html [ Failure ]
    370 webkit.org/b/127814 fast/css-grid-layout/grid-element-change-columns-repaint.html [ Failure ]
    371 webkit.org/b/127814 fast/css-grid-layout/grid-element-change-rows-repaint.html [ Failure ]
    372 webkit.org/b/127814 fast/css-grid-layout/grid-item-change-column-repaint.html [ Failure ]
    373 webkit.org/b/127814 fast/css-grid-layout/grid-item-change-row-repaint.html [ Failure ]
    374 webkit.org/b/127814 fast/images/repaint-subrect-grid.html [ Failure ]
    375 webkit.org/b/127814 fast/regions/repaint/element-in-named-flow-absolute-from-fixed.html [ Failure ]
    376 webkit.org/b/127814 fast/regions/repaint/element-in-named-flow-fixed-from-absolute.html [ Failure ]
    377 webkit.org/b/127814 fast/regions/repaint/element-inflow-fixed-from-outflow-static.html [ Failure ]
    378 webkit.org/b/127814 fast/regions/repaint/element-outflow-static-from-inflow-fixed.html [ Failure ]
    379 webkit.org/b/127814 fast/regions/repaint/invalid-region-repaint-crash.html [ Failure ]
    380 webkit.org/b/127814 fast/regions/repaint/repaint-element-inside-relative-region.html [ Failure ]
    381 webkit.org/b/127814 fast/regions/repaint/repaint-regions-overflow.html [ Failure ]
    382 webkit.org/b/127814 fast/repaint/background-shorthand-with-gradient-and-height-changes.html [ Failure ]
    383 webkit.org/b/127814 fast/repaint/horizontal-bt-overflow-child.html [ Failure ]
    384 webkit.org/b/127814 fast/repaint/horizontal-bt-overflow-parent.html [ Failure ]
    385 webkit.org/b/127814 fast/repaint/horizontal-bt-overflow-same.html [ Failure ]
    386 webkit.org/b/127814 fast/repaint/negative-text-indent-with-overflow-hidden.html [ Failure ]
    387 webkit.org/b/127814 fast/repaint/overflow-flipped-writing-mode-table.html [ Failure ]
    388 webkit.org/b/127814 fast/repaint/reflection-table-layout.html [ Failure ]
    389 webkit.org/b/127814 fast/repaint/transform-table-layout.html [ Failure ]
    390 webkit.org/b/127814 fast/repaint/vertical-overflow-child.html [ Failure ]
    391 webkit.org/b/127814 fast/repaint/vertical-overflow-parent.html [ Failure ]
    392 webkit.org/b/127814 fast/repaint/vertical-overflow-same.html [ Failure ]
    393 webkit.org/b/127814 svg/repaint/repaint-webkit-svg-shadow-container.html [ Failure ]
    394 
    395 
    396367### END OF (1) Classified failures with bug reports
    397368########################################

  • trunk/LayoutTests/platform/mac/compositing/repaint/invalidations-on-composited-layers-expected.txt

    r162952 r163021  
    11(repaint rects
    22  (rect 8 13 784 15)
    3   (rect 8 413 784 8)
     3  (rect 8 13 784 15)
     4  (rect 8 413 784 28)
    45  (rect 0 421 800 28)
    56)

  • trunk/LayoutTests/platform/mac/fast/images/repaint-subrect-grid-expected.txt

    r162952 r163021  
    22  (rect -100 -100 18 18)
    33  (rect 0 0 18 18)
    4   (rect 0 0 37 18)
    5   (rect 18 0 37 18)
     4  (rect 0 0 18 18)
     5  (rect 18 0 19 18)
     6  (rect 18 0 19 18)
     7  (rect 37 0 18 18)
    68  (rect 37 0 18 18)
    79  (rect -9 18 18 19)
    8   (rect -9 18 36 19)
     10  (rect -9 18 18 19)
     11  (rect 9 18 18 19)
    912  (rect 9 18 18 19)
    1013  (rect 28 18 18 19)
    11   (rect 28 18 36 19)
     14  (rect 28 18 18 19)
     15  (rect 46 18 18 19)
    1216  (rect 46 18 18 19)
    1317  (rect 0 37 18 18)
    14   (rect 0 37 37 18)
    15   (rect 18 37 37 18)
     18  (rect 0 37 18 18)
     19  (rect 18 37 19 18)
     20  (rect 18 37 19 18)
     21  (rect 37 37 18 18)
     22  (rect 37 37 18 18)
    1623  (rect -100 -100 18 18)
    17   (rect 37 37 18 18)
    1824)
    1925

  • trunk/LayoutTests/svg/repaint/repaint-webkit-svg-shadow-container-expected.txt

    r162952 r163021  
    11 (repaint rects
     2  (rect 8 8 340 340)
     3  (rect 8 8 594 594)
    24  (rect 8 8 720 600)
    35)

  • trunk/Source/WebCore/ChangeLog

    r163020 r163021  
     12014-01-29  Antti Koivisto  <antti@apple.com>
     2
     3        REGRESSION (r162947): Repaint test results are different between WK1 and WK2
     4        https://bugs.webkit.org/show_bug.cgi?id=127814
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * page/FrameView.cpp:
     9        (WebCore::FrameView::repaintContentRectangle):
     10       
     11            Move repaint rect logging to RenderView.
     12
     13        * rendering/RenderView.cpp:
     14        (WebCore::RenderView::repaintViewRectangle):
     15       
     16            Record raw repaint rects instead of optimized ones.
     17
    1182014-01-29  Brady Eidson  <beidson@apple.com>
    219

  • trunk/Source/WebCore/page/FrameView.cpp

    r162947 r163021  
    21202120    ASSERT(!frame().ownerElement());
    21212121
    2122     addTrackedRepaintRect(r);
    2123 
    21242122    if (!shouldUpdate(immediate))
    21252123        return;

  • trunk/Source/WebCore/rendering/RenderView.cpp

    r163019 r163021  
    628628        return;
    629629    }
    630 
    631630    IntRect pixelSnappedRect = pixelSnappedIntRect(repaintRect);
     631
     632    frameView().addTrackedRepaintRect(pixelSnappedRect);
     633
    632634    if (!m_accumulatedRepaintRegion || immediate) {
    633635        frameView().repaintContentRectangle(pixelSnappedRect, immediate);
Note: See TracChangeset for help on using the changeset viewer.