Changeset 155994 in webkit
- Timestamp:
- Sep 17, 2013 1:54:00 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 14 deleted
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r155992 r155994 1 2013-09-17 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r155977. 4 http://trac.webkit.org/changeset/155977 5 https://bugs.webkit.org/show_bug.cgi?id=121515 6 7 Broke over a dozen tests on Mac WK2 (Requested by ap on 8 #webkit). 9 10 * compositing/contents-scale/animating-expected.txt: Removed. 11 * compositing/contents-scale/animating.html: Removed. 12 * compositing/contents-scale/scaled-ancestor-expected.txt: Removed. 13 * compositing/contents-scale/scaled-ancestor.html: Removed. 14 * compositing/contents-scale/simple-scale-expected.txt: Removed. 15 * compositing/contents-scale/simple-scale.html: Removed. 16 * compositing/contents-scale/z-translate-expected.txt: Removed. 17 * compositing/contents-scale/z-translate.html: Removed. 18 * compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants-expected.txt: 19 * compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants2-expected.txt: 20 * compositing/visible-rect/2d-transformed-expected.txt: 21 * compositing/visible-rect/3d-transform-style-expected.txt: 22 * compositing/visible-rect/3d-transformed-expected.txt: 23 * compositing/visible-rect/animated-expected.txt: 24 * compositing/visible-rect/animated-from-none-expected.txt: 25 * compositing/visible-rect/clipped-by-viewport-expected.txt: 26 * compositing/visible-rect/clipped-visible-rect-expected.txt: 27 * compositing/visible-rect/flipped-preserve-3d-expected.txt: 28 * compositing/visible-rect/iframe-and-layers-expected.txt: 29 * compositing/visible-rect/nested-transform-expected.txt: 30 * compositing/visible-rect/scrolled-expected.txt: 31 * platform/mac/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants-expected.txt: Removed. 32 * platform/mac/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants2-expected.txt: Removed. 33 * platform/mac/compositing/tiling/rotated-tiled-clamped-expected.txt: 34 * platform/mac/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt: 35 * platform/mac/compositing/tiling/tile-cache-zoomed-expected.txt: 36 * platform/mac/compositing/visible-rect/2d-transformed-expected.txt: Removed. 37 * platform/mac/compositing/visible-rect/3d-transform-style-expected.txt: Removed. 38 * platform/mac/compositing/visible-rect/3d-transformed-expected.txt: Removed. 39 * platform/mac/compositing/visible-rect/animated-expected.txt: Removed. 40 * platform/mac/compositing/visible-rect/animated-from-none-expected.txt: Removed. 41 * platform/mac/compositing/visible-rect/clipped-by-viewport-expected.txt: Removed. 42 * platform/mac/compositing/visible-rect/clipped-visible-rect-expected.txt: Removed. 43 * platform/mac/compositing/visible-rect/flipped-preserve-3d-expected.txt: Removed. 44 * platform/mac/compositing/visible-rect/iframe-and-layers-expected.txt: Removed. 45 * platform/mac/compositing/visible-rect/iframe-no-layers-expected.txt: 46 * platform/mac/compositing/visible-rect/nested-transform-expected.txt: Removed. 47 * platform/mac/compositing/visible-rect/scrolled-expected.txt: Removed. 48 1 49 2013-09-17 Eric Carlson <eric.carlson@apple.com> 2 50 -
trunk/LayoutTests/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants-expected.txt
r155977 r155994 6 6 (GraphicsLayer 7 7 (bounds 800.00 600.00) 8 (visible rect 0.00, 0.00 800.00 x 600.00) 8 9 (children 1 9 10 (GraphicsLayer 10 11 (bounds 800.00 600.00) 11 12 (contentsOpaque 1) 13 (visible rect 0.00, 0.00 800.00 x 600.00) 12 14 (children 3 13 15 (GraphicsLayer … … 15 17 (bounds 22.00 22.00) 16 18 (drawsContent 1) 19 (visible rect 0.00, 0.00 22.00 x 22.00) 17 20 ) 18 21 (GraphicsLayer … … 20 23 (bounds 102.00 20.00) 21 24 (drawsContent 1) 25 (visible rect 0.00, 0.00 102.00 x 20.00) 22 26 ) 23 27 (GraphicsLayer … … 25 29 (bounds 787.00 18.00) 26 30 (drawsContent 1) 31 (visible rect 0.00, 0.00 787.00 x 18.00) 27 32 ) 28 33 ) -
trunk/LayoutTests/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants2-expected.txt
r155977 r155994 6 6 (GraphicsLayer 7 7 (bounds 800.00 600.00) 8 (visible rect 0.00, 0.00 800.00 x 600.00) 8 9 (children 1 9 10 (GraphicsLayer 10 11 (bounds 800.00 600.00) 11 12 (contentsOpaque 1) 13 (visible rect 0.00, 0.00 800.00 x 600.00) 12 14 (children 3 13 15 (GraphicsLayer … … 15 17 (bounds 22.00 22.00) 16 18 (drawsContent 1) 19 (visible rect 0.00, 0.00 22.00 x 22.00) 17 20 ) 18 21 (GraphicsLayer … … 20 23 (bounds 102.00 20.00) 21 24 (drawsContent 1) 25 (visible rect 0.00, 0.00 102.00 x 20.00) 22 26 ) 23 27 (GraphicsLayer … … 25 29 (bounds 778.00 18.00) 26 30 (drawsContent 1) 31 (visible rect 0.00, 0.00 778.00 x 18.00) 27 32 ) 28 33 ) -
trunk/LayoutTests/compositing/visible-rect/2d-transformed-expected.txt
r155977 r155994 1 1 (GraphicsLayer 2 2 (bounds 800.00 600.00) 3 (visible rect 0.00, 0.00 800.00 x 600.00) 3 4 (children 1 4 5 (GraphicsLayer 5 6 (bounds 800.00 600.00) 6 7 (contentsOpaque 1) 8 (visible rect 0.00, 0.00 800.00 x 600.00) 7 9 (children 1 8 10 (GraphicsLayer 9 11 (position 8.00 8.00) 10 12 (bounds 502.00 202.00) 13 (visible rect 0.00, 0.00 502.00 x 202.00) 11 14 (children 1 12 15 (GraphicsLayer 13 16 (position 1.00 1.00) 14 17 (bounds 500.00 200.00) 18 (visible rect 0.00, 0.00 500.00 x 200.00) 15 19 (children 3 16 20 (GraphicsLayer … … 18 22 (contentsOpaque 1) 19 23 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [-100.00 0.00 0.00 1.00]) 24 (visible rect 100.00, 0.00 100.00 x 200.00) 20 25 ) 21 26 (GraphicsLayer … … 23 28 (contentsOpaque 1) 24 29 (transform [0.71 0.71 0.00 0.00] [-0.71 0.71 0.00 0.00] [0.00 0.00 1.00 0.00] [150.00 0.00 0.00 1.00]) 30 (visible rect 0.00, 0.00 200.00 x 200.00) 25 31 ) 26 32 (GraphicsLayer … … 28 34 (contentsOpaque 1) 29 35 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [400.00 0.00 0.00 1.00]) 36 (visible rect 0.00, 0.00 100.00 x 200.00) 30 37 ) 31 38 ) -
trunk/LayoutTests/compositing/visible-rect/3d-transform-style-expected.txt
r155977 r155994 1 1 (GraphicsLayer 2 2 (bounds 800.00 600.00) 3 (visible rect 0.00, 0.00 800.00 x 600.00) 3 4 (children 1 4 5 (GraphicsLayer 5 6 (bounds 800.00 600.00) 6 7 (contentsOpaque 1) 8 (visible rect 0.00, 0.00 800.00 x 600.00) 7 9 (children 2 8 10 (GraphicsLayer 9 11 (position 18.00 10.00) 10 12 (bounds 204.00 204.00) 13 (visible rect 0.00, 0.00 204.00 x 204.00) 11 14 (children 1 12 15 (GraphicsLayer … … 14 17 (bounds 200.00 200.00) 15 18 (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.07 0.07 1.00 -0.00] [0.00 0.00 0.00 1.00]) 19 (visible rect 0.00, 0.00 200.00 x 200.00) 16 20 (children 1 17 21 (GraphicsLayer 18 22 (bounds 200.00 0.00) 19 23 (preserves3D 1) 24 (visible rect 0.00, 0.00 0.00 x 0.00) 20 25 (children 1 21 26 (GraphicsLayer … … 23 28 (contentsOpaque 1) 24 29 (transform [1.00 0.00 0.00 0.00] [0.00 0.91 0.42 0.00] [0.00 -0.42 0.91 0.00] [0.00 0.00 0.00 1.00]) 30 (visible rect 0.00, 0.00 213.67 x 200.68) 25 31 ) 26 32 ) … … 33 39 (position 18.00 224.00) 34 40 (bounds 204.00 204.00) 41 (visible rect 0.00, 0.00 204.00 x 204.00) 35 42 (children 1 36 43 (GraphicsLayer … … 38 45 (bounds 200.00 200.00) 39 46 (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.07 0.07 1.00 -0.00] [0.00 0.00 0.00 1.00]) 47 (visible rect 0.00, 0.00 200.00 x 200.00) 40 48 (children 1 41 49 (GraphicsLayer 42 50 (bounds 200.00 0.00) 43 51 (preserves3D 1) 52 (visible rect 0.00, 0.00 0.00 x 0.00) 44 53 (children 1 45 54 (GraphicsLayer … … 47 56 (contentsOpaque 1) 48 57 (transform [0.91 0.00 0.42 0.00] [0.00 1.00 0.00 0.00] [-0.42 0.00 0.91 0.00] [0.00 0.00 0.00 1.00]) 58 (visible rect 0.00, 0.00 200.68 x 213.67) 49 59 ) 50 60 ) -
trunk/LayoutTests/compositing/visible-rect/3d-transformed-expected.txt
r155977 r155994 1 1 (GraphicsLayer 2 2 (bounds 800.00 600.00) 3 (visible rect 0.00, 0.00 800.00 x 600.00) 3 4 (children 1 4 5 (GraphicsLayer 5 6 (bounds 800.00 600.00) 6 7 (contentsOpaque 1) 8 (visible rect 0.00, 0.00 800.00 x 600.00) 7 9 (children 2 8 10 (GraphicsLayer 9 11 (position 18.00 10.00) 10 12 (bounds 204.00 204.00) 13 (visible rect 0.00, 0.00 204.00 x 204.00) 11 14 (children 1 12 15 (GraphicsLayer … … 14 17 (bounds 200.00 200.00) 15 18 (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.07 0.07 1.00 -0.00] [0.00 0.00 0.00 1.00]) 19 (visible rect 0.00, 0.00 200.00 x 200.00) 16 20 (children 1 17 21 (GraphicsLayer … … 20 24 (contentsOpaque 1) 21 25 (transform [1.00 0.00 0.00 0.00] [0.00 0.71 0.71 0.00] [0.00 -0.71 0.71 0.00] [0.00 0.00 0.00 1.00]) 26 (visible rect 0.00, 0.00 220.62 x 218.46) 22 27 ) 23 28 ) … … 28 33 (position 18.00 224.00) 29 34 (bounds 204.00 204.00) 35 (visible rect 0.00, 0.00 204.00 x 204.00) 30 36 (children 1 31 37 (GraphicsLayer … … 33 39 (bounds 200.00 200.00) 34 40 (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.07 0.07 1.00 -0.00] [0.00 0.00 0.00 1.00]) 41 (visible rect 0.00, 0.00 200.00 x 200.00) 35 42 (children 1 36 43 (GraphicsLayer … … 39 46 (contentsOpaque 1) 40 47 (transform [0.71 0.00 0.71 0.00] [0.00 1.00 0.00 0.00] [-0.71 0.00 0.71 0.00] [0.00 0.00 0.00 1.00]) 48 (visible rect 0.00, 0.00 218.46 x 220.62) 41 49 ) 42 50 ) -
trunk/LayoutTests/compositing/visible-rect/animated-expected.txt
r155977 r155994 1 1 (GraphicsLayer 2 2 (bounds 800.00 600.00) 3 (visible rect 0.00, 0.00 800.00 x 600.00) 3 4 (children 1 4 5 (GraphicsLayer 5 6 (bounds 800.00 600.00) 6 7 (contentsOpaque 1) 8 (visible rect 0.00, 0.00 800.00 x 600.00) 7 9 (children 1 8 10 (GraphicsLayer 9 11 (position 8.00 8.00) 10 12 (bounds 502.00 202.00) 13 (visible rect 0.00, 0.00 502.00 x 202.00) 11 14 (children 1 12 15 (GraphicsLayer 13 16 (position 1.00 1.00) 14 17 (bounds 500.00 200.00) 18 (visible rect 0.00, 0.00 500.00 x 200.00) 15 19 (children 1 16 20 (GraphicsLayer … … 18 22 (contentsOpaque 1) 19 23 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [-100.00 0.00 0.00 1.00]) 24 (visible rect 100.00, 0.00 100.00 x 200.00) 20 25 ) 21 26 ) -
trunk/LayoutTests/compositing/visible-rect/animated-from-none-expected.txt
r155977 r155994 1 1 (GraphicsLayer 2 2 (bounds 800.00 600.00) 3 (visible rect 0.00, 0.00 800.00 x 600.00) 3 4 (children 1 4 5 (GraphicsLayer 5 6 (bounds 800.00 600.00) 6 7 (contentsOpaque 1) 8 (visible rect 0.00, 0.00 800.00 x 600.00) 7 9 (children 1 8 10 (GraphicsLayer 9 11 (position 8.00 8.00) 10 12 (bounds 502.00 202.00) 13 (visible rect 0.00, 0.00 502.00 x 202.00) 11 14 (children 1 12 15 (GraphicsLayer 13 16 (position 1.00 1.00) 14 17 (bounds 500.00 200.00) 18 (visible rect 0.00, 0.00 500.00 x 200.00) 15 19 (children 1 16 20 (GraphicsLayer … … 18 22 (bounds 200.00 200.00) 19 23 (contentsOpaque 1) 24 (visible rect 100.00, 0.00 100.00 x 200.00) 20 25 ) 21 26 ) -
trunk/LayoutTests/compositing/visible-rect/clipped-by-viewport-expected.txt
r155977 r155994 1 1 (GraphicsLayer 2 2 (bounds 800.00 600.00) 3 (visible rect 0.00, 0.00 800.00 x 600.00) 3 4 (children 1 4 5 (GraphicsLayer 5 6 (bounds 800.00 600.00) 6 7 (contentsOpaque 1) 8 (visible rect 0.00, 0.00 800.00 x 600.00) 7 9 (children 2 8 10 (GraphicsLayer … … 11 13 (contentsOpaque 1) 12 14 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00]) 15 (visible rect 100.00, 120.00 100.00 x 80.00) 13 16 ) 14 17 (GraphicsLayer … … 17 20 (contentsOpaque 1) 18 21 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00]) 22 (visible rect 100.00, 0.00 100.00 x 200.00) 19 23 ) 20 24 ) -
trunk/LayoutTests/compositing/visible-rect/clipped-visible-rect-expected.txt
r155977 r155994 1 1 (GraphicsLayer 2 2 (bounds 800.00 600.00) 3 (visible rect 0.00, 0.00 800.00 x 600.00) 3 4 (children 1 4 5 (GraphicsLayer 5 6 (bounds 800.00 600.00) 6 7 (contentsOpaque 1) 8 (visible rect 0.00, 0.00 800.00 x 600.00) 7 9 (children 1 8 10 (GraphicsLayer 9 11 (position 8.00 8.00) 10 12 (bounds 502.00 202.00) 13 (visible rect 0.00, 0.00 502.00 x 202.00) 11 14 (children 1 12 15 (GraphicsLayer 13 16 (position 1.00 1.00) 14 17 (bounds 500.00 200.00) 18 (visible rect 0.00, 0.00 500.00 x 200.00) 15 19 (children 3 16 20 (GraphicsLayer … … 19 23 (contentsOpaque 1) 20 24 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00]) 25 (visible rect 100.00, 0.00 100.00 x 200.00) 21 26 ) 22 27 (GraphicsLayer … … 25 30 (contentsOpaque 1) 26 31 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00]) 32 (visible rect 0.00, 0.00 200.00 x 200.00) 27 33 ) 28 34 (GraphicsLayer … … 31 37 (contentsOpaque 1) 32 38 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00]) 39 (visible rect 0.00, 0.00 100.00 x 200.00) 33 40 ) 34 41 ) -
trunk/LayoutTests/compositing/visible-rect/flipped-preserve-3d-expected.txt
r155977 r155994 7 7 (GraphicsLayer 8 8 (bounds 785.00 615.00) 9 (visible rect 0.00, 0.00 785.00 x 600.00) 9 10 (children 1 10 11 (GraphicsLayer 11 12 (bounds 785.00 615.00) 12 13 (contentsOpaque 1) 14 (visible rect 0.00, 0.00 785.00 x 600.00) 13 15 (children 1 14 16 (GraphicsLayer … … 16 18 (bounds 602.00 602.00) 17 19 (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00]) 20 (visible rect 0.00, 0.00 602.00 x 587.00) 18 21 (children 1 19 22 (GraphicsLayer … … 23 26 (preserves3D 1) 24 27 (transform [-1.00 0.00 -0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 -1.00 0.00] [0.00 0.00 0.00 1.00]) 28 (visible rect 0.00, 0.00 440.00 x 440.00) 25 29 (children 1 26 30 (GraphicsLayer … … 28 32 (contentsOpaque 1) 29 33 (transform [-1.00 0.00 -0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 -1.00 0.00] [0.00 0.00 0.00 1.00]) 34 (visible rect 0.00, 0.00 420.00 x 420.00) 30 35 (children 1 31 36 (GraphicsLayer 32 37 (bounds 420.00 420.00) 38 (visible rect 0.00, 0.00 420.00 x 420.00) 33 39 (children 1 34 40 (GraphicsLayer … … 36 42 (bounds 418.00 510.00) 37 43 (contentsOpaque 1) 44 (visible rect 0.00, 90.00 418.00 x 420.00) 38 45 (children 1 39 46 (GraphicsLayer 40 47 (bounds 418.00 510.00) 48 (visible rect 0.00, 90.00 418.00 x 420.00) 41 49 (children 3 42 50 (GraphicsLayer … … 46 54 (usingTiledLayer 1) 47 55 (drawsContent 1) 56 (visible rect 3000.00, 90.00 418.00 x 30.00) 48 57 ) 49 58 (GraphicsLayer … … 53 62 (usingTiledLayer 1) 54 63 (drawsContent 1) 64 (visible rect 3000.00, 0.00 418.00 x 120.00) 55 65 ) 56 66 (GraphicsLayer … … 60 70 (usingTiledLayer 1) 61 71 (drawsContent 1) 72 (visible rect 3000.00, 0.00 418.00 x 120.00) 62 73 ) 63 74 ) -
trunk/LayoutTests/compositing/visible-rect/iframe-and-layers-expected.txt
r155977 r155994 2 2 (GraphicsLayer 3 3 (bounds 1508.00 1516.00) 4 (visible rect 0.00, 0.00 785.00 x 585.00) 4 5 (children 1 5 6 (GraphicsLayer 6 7 (bounds 1508.00 1516.00) 7 8 (contentsOpaque 1) 9 (visible rect 0.00, 0.00 785.00 x 585.00) 8 10 (children 2 9 11 (GraphicsLayer … … 11 13 (bounds 360.00 210.00) 12 14 (drawsContent 1) 15 (visible rect 0.00, 0.00 360.00 x 210.00) 13 16 (children 1 14 17 (GraphicsLayer 15 18 (position 30.00 30.00) 19 (visible rect 0.00, 0.00 0.00 x 0.00) 16 20 (children 1 17 21 (GraphicsLayer 18 22 (bounds 285.00 135.00) 23 (visible rect 0.00, 0.00 285.00 x 135.00) 19 24 (children 1 20 25 (GraphicsLayer 26 (visible rect 0.00, 0.00 0.00 x 0.00) 21 27 (children 1 22 28 (GraphicsLayer 23 29 (bounds 1508.00 1516.00) 30 (visible rect 0.00, 0.00 285.00 x 135.00) 24 31 (children 1 25 32 (GraphicsLayer 26 33 (bounds 1508.00 1516.00) 27 34 (drawsContent 1) 35 (visible rect 0.00, 0.00 285.00 x 135.00) 28 36 (children 1 29 37 (GraphicsLayer … … 33 41 (drawsContent 1) 34 42 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00]) 43 (visible rect 0.00, 0.00 100.00 x 127.00) 35 44 ) 36 45 ) … … 51 60 (contentsOpaque 1) 52 61 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00]) 62 (visible rect 0.00, 0.00 200.00 x 200.00) 53 63 ) 54 64 ) -
trunk/LayoutTests/compositing/visible-rect/nested-transform-expected.txt
r155977 r155994 1 1 (GraphicsLayer 2 2 (bounds 785.00 669.00) 3 (visible rect 0.00, 0.00 785.00 x 600.00) 3 4 (children 1 4 5 (GraphicsLayer 5 6 (bounds 785.00 669.00) 6 7 (contentsOpaque 1) 8 (visible rect 0.00, 0.00 785.00 x 600.00) 7 9 (children 2 8 10 (GraphicsLayer 9 11 (position 18.00 10.00) 10 12 (bounds 304.00 304.00) 13 (visible rect 0.00, 0.00 304.00 x 304.00) 11 14 (children 1 12 15 (GraphicsLayer … … 14 17 (bounds 300.00 300.00) 15 18 (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.26 0.26 1.00 -0.00] [0.00 0.00 0.00 1.00]) 19 (visible rect 0.00, 0.00 300.00 x 300.00) 16 20 (children 1 17 21 (GraphicsLayer … … 19 23 (preserves3D 1) 20 24 (transform [0.94 0.00 -0.34 0.00] [0.00 1.00 0.00 0.00] [0.34 0.00 0.94 0.00] [0.00 0.00 0.00 1.00]) 25 (visible rect 0.00, 0.00 0.00 x 0.00) 21 26 (children 1 22 27 (GraphicsLayer … … 24 29 (preserves3D 1) 25 30 (transform [0.94 0.00 -0.34 0.00] [0.00 1.00 0.00 0.00] [0.34 0.00 0.94 0.00] [0.00 0.00 0.00 1.00]) 31 (visible rect 0.00, 0.00 0.00 x 0.00) 26 32 (children 1 27 33 (GraphicsLayer … … 29 35 (contentsOpaque 1) 30 36 (transform [1.00 0.00 0.00 0.00] [0.00 0.82 0.57 0.00] [0.00 -0.57 0.82 0.00] [0.00 0.00 0.00 1.00]) 37 (visible rect 0.00, 0.00 500.00 x 369.91) 31 38 ) 32 39 ) … … 41 48 (position 18.00 324.00) 42 49 (bounds 304.00 304.00) 50 (visible rect 0.00, 0.00 304.00 x 276.00) 43 51 (children 1 44 52 (GraphicsLayer … … 46 54 (bounds 300.00 300.00) 47 55 (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.26 0.26 1.00 -0.00] [0.00 0.00 0.00 1.00]) 56 (visible rect 0.00, 0.00 300.00 x 274.00) 48 57 (children 1 49 58 (GraphicsLayer 50 59 (bounds 300.00 0.00) 51 60 (preserves3D 1) 61 (visible rect 0.00, 0.00 0.00 x 0.00) 52 62 (children 1 53 63 (GraphicsLayer … … 55 65 (preserves3D 1) 56 66 (transform [0.77 0.00 -0.64 0.00] [0.00 1.00 0.00 0.00] [0.64 0.00 0.77 0.00] [0.00 0.00 0.00 1.00]) 67 (visible rect 0.00, 0.00 0.00 x 0.00) 57 68 (children 1 58 69 (GraphicsLayer … … 60 71 (contentsOpaque 1) 61 72 (transform [1.00 0.00 0.00 0.00] [0.00 0.82 0.57 0.00] [0.00 -0.57 0.82 0.00] [0.00 0.00 0.00 1.00]) 73 (visible rect 0.00, 0.00 500.00 x 351.87) 62 74 ) 63 75 ) -
trunk/LayoutTests/compositing/visible-rect/scrolled-expected.txt
r155977 r155994 1 1 (GraphicsLayer 2 2 (bounds 1508.00 2008.00) 3 (visible rect 25.00, 200.00 785.00 x 585.00) 3 4 (children 1 4 5 (GraphicsLayer 5 6 (bounds 1508.00 2008.00) 6 7 (contentsOpaque 1) 8 (visible rect 25.00, 200.00 785.00 x 585.00) 7 9 (children 1 8 10 (GraphicsLayer … … 11 13 (contentsOpaque 1) 12 14 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00]) 15 (visible rect 17.00, 200.00 183.00 x 300.00) 13 16 ) 14 17 ) -
trunk/LayoutTests/platform/mac/compositing/tiling/rotated-tiled-clamped-expected.txt
r155977 r155994 2 2 (bounds 800.00 600.00) 3 3 (visible rect 0.00, 0.00 800.00 x 600.00) 4 (contentsScale 1.00)5 4 (children 1 6 5 (GraphicsLayer … … 8 7 (contentsOpaque 1) 9 8 (visible rect 0.00, 0.00 800.00 x 600.00) 10 (contentsScale 1.00)11 9 (children 1 12 10 (GraphicsLayer … … 14 12 (bounds 502.00 302.00) 15 13 (visible rect 0.00, 0.00 502.00 x 302.00) 16 (contentsScale 1.00)17 14 (children 1 18 15 (GraphicsLayer … … 21 18 (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00]) 22 19 (visible rect 0.00, 0.00 500.00 x 300.00) 23 (contentsScale 1.00)24 20 (children 1 25 21 (GraphicsLayer … … 32 28 (transform [0.17 0.00 -0.98 0.00] [0.00 1.00 0.00 0.00] [0.98 0.00 0.17 0.00] [0.00 0.00 0.00 1.00]) 33 29 (visible rect 0.00, 0.00 2800.00 x 300.00) 34 (contentsScale 1.00) 35 (tile cache coverage 0, 0 2799 x 299) 30 (tile cache coverage 0, 0 2800 x 300) 36 31 (tile size 512 x 512) 37 (top left tile 0, 0 tiles grid 5x 1)32 (top left tile 0, 0 tiles grid 6 x 1) 38 33 ) 39 34 ) -
trunk/LayoutTests/platform/mac/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt
r155977 r155994 2 2 (bounds 800.00 600.00) 3 3 (visible rect 0.00, 0.00 800.00 x 600.00) 4 (contentsScale 1.00)5 4 (children 1 6 5 (GraphicsLayer … … 8 7 (contentsOpaque 1) 9 8 (visible rect 0.00, 0.00 800.00 x 600.00) 10 (contentsScale 1.00)11 9 (children 1 12 10 (GraphicsLayer … … 14 12 (bounds 502.00 302.00) 15 13 (visible rect 0.00, 0.00 502.00 x 302.00) 16 (contentsScale 1.00)17 14 (children 1 18 15 (GraphicsLayer … … 21 18 (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00]) 22 19 (visible rect 0.00, 0.00 500.00 x 300.00) 23 (contentsScale 1.00)24 20 (children 1 25 21 (GraphicsLayer … … 27 23 (preserves3D 1) 28 24 (visible rect 0.00, 0.00 0.00 x 0.00) 29 (contentsScale 1.00)30 25 (children 1 31 26 (GraphicsLayer … … 38 33 (transform [0.17 0.00 -0.98 0.00] [0.00 1.00 0.00 0.00] [0.98 0.00 0.17 0.00] [0.00 0.00 0.00 1.00]) 39 34 (visible rect 0.00, 0.00 2800.00 x 300.00) 40 (contentsScale 1.00) 41 (tile cache coverage 0, 0 2799 x 299) 35 (tile cache coverage 0, 0 2800 x 300) 42 36 (tile size 512 x 512) 43 (top left tile 0, 0 tiles grid 5x 1)37 (top left tile 0, 0 tiles grid 6 x 1) 44 38 ) 45 39 ) -
trunk/LayoutTests/platform/mac/compositing/tiling/tile-cache-zoomed-expected.txt
r155977 r155994 2 2 (bounds 1932.00 4150.00) 3 3 (visible rect 0.00, 0.00 785.00 x 585.00) 4 (contentsScale 1.00)5 4 (children 1 6 5 (GraphicsLayer … … 10 9 (transform [1.60 0.00 0.00 0.00] [0.00 1.60 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00]) 11 10 (visible rect 0.00, 0.00 490.63 x 365.63) 12 (contentsScale 2.56)13 11 (children 1 14 12 (GraphicsLayer … … 18 16 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00]) 19 17 (visible rect 0.00, 0.00 482.63 x 357.63) 20 (contentsScale 2.56)21 18 ) 22 19 ) -
trunk/LayoutTests/platform/mac/compositing/visible-rect/iframe-no-layers-expected.txt
r155977 r155994 3 3 (bounds 1508.00 1516.00) 4 4 (visible rect 0.00, 0.00 285.00 x 135.00) 5 (contentsScale 1.00)6 5 (children 1 7 6 (GraphicsLayer 8 7 (bounds 1508.00 1516.00) 9 8 (visible rect 0.00, 0.00 285.00 x 135.00) 10 (contentsScale 1.00)11 9 (children 1 12 10 (GraphicsLayer … … 17 15 (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00]) 18 16 (visible rect 0.00, 0.00 100.00 x 127.00) 19 (contentsScale 1.00)20 17 ) 21 18 ) -
trunk/Source/WebCore/ChangeLog
r155992 r155994 1 2013-09-17 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r155977. 4 http://trac.webkit.org/changeset/155977 5 https://bugs.webkit.org/show_bug.cgi?id=121515 6 7 Broke over a dozen tests on Mac WK2 (Requested by ap on 8 #webkit). 9 10 * platform/graphics/ca/GraphicsLayerCA.cpp: 11 (WebCore::GraphicsLayerCA::GraphicsLayerCA): 12 (WebCore::GraphicsLayerCA::flushCompositingState): 13 (WebCore::GraphicsLayerCA::computeVisibleRect): 14 (WebCore::GraphicsLayerCA::recursiveCommitChanges): 15 (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): 16 (WebCore::GraphicsLayerCA::updateAnimations): 17 (WebCore::GraphicsLayerCA::setAnimationOnLayer): 18 (WebCore::GraphicsLayerCA::appendToUncommittedAnimations): 19 (WebCore::GraphicsLayerCA::setTransformAnimationEndpoints): 20 (WebCore::GraphicsLayerCA::setTransformAnimationKeyframes): 21 (WebCore::GraphicsLayerCA::updateContentsScale): 22 (WebCore::GraphicsLayerCA::dumpAdditionalProperties): 23 * platform/graphics/ca/GraphicsLayerCA.h: 24 (WebCore::GraphicsLayerCA::LayerPropertyAnimation::LayerPropertyAnimation): 25 1 26 2013-09-17 Eric Carlson <eric.carlson@apple.com> 2 27 -
trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
r155977 r155994 251 251 } 252 252 253 static float maxScaleFromTransform(const TransformationMatrix& t)254 {255 if (t.isIdentityOrTranslation())256 return 1;257 258 TransformationMatrix::DecomposedType decomposeData;259 t.decompose(decomposeData);260 return std::max(fabsf(decomposeData.scaleX), fabsf(decomposeData.scaleY));261 }262 263 253 #if ENABLE(CSS_FILTERS) || !ASSERT_DISABLED 264 254 static inline bool supportsAcceleratedFilterAnimations() … … 286 276 , m_allowTiledLayer(true) 287 277 , m_isPageTiledBackingLayer(false) 288 , m_rootRelativeScaleFactor(1)289 278 , m_uncommittedChanges(0) 290 279 { … … 918 907 { 919 908 TransformState state(TransformState::UnapplyInverseTransformDirection, FloatQuad(clipRect)); 920 TransformationMatrix rootRelativeTransform; 921 recursiveCommitChanges(CommitState(), state, rootRelativeTransform); 909 recursiveCommitChanges(CommitState(), state); 922 910 } 923 911 … … 987 975 } 988 976 989 TransformationMatrix GraphicsLayerCA::layerTransform(const FloatPoint& position, const TransformationMatrix* customTransform) const 990 { 991 TransformationMatrix transform; 992 transform.translate(position.x(), position.y()); 993 994 TransformationMatrix currentTransform = customTransform ? *customTransform : m_transform; 977 FloatRect GraphicsLayerCA::computeVisibleRect(TransformState& state, ComputeVisibleRectFlags flags) const 978 { 979 bool preserve3D = preserves3D() || (parent() ? parent()->preserves3D() : false); 980 TransformState::TransformAccumulation accumulation = preserve3D ? TransformState::AccumulateTransform : TransformState::FlattenTransform; 981 982 TransformationMatrix layerTransform; 983 FloatPoint position = m_position; 984 if (client()) 985 client()->customPositionForVisibleRectComputation(this, position); 986 987 layerTransform.translate(position.x(), position.y()); 988 989 TransformationMatrix currentTransform; 990 if (!(flags & RespectAnimatingTransforms) || !client() || !client()->getCurrentTransform(this, currentTransform)) 991 currentTransform = m_transform; 995 992 996 993 if (!currentTransform.isIdentity()) { 997 994 FloatPoint3D absoluteAnchorPoint(anchorPoint()); 998 995 absoluteAnchorPoint.scale(size().width(), size().height(), 1); 999 transform.translate3d(absoluteAnchorPoint.x(), absoluteAnchorPoint.y(), absoluteAnchorPoint.z());1000 transform.multiply(currentTransform);1001 transform.translate3d(-absoluteAnchorPoint.x(), -absoluteAnchorPoint.y(), -absoluteAnchorPoint.z());996 layerTransform.translate3d(absoluteAnchorPoint.x(), absoluteAnchorPoint.y(), absoluteAnchorPoint.z()); 997 layerTransform.multiply(currentTransform); 998 layerTransform.translate3d(-absoluteAnchorPoint.x(), -absoluteAnchorPoint.y(), -absoluteAnchorPoint.z()); 1002 999 } 1003 1000 … … 1007 1004 parentAnchorPoint.scale(parentLayer->size().width(), parentLayer->size().height(), 1); 1008 1005 1009 transform.translateRight3d(-parentAnchorPoint.x(), -parentAnchorPoint.y(), -parentAnchorPoint.z()); 1010 transform = parentLayer->childrenTransform() * transform; 1011 transform.translateRight3d(parentAnchorPoint.x(), parentAnchorPoint.y(), parentAnchorPoint.z()); 1012 } 1013 } 1014 1015 return transform; 1016 } 1017 1018 FloatRect GraphicsLayerCA::computeVisibleRect(TransformState& state, ComputeVisibleRectFlags flags) const 1019 { 1020 bool preserve3D = preserves3D() || (parent() ? parent()->preserves3D() : false); 1021 TransformState::TransformAccumulation accumulation = preserve3D ? TransformState::AccumulateTransform : TransformState::FlattenTransform; 1022 1023 FloatPoint position = m_position; 1024 if (client()) 1025 client()->customPositionForVisibleRectComputation(this, position); 1026 1027 TransformationMatrix layerTransform; 1028 TransformationMatrix currentTransform; 1029 if ((flags & RespectAnimatingTransforms) && client() && client()->getCurrentTransform(this, currentTransform)) 1030 layerTransform = this->layerTransform(position, ¤tTransform); 1031 else 1032 layerTransform = this->layerTransform(position); 1006 layerTransform.translateRight3d(-parentAnchorPoint.x(), -parentAnchorPoint.y(), -parentAnchorPoint.z()); 1007 layerTransform = parentLayer->childrenTransform() * layerTransform; 1008 layerTransform.translateRight3d(parentAnchorPoint.x(), parentAnchorPoint.y(), parentAnchorPoint.z()); 1009 } 1010 } 1033 1011 1034 1012 bool applyWasClamped; 1035 1013 state.applyTransform(layerTransform, accumulation, &applyWasClamped); 1036 1014 1037 1015 bool mapWasClamped; 1038 1016 FloatRect clipRectForChildren = state.mappedQuad(&mapWasClamped).boundingBox(); … … 1053 1031 } 1054 1032 1055 void GraphicsLayerCA::updateRootRelativeScale(TransformationMatrix* transformFromRoot) 1056 { 1057 if (!transformFromRoot) 1058 return; 1059 1060 float rootRelativeScaleFactor; 1061 TransformationMatrix maxScaleImpactTransform; 1062 bool haveTransformAnimation = getTransformFromAnimationsWithMaxScaleImpact(*transformFromRoot, maxScaleImpactTransform, rootRelativeScaleFactor); 1063 if (haveTransformAnimation) 1064 transformFromRoot->multiply(maxScaleImpactTransform); 1065 else { 1066 TransformationMatrix unanimatedTransform = this->layerTransform(m_position); 1067 transformFromRoot->multiply(unanimatedTransform); 1068 rootRelativeScaleFactor = maxScaleFromTransform(*transformFromRoot); 1069 } 1070 1071 if (rootRelativeScaleFactor != m_rootRelativeScaleFactor) { 1072 m_rootRelativeScaleFactor = rootRelativeScaleFactor; 1073 m_uncommittedChanges |= ContentsScaleChanged; 1074 } 1075 } 1076 1077 // rootRelativeTransformForScaling is a transform from the root, but for layers with transform animations, it cherry-picked the state of the 1078 // animation that contributes maximally to the scale (on every layer with animations down the hierarchy). 1079 void GraphicsLayerCA::recursiveCommitChanges(const CommitState& commitState, const TransformState& state, const TransformationMatrix& rootRelativeTransformForScaling, float pageScaleFactor, const FloatPoint& positionRelativeToBase, bool affectedByPageScale) 1033 void GraphicsLayerCA::recursiveCommitChanges(const CommitState& commitState, const TransformState& state, float pageScaleFactor, const FloatPoint& positionRelativeToBase, bool affectedByPageScale) 1080 1034 { 1081 1035 TransformState localState = state; … … 1123 1077 baseRelativePosition += m_position; 1124 1078 1125 TransformationMatrix transformFromRoot = rootRelativeTransformForScaling; 1126 commitLayerChangesBeforeSublayers(childCommitState, pageScaleFactor, baseRelativePosition, oldVisibleRect, &transformFromRoot); 1079 commitLayerChangesBeforeSublayers(childCommitState, pageScaleFactor, baseRelativePosition, oldVisibleRect); 1127 1080 1128 1081 if (isRunningTransformAnimation()) { … … 1141 1094 for (size_t i = 0; i < numChildren; ++i) { 1142 1095 GraphicsLayerCA* curChild = static_cast<GraphicsLayerCA*>(childLayers[i]); 1143 curChild->recursiveCommitChanges(childCommitState, localState, transformFromRoot,pageScaleFactor, baseRelativePosition, affectedByPageScale);1096 curChild->recursiveCommitChanges(childCommitState, localState, pageScaleFactor, baseRelativePosition, affectedByPageScale); 1144 1097 } 1145 1098 1146 1099 if (m_replicaLayer) 1147 static_cast<GraphicsLayerCA*>(m_replicaLayer)->recursiveCommitChanges(childCommitState, localState, transformFromRoot,pageScaleFactor, baseRelativePosition, affectedByPageScale);1100 static_cast<GraphicsLayerCA*>(m_replicaLayer)->recursiveCommitChanges(childCommitState, localState, pageScaleFactor, baseRelativePosition, affectedByPageScale); 1148 1101 1149 1102 if (m_maskLayer) … … 1189 1142 } 1190 1143 1191 void GraphicsLayerCA::commitLayerChangesBeforeSublayers(CommitState& commitState, float pageScaleFactor, const FloatPoint& positionRelativeToBase, const FloatRect& oldVisibleRect , TransformationMatrix* transformFromRoot)1144 void GraphicsLayerCA::commitLayerChangesBeforeSublayers(CommitState& commitState, float pageScaleFactor, const FloatPoint& positionRelativeToBase, const FloatRect& oldVisibleRect) 1192 1145 { 1193 1146 ++commitState.treeDepth; … … 1262 1215 if (m_uncommittedChanges & AnimationChanged) 1263 1216 updateAnimations(); 1264 1265 // After committing animations, see if we need to adjust contentsScale accordingly.1266 updateRootRelativeScale(transformFromRoot);1267 1217 1268 1218 // Updating the contents scale can cause parts of the layer to be invalidated, … … 1976 1926 void GraphicsLayerCA::updateAnimations() 1977 1927 { 1978 HashSet<String> finishedAnimations;1979 1980 1928 if (m_animationsToProcess.size()) { 1981 1929 AnimationsToProcessMap::const_iterator end = m_animationsToProcess.end(); … … 2000 1948 } 2001 1949 2002 if (processingInfo.action == Remove) {1950 if (processingInfo.action == Remove) 2003 1951 m_runningAnimations.remove(currAnimationName); 2004 finishedAnimations.add(currAnimationName);2005 }2006 1952 } 2007 1953 … … 2020 1966 animations.append(pendingAnimation); 2021 1967 m_runningAnimations.add(pendingAnimation.m_name, animations); 2022 2023 1968 } else { 2024 1969 Vector<LayerPropertyAnimation>& animations = it->value; 2025 1970 animations.append(pendingAnimation); 2026 1971 } 2027 2028 finishedAnimations.remove(pendingAnimation.m_name); 2029 } 1972 } 1973 2030 1974 m_uncomittedAnimations.clear(); 2031 1975 } 2032 2033 HashSet<String>::const_iterator end = finishedAnimations.end();2034 for (HashSet<String>::const_iterator it = finishedAnimations.begin(); it != end; ++it)2035 m_animationTransforms.remove(*it);2036 1976 } 2037 1977 … … 2054 1994 { 2055 1995 PlatformCALayer* layer = animatedLayer(property); 2056 1996 2057 1997 if (timeOffset) 2058 1998 caAnim->setBeginTime(CACurrentMediaTime() - timeOffset); … … 2197 2137 2198 2138 RefPtr<PlatformCAAnimation> caAnimation; 2199 Vector<TransformationMatrix> matrices;2200 2139 bool validMatrices = true; 2201 2140 if (isKeyframe) { 2202 2141 caAnimation = createKeyframeAnimation(animation, propertyIdToString(valueList.property()), additive); 2203 validMatrices = setTransformAnimationKeyframes(valueList, animation, caAnimation.get(), animationIndex, transformOp, isMatrixAnimation, boxSize , matrices);2142 validMatrices = setTransformAnimationKeyframes(valueList, animation, caAnimation.get(), animationIndex, transformOp, isMatrixAnimation, boxSize); 2204 2143 } else { 2205 2144 caAnimation = createBasicAnimation(animation, propertyIdToString(valueList.property()), additive); 2206 validMatrices = setTransformAnimationEndpoints(valueList, animation, caAnimation.get(), animationIndex, transformOp, isMatrixAnimation, boxSize , matrices);2145 validMatrices = setTransformAnimationEndpoints(valueList, animation, caAnimation.get(), animationIndex, transformOp, isMatrixAnimation, boxSize); 2207 2146 } 2208 2147 … … 2210 2149 return false; 2211 2150 2212 m_animationTransforms.set(animationName, matrices);2213 2214 2151 m_uncomittedAnimations.append(LayerPropertyAnimation(caAnimation, animationName, valueList.property(), animationIndex, 0, timeOffset)); 2215 2152 return true; 2216 }2217 2218 bool GraphicsLayerCA::getTransformFromAnimationsWithMaxScaleImpact(const TransformationMatrix& parentTransformFromRoot, TransformationMatrix& maxScaleTransform, float& maxScale) const2219 {2220 maxScale = 1;2221 2222 bool haveTransformAnimation = false;2223 AnimationsMap::const_iterator end = m_runningAnimations.end();2224 for (AnimationsMap::const_iterator it = m_runningAnimations.begin(); it != end; ++it) {2225 const Vector<LayerPropertyAnimation>& propertyAnimations = it->value;2226 size_t numAnimations = propertyAnimations.size();2227 for (size_t i = 0; i < numAnimations; ++i) {2228 const LayerPropertyAnimation& animation = propertyAnimations[i];2229 if (animation.m_property != AnimatedPropertyWebkitTransform)2230 continue;2231 2232 haveTransformAnimation = true;2233 2234 TransformsMap::const_iterator it = m_animationTransforms.find(animation.m_name);2235 if (it != m_animationTransforms.end()) {2236 const Vector<TransformationMatrix>& matrices = it->value;2237 2238 for (size_t i = 0; i < matrices.size(); ++i) {2239 TransformationMatrix roootRelativeTransformWithAnimation = parentTransformFromRoot;2240 TransformationMatrix layerTransformWithAnimation = layerTransform(m_position, &matrices[i]);2241 2242 roootRelativeTransformWithAnimation.multiply(layerTransformWithAnimation);2243 2244 float rootRelativeScale = maxScaleFromTransform(roootRelativeTransformWithAnimation);2245 if (rootRelativeScale > maxScale) {2246 maxScale = rootRelativeScale;2247 maxScaleTransform = matrices[i];2248 }2249 }2250 }2251 }2252 }2253 2254 return haveTransformAnimation;2255 2153 } 2256 2154 … … 2495 2393 } 2496 2394 2497 bool GraphicsLayerCA::setTransformAnimationEndpoints(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* basicAnim, int functionIndex, TransformOperation::OperationType transformOpType, bool isMatrixAnimation, const IntSize& boxSize , Vector<TransformationMatrix>& matrixes)2395 bool GraphicsLayerCA::setTransformAnimationEndpoints(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* basicAnim, int functionIndex, TransformOperation::OperationType transformOpType, bool isMatrixAnimation, const IntSize& boxSize) 2498 2396 { 2499 2397 ASSERT(valueList.size() == 2); … … 2506 2404 const TransformAnimationValue& startValue = static_cast<const TransformAnimationValue&>(valueList.at(fromIndex)); 2507 2405 const TransformAnimationValue& endValue = static_cast<const TransformAnimationValue&>(valueList.at(toIndex)); 2508 2509 TransformationMatrix fromTransform, toTransform;2510 2406 2511 2407 if (isMatrixAnimation) { 2408 TransformationMatrix fromTransform, toTransform; 2512 2409 startValue.value().apply(boxSize, fromTransform); 2513 2410 endValue.value().apply(boxSize, toTransform); … … 2516 2413 if (!fromTransform.isInvertible() || !toTransform.isInvertible()) 2517 2414 return false; 2415 2416 basicAnim->setFromValue(fromTransform); 2417 basicAnim->setToValue(toTransform); 2518 2418 } else { 2519 2419 if (isTransformTypeNumber(transformOpType)) { … … 2542 2442 basicAnim->setToValue(toValue); 2543 2443 } 2544 2545 startValue.value().apply(boxSize, fromTransform); 2546 endValue.value().apply(boxSize, toTransform); 2547 } 2548 matrixes.append(fromTransform); 2549 matrixes.append(toTransform); 2444 } 2550 2445 2551 2446 // This codepath is used for 2-keyframe animations, so we still need to look in the start … … 2561 2456 } 2562 2457 2563 bool GraphicsLayerCA::setTransformAnimationKeyframes(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* keyframeAnim, int functionIndex, TransformOperation::OperationType transformOpType, bool isMatrixAnimation, const IntSize& boxSize , Vector<TransformationMatrix>& matrixes)2458 bool GraphicsLayerCA::setTransformAnimationKeyframes(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* keyframeAnim, int functionIndex, TransformOperation::OperationType transformOpType, bool isMatrixAnimation, const IntSize& boxSize) 2564 2459 { 2565 2460 Vector<float> keyTimes; … … 2576 2471 keyTimes.append(forwards ? curValue.keyTime() : (1 - curValue.keyTime())); 2577 2472 2578 TransformationMatrix transform;2579 2580 2473 if (isMatrixAnimation) { 2474 TransformationMatrix transform; 2581 2475 curValue.value().apply(boxSize, transform); 2582 2476 … … 2601 2495 transformationMatrixValues.append(value); 2602 2496 } 2603 2604 curValue.value().apply(boxSize, transform); 2605 } 2606 2607 matrixes.append(transform); 2497 } 2608 2498 2609 2499 if (i < (valueList.size() - 1)) … … 2766 2656 void GraphicsLayerCA::updateContentsScale(float pageScaleFactor) 2767 2657 { 2768 float contentsScale = clampedContentsScaleForScale(m_rootRelativeScaleFactor * pageScaleFactor * deviceScaleFactor()); 2658 float contentsScale = clampedContentsScaleForScale(pageScaleFactor * deviceScaleFactor()); 2659 2769 2660 m_layer->setContentsScale(contentsScale); 2770 2661 if (drawsContent()) … … 2814 2705 writeIndent(textStream, indent + 1); 2815 2706 textStream << "(visible rect " << m_visibleRect.x() << ", " << m_visibleRect.y() << " " << m_visibleRect.width() << " x " << m_visibleRect.height() << ")\n"; 2816 2817 writeIndent(textStream, indent + 1);2818 textStream << "(contentsScale " << m_layer->contentsScale() << ")\n";2819 2707 } 2820 2708 -
trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
r155977 r155994 141 141 { } 142 142 }; 143 void recursiveCommitChanges(const CommitState&, const TransformState&, const TransformationMatrix& rootRelativeTransformForScaling,float pageScaleFactor = 1, const FloatPoint& positionRelativeToBase = FloatPoint(), bool affectedByPageScale = false);143 void recursiveCommitChanges(const CommitState&, const TransformState&, float pageScaleFactor = 1, const FloatPoint& positionRelativeToBase = FloatPoint(), bool affectedByPageScale = false); 144 144 145 145 virtual void flushCompositingState(const FloatRect&); … … 214 214 bool setAnimationKeyframes(const KeyframeValueList&, const Animation*, PlatformCAAnimation*); 215 215 216 bool setTransformAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const IntSize& boxSize , Vector<TransformationMatrix>& matrixes);217 bool setTransformAnimationKeyframes(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const IntSize& boxSize , Vector<TransformationMatrix>& matrixes);216 bool setTransformAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const IntSize& boxSize); 217 bool setTransformAnimationKeyframes(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const IntSize& boxSize); 218 218 219 219 #if ENABLE(CSS_FILTERS) … … 229 229 } 230 230 231 void commitLayerChangesBeforeSublayers(CommitState&, float pageScaleFactor, const FloatPoint& positionRelativeToBase, const FloatRect& oldVisibleRect , TransformationMatrix* transformFromRoot = 0);231 void commitLayerChangesBeforeSublayers(CommitState&, float pageScaleFactor, const FloatPoint& positionRelativeToBase, const FloatRect& oldVisibleRect); 232 232 void commitLayerChangesAfterSublayers(CommitState&); 233 233 … … 249 249 void computePixelAlignment(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase, 250 250 FloatPoint& position, FloatSize&, FloatPoint3D& anchorPoint, FloatSize& alignmentOffset) const; 251 252 TransformationMatrix layerTransform(const FloatPoint& position, const TransformationMatrix* customTransform = 0) const;253 void updateRootRelativeScale(TransformationMatrix* transformFromRoot);254 255 251 enum ComputeVisibleRectFlag { RespectAnimatingTransforms = 1 << 0 }; 256 252 typedef unsigned ComputeVisibleRectFlags; … … 378 374 bool appendToUncommittedAnimations(const KeyframeValueList&, const FilterOperation*, const Animation*, const String& animationName, int animationIndex, double timeOffset); 379 375 #endif 380 381 // Returns true if any transform animations are running.382 bool getTransformFromAnimationsWithMaxScaleImpact(const TransformationMatrix& parentTransformFromRoot, TransformationMatrix&, float& maxScale) const;383 376 384 377 enum LayerChange { … … 450 443 bool m_isPageTiledBackingLayer : 1; 451 444 452 float m_rootRelativeScaleFactor;453 454 445 Color m_contentsSolidColor; 455 446 … … 461 452 struct LayerPropertyAnimation { 462 453 LayerPropertyAnimation(PassRefPtr<PlatformCAAnimation> caAnimation, const String& animationName, AnimatedPropertyID property, int index, int subIndex, double timeOffset) 463 464 465 466 467 468 454 : m_animation(caAnimation) 455 , m_name(animationName) 456 , m_property(property) 457 , m_index(index) 458 , m_subIndex(subIndex) 459 , m_timeOffset(timeOffset) 469 460 { } 470 461 … … 497 488 AnimationsMap m_runningAnimations; 498 489 499 // Map from animation key to TransformationMatrices for animations of transform. The vector contains a matrix for500 // the two endpoints, or each keyframe. Used for contentsScale adjustment.501 typedef HashMap<String, Vector<TransformationMatrix> > TransformsMap;502 TransformsMap m_animationTransforms;503 504 490 Vector<FloatRect> m_dirtyRects; 505 491 FloatSize m_pixelAlignmentOffset;
Note: See TracChangeset
for help on using the changeset viewer.