Changeset 166525 in webkit
- Timestamp:
- Mar 31, 2014 2:06:48 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r166513 r166525 1 2014-03-31 Ion Rosca <rosca@adobe.com> 2 3 [CSS Blending] showLayerTree should dump layer's blend mode and isolation properties 4 https://bugs.webkit.org/show_bug.cgi?id=130922 5 6 Reviewed by Simon Fraser. 7 8 Tests are adapted after adding blending information to RenderTreeAsText. 9 10 * platform/mac/css3/compositing/blend-mode-background-expected.txt: 11 * platform/mac/css3/compositing/blend-mode-isolated-group-1-expected.txt: 12 * platform/mac/css3/compositing/blend-mode-isolated-group-2-expected.txt: 13 * platform/mac/css3/compositing/blend-mode-isolated-group-3-expected.txt: 14 * platform/mac/css3/compositing/blend-mode-layers-expected.txt: 15 * platform/mac/css3/compositing/blend-mode-reflection-expected.txt: 16 * platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt: 17 * platform/mac/css3/compositing/blend-mode-simple-expected.txt: 18 1 19 2014-03-31 Samuel White <samuel_white@apple.com> 2 20 -
trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-background-expected.txt
r165970 r166525 4 4 RenderBlock {HTML} at (0,0) size 800x100 5 5 RenderBody {BODY} at (8,20) size 784x60 [bgcolor=#0000FF] 6 layer at (28,20) size 60x60 6 layer at (28,20) size 60x60 blendMode: difference 7 7 RenderBlock {DIV} at (20,0) size 60x60 [bgcolor=#FF0000] -
trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-1-expected.txt
r164579 r166525 4 4 RenderBlock {HTML} at (0,0) size 800x108 5 5 RenderBody {BODY} at (8,8) size 784x0 [bgcolor=#0000FF] 6 layer at (28,28) size 60x60 6 layer at (28,28) size 60x60 isolatesBlending 7 7 RenderBlock (floating) {DIV} at (20,20) size 60x60 [bgcolor=#EE82EE] 8 layer at (48,48) size 60x60 8 layer at (48,48) size 60x60 blendMode: multiply 9 9 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 10 10 layer at (128,28) size 60x60 11 11 RenderBlock (floating) {DIV} at (120,20) size 60x60 [bgcolor=#EE82EE] 12 layer at (148,48) size 60x60 12 layer at (148,48) size 60x60 blendMode: multiply 13 13 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 14 14 layer at (228,28) size 60x60 15 15 RenderBlock (floating) {DIV} at (220,20) size 60x60 [bgcolor=#EE82EE] 16 layer at (248,48) size 60x60 16 layer at (248,48) size 60x60 blendMode: multiply 17 17 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 18 18 layer at (328,28) size 60x60 19 19 RenderBlock (floating) {DIV} at (320,20) size 60x60 [bgcolor=#EE82EE] 20 layer at (348,48) size 60x60 20 layer at (348,48) size 60x60 blendMode: multiply 21 21 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] -
trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-2-expected.txt
r164579 r166525 4 4 RenderBlock {HTML} at (0,0) size 800x108 5 5 RenderBody {BODY} at (8,8) size 784x0 [bgcolor=#0000FF] 6 layer at (28,28) size 60x60 6 layer at (28,28) size 60x60 isolatesBlending 7 7 RenderBlock (floating) {DIV} at (20,20) size 60x60 [bgcolor=#EE82EE] 8 layer at (48,48) size 60x60 8 layer at (48,48) size 60x60 blendMode: multiply 9 9 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 10 10 layer at (128,28) size 60x60 11 11 RenderBlock (floating) {DIV} at (120,20) size 60x60 [bgcolor=#EE82EE] 12 layer at (148,48) size 60x60 12 layer at (148,48) size 60x60 blendMode: multiply 13 13 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 14 14 layer at (228,28) size 60x60 15 15 RenderBlock (floating) {DIV} at (220,20) size 60x60 [bgcolor=#EE82EE] 16 layer at (248,48) size 60x60 16 layer at (248,48) size 60x60 blendMode: multiply 17 17 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 18 18 layer at (328,28) size 60x60 19 19 RenderBlock (floating) {DIV} at (320,20) size 60x60 [bgcolor=#EE82EE] 20 layer at (348,48) size 60x60 20 layer at (348,48) size 60x60 blendMode: multiply 21 21 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] -
trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-isolated-group-3-expected.txt
r164579 r166525 2 2 RenderView at (0,0) size 800x600 3 3 layer at (0,0) size 800x208 layerType: background only 4 layer at (28,28) size 60x60 4 layer at (28,28) size 60x60 isolatesBlending 5 5 RenderBlock (floating) zI: -1 {DIV} at (20,20) size 60x60 [bgcolor=#EE82EE] 6 layer at (48,48) size 60x60 6 layer at (48,48) size 60x60 blendMode: multiply 7 7 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 8 8 layer at (68,68) size 60x60 … … 10 10 layer at (128,28) size 60x60 11 11 RenderBlock (floating) zI: -1 {DIV} at (120,20) size 60x60 [bgcolor=#EE82EE] 12 layer at (148,48) size 60x60 12 layer at (148,48) size 60x60 blendMode: multiply 13 13 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 14 14 layer at (168,68) size 60x60 … … 16 16 layer at (228,28) size 60x60 17 17 RenderBlock (floating) zI: -1 {DIV} at (220,20) size 60x60 [bgcolor=#EE82EE] 18 layer at (248,48) size 60x60 18 layer at (248,48) size 60x60 blendMode: multiply 19 19 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 20 20 layer at (268,68) size 60x60 … … 22 22 layer at (328,28) size 60x60 23 23 RenderBlock (floating) zI: -1 {DIV} at (320,20) size 60x60 [bgcolor=#EE82EE] 24 layer at (348,48) size 60x60 24 layer at (348,48) size 60x60 blendMode: multiply 25 25 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 26 26 layer at (368,68) size 60x60 27 27 RenderBlock (positioned) {DIV} at (20,20) size 60x60 [bgcolor=#FFA500] 28 layer at (428,28) size 60x60 28 layer at (428,28) size 60x60 isolatesBlending 29 29 RenderBlock (floating) zI: -1 {DIV} at (420,20) size 60x60 [bgcolor=#EE82EE] 30 layer at (448,48) size 60x60 30 layer at (448,48) size 60x60 blendMode: multiply 31 31 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 32 32 layer at (468,68) size 60x60 … … 34 34 layer at (528,28) size 60x60 35 35 RenderBlock (floating) zI: -1 {DIV} at (520,20) size 60x60 [bgcolor=#EE82EE] 36 layer at (548,48) size 60x60 36 layer at (548,48) size 60x60 blendMode: multiply 37 37 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 38 38 layer at (568,68) size 60x60 … … 40 40 layer at (628,28) size 60x60 41 41 RenderBlock (floating) zI: -1 {DIV} at (620,20) size 60x60 [bgcolor=#EE82EE] 42 layer at (648,48) size 60x60 42 layer at (648,48) size 60x60 blendMode: multiply 43 43 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 44 44 layer at (668,68) size 60x60 … … 46 46 layer at (28,128) size 60x60 47 47 RenderBlock (floating) zI: -1 {DIV} at (20,120) size 60x60 [bgcolor=#EE82EE] 48 layer at (48,148) size 60x60 48 layer at (48,148) size 60x60 blendMode: multiply 49 49 RenderBlock {DIV} at (20,20) size 60x60 [bgcolor=#008000] 50 50 layer at (68,168) size 60x60 -
trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-layers-expected.txt
r163955 r166525 18 18 layer at (53,41) size 80x150 19 19 RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00] 20 layer at (243,31) size 160x160 20 layer at (243,31) size 160x160 blendMode: multiply 21 21 RenderBlock (relative positioned) {DIV} at (0,0) size 160x160 22 22 layer at (223,41) size 80x150 23 23 RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00] 24 layer at (413,31) size 160x160 24 layer at (413,31) size 160x160 blendMode: multiply 25 25 RenderBlock (relative positioned) {DIV} at (0,0) size 160x160 26 26 layer at (393,41) size 80x150 … … 32 32 layer at (563,41) size 80x150 33 33 RenderBlock (relative positioned) {DIV} at (0,0) size 80x150 [bgcolor=#FFFF00] 34 layer at (53,246) size 160x75 34 layer at (53,246) size 160x75 isolatesBlending 35 35 RenderBlock {DIV} at (0,50) size 160x75 [bgcolor=#00FFFF] 36 layer at (73,206) size 160x160 36 layer at (73,206) size 160x160 blendMode: multiply 37 37 RenderBlock (relative positioned) {DIV} at (0,0) size 160x160 38 38 layer at (53,216) size 80x150 … … 40 40 layer at (223,246) size 160x75 41 41 RenderBlock {DIV} at (0,50) size 160x75 [bgcolor=#00FFFF] 42 layer at (243,206) size 160x160 42 layer at (243,206) size 160x160 blendMode: multiply 43 43 RenderBlock (relative positioned) {DIV} at (0,0) size 160x160 44 44 layer at (223,216) size 80x150 -
trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-reflection-expected.txt
r163955 r166525 8 8 RenderBlock {UL} at (0,0) size 784x0 9 9 RenderBlock (floating) {LI} at (185,5) size 130x260 10 layer at (53,21) size 130x130 10 layer at (53,21) size 130x130 blendMode: multiply 11 11 RenderImage {IMG} at (0,0) size 130x130 12 layer at (193,21) size 130x130 12 layer at (193,21) size 130x130 blendMode: multiply 13 13 RenderImage {IMG} at (0,0) size 130x130 -
trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-composited-expected.txt
r163955 r166525 23 23 layer at (53,21) size 130x130 24 24 RenderImage {IMG} at (0,0) size 130x130 25 layer at (193,21) size 130x130 25 layer at (193,21) size 130x130 blendMode: overlay 26 26 RenderImage {IMG} at (0,0) size 130x130 27 layer at (333,21) size 130x130 27 layer at (333,21) size 130x130 blendMode: screen 28 28 RenderImage {IMG} at (0,0) size 130x130 29 layer at (473,21) size 130x130 29 layer at (473,21) size 130x130 blendMode: overlay 30 30 RenderImage {IMG} at (0,0) size 130x130 31 layer at (613,21) size 130x130 31 layer at (613,21) size 130x130 blendMode: darken 32 32 RenderImage {IMG} at (0,0) size 130x130 33 layer at (53,161) size 130x130 33 layer at (53,161) size 130x130 blendMode: lighten 34 34 RenderImage {IMG} at (0,0) size 130x130 35 layer at (193,161) size 130x130 35 layer at (193,161) size 130x130 blendMode: color-dodge 36 36 RenderImage {IMG} at (0,0) size 130x130 37 layer at (333,161) size 130x130 37 layer at (333,161) size 130x130 blendMode: color-burn 38 38 RenderImage {IMG} at (0,0) size 130x130 39 layer at (473,161) size 130x130 39 layer at (473,161) size 130x130 blendMode: hard-light 40 40 RenderImage {IMG} at (0,0) size 130x130 41 layer at (613,161) size 130x130 41 layer at (613,161) size 130x130 blendMode: soft-light 42 42 RenderImage {IMG} at (0,0) size 130x130 43 layer at (53,301) size 130x130 43 layer at (53,301) size 130x130 blendMode: difference 44 44 RenderImage {IMG} at (0,0) size 130x130 45 layer at (193,301) size 130x130 45 layer at (193,301) size 130x130 blendMode: exclusion 46 46 RenderImage {IMG} at (0,0) size 130x130 47 layer at (333,301) size 130x130 47 layer at (333,301) size 130x130 blendMode: hue 48 48 RenderImage {IMG} at (0,0) size 130x130 49 layer at (473,301) size 130x130 49 layer at (473,301) size 130x130 blendMode: saturation 50 50 RenderImage {IMG} at (0,0) size 130x130 51 layer at (613,301) size 130x130 51 layer at (613,301) size 130x130 blendMode: color 52 52 RenderImage {IMG} at (0,0) size 130x130 53 layer at (53,441) size 130x130 53 layer at (53,441) size 130x130 blendMode: luminosity 54 54 RenderImage {IMG} at (0,0) size 130x130 -
trunk/LayoutTests/platform/mac/css3/compositing/blend-mode-simple-expected.txt
r161628 r166525 22 22 RenderBlock (floating) {LI} at (605,285) size 130x130 23 23 RenderBlock (floating) {LI} at (45,425) size 130x130 24 layer at (193,21) size 130x130 24 layer at (193,21) size 130x130 blendMode: overlay 25 25 RenderImage {IMG} at (0,0) size 130x130 26 layer at (333,21) size 130x130 26 layer at (333,21) size 130x130 blendMode: screen 27 27 RenderImage {IMG} at (0,0) size 130x130 28 layer at (473,21) size 130x130 28 layer at (473,21) size 130x130 blendMode: overlay 29 29 RenderImage {IMG} at (0,0) size 130x130 30 layer at (613,21) size 130x130 30 layer at (613,21) size 130x130 blendMode: darken 31 31 RenderImage {IMG} at (0,0) size 130x130 32 layer at (53,161) size 130x130 32 layer at (53,161) size 130x130 blendMode: lighten 33 33 RenderImage {IMG} at (0,0) size 130x130 34 layer at (193,161) size 130x130 34 layer at (193,161) size 130x130 blendMode: color-dodge 35 35 RenderImage {IMG} at (0,0) size 130x130 36 layer at (333,161) size 130x130 36 layer at (333,161) size 130x130 blendMode: color-burn 37 37 RenderImage {IMG} at (0,0) size 130x130 38 layer at (473,161) size 130x130 38 layer at (473,161) size 130x130 blendMode: hard-light 39 39 RenderImage {IMG} at (0,0) size 130x130 40 layer at (613,161) size 130x130 40 layer at (613,161) size 130x130 blendMode: soft-light 41 41 RenderImage {IMG} at (0,0) size 130x130 42 layer at (53,301) size 130x130 42 layer at (53,301) size 130x130 blendMode: difference 43 43 RenderImage {IMG} at (0,0) size 130x130 44 layer at (193,301) size 130x130 44 layer at (193,301) size 130x130 blendMode: exclusion 45 45 RenderImage {IMG} at (0,0) size 130x130 46 layer at (333,301) size 130x130 46 layer at (333,301) size 130x130 blendMode: hue 47 47 RenderImage {IMG} at (0,0) size 130x130 48 layer at (473,301) size 130x130 48 layer at (473,301) size 130x130 blendMode: saturation 49 49 RenderImage {IMG} at (0,0) size 130x130 50 layer at (613,301) size 130x130 50 layer at (613,301) size 130x130 blendMode: color 51 51 RenderImage {IMG} at (0,0) size 130x130 52 layer at (53,441) size 130x130 52 layer at (53,441) size 130x130 blendMode: luminosity 53 53 RenderImage {IMG} at (0,0) size 130x130 -
trunk/Source/WebCore/ChangeLog
r166524 r166525 1 2014-03-31 Ion Rosca <rosca@adobe.com> 2 3 [CSS Blending] showLayerTree should dump layer's blend mode and isolation properties 4 https://bugs.webkit.org/show_bug.cgi?id=130922 5 6 Reviewed by Simon Fraser. 7 8 This change only updates existing tests involving blending. No new test required, 9 as there is no new or changed functionality. 10 11 * rendering/RenderLayer.h: adding blendMode() getter. 12 * rendering/RenderTreeAsText.cpp: 13 (WebCore::write): 14 adding blendMode property and layer's isolation status (does layer isolate blending descendants or not?). 15 1 16 2014-03-31 Benjamin Poulain <benjamin@webkit.org> 2 17 -
trunk/Source/WebCore/rendering/RenderLayer.h
r166489 r166525 787 787 } 788 788 789 #if ENABLE(CSS_COMPOSITING) 790 BlendMode blendMode() const { return m_blendMode; } 791 #endif 792 789 793 bool isolatesBlending() const 790 794 { -
trunk/Source/WebCore/rendering/RenderTreeAsText.cpp
r165676 r166525 638 638 ts << " (composited, bounds=" << l.backing()->compositedBounds() << ", drawsContent=" << l.backing()->graphicsLayer()->drawsContent() << ", paints into ancestor=" << l.backing()->paintsIntoCompositedAncestor() << ")"; 639 639 } 640 641 #if ENABLE(CSS_COMPOSITING) 642 if (l.isolatesBlending()) 643 ts << " isolatesBlending"; 644 if (l.hasBlendMode()) 645 ts << " blendMode: " << compositeOperatorName(CompositeSourceOver, l.blendMode()); 646 #endif 640 647 641 648 ts << "\n";
Note: See TracChangeset
for help on using the changeset viewer.