Attachment #193323 for bug #112370

View Details Raw Unified Return to Bug 112370

| Differences between



2013-03-15  No'am Rosenthal  <noam@webkit.org>

        [Texmap] REGRESSION (r144190): Failure at style with preserve-3d and opacity
        https://bugs.webkit.org/show_bug.cgi?id=112370

        According to spec, we avoid masking and clipping when preserves-3d is enabled.
        However, opacity should still work.
        Allowing opacity when preserves-3d is on.

        Reviewed by NOBODY (OOPS!).

        Test: compositing/overlap-blending/preserves3d-opacity.html

        * platform/graphics/texmap/TextureMapperGL.cpp:
        * platform/graphics/texmap/TextureMapperLayer.cpp:
        (WebCore::TextureMapperLayer::paintRecursive):

2013-03-15  Noam Rosenthal  <noam@webkit.org>

        [Texmap] Change brightness filter to match new spec



    if (!isVisible())
        return;

    TextureMapperPaintOptions paintOptions(options);
    paintOptions.opacity = options.opacity * m_currentOpacity;

    if (!shouldBlend()) {
        paintSelfAndChildrenWithReplica(paintOptions);
        return;
    }

    TextureMapperPaintOptions paintOptions(options);
    paintOptions.opacity = options.opacity * m_currentOpacity;
    paintUsingOverlapRegions(paintOptions);
}




2013-03-15  No'am Rosenthal  <noam@webkit.org>

        [Texmap] REGRESSION (r144190): Failure at style with webkit-transform and opacity
        https://bugs.webkit.org/show_bug.cgi?id=112370

        Reviewed by NOBODY (OOPS!).

        New ref-test for opacity+preserves-3d.

        * compositing/overlap-blending/preserves3d-opacity-expected.html: Added.
        * compositing/overlap-blending/preserves3d-opacity.html: Added.

2013-03-14  John Bauman  <jbauman@chromium.org>

        Layout Test plugins/plugin-clip-subframe.html is failing



<!DOCTYPE HTML>
<html>
  <head>
    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
    <style type="text/css" media="screen">
      div {
        -webkit-box-sizing: border-box;
      }
      .solid {
        position: absolute;
        width: 200px;
        height: 200px;
        background-color: green;
      }

      .opacity { opacity: .1; }

      .composited {
        -webkit-transform: translate3d(0, 0, 0);
      }
      * { margin: 0; padding: 0; }

    </style>
  </head>
    <div class="opacity solid composited">123</div>

</html>



<!DOCTYPE HTML>
<html>
  <head>
    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
    <style type="text/css" media="screen">
      div {
        -webkit-box-sizing: border-box;
      }
      .solid {
        position: absolute;
        width: 200px;
        height: 200px;
        background-color: green;
      }

      .opacity { opacity: .1; }

      .preserve3d {
        -webkit-transform: translateZ(0);
        -webkit-transform-style: preserve-3d;
      }
      * { margin: 0; padding: 0; }

    </style>
  </head>
    <div class="opacity solid preserve3d">123</div>

</html>

Return to Bug 112370

Lines 422-434 void TextureMapperLayer::paintRecursive(const TextureMapperPaintOptions& options a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp_sec1
- a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp -3 / +4 lines
422	if (!isVisible())	422	if (!isVisible())
423	return;	423	return;
424		424
		425	TextureMapperPaintOptions paintOptions(options);
		426	paintOptions.opacity = options.opacity * m_currentOpacity;
		427
425	if (!shouldBlend()) {	428	if (!shouldBlend()) {
426	paintSelfAndChildrenWithReplica(options);	429	paintSelfAndChildrenWithReplica(paintOptions);
427	return;	430	return;
428	}	431	}
429		432
430	TextureMapperPaintOptions paintOptions(options);
431	paintOptions.opacity = options.opacity * m_currentOpacity;
432	paintUsingOverlapRegions(paintOptions);	433	paintUsingOverlapRegions(paintOptions);
433	}	434	}
434		435

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +17 lines
		1	2013-03-15 No'am Rosenthal <noam@webkit.org>
		2
		3	[Texmap] REGRESSION (r144190): Failure at style with preserve-3d and opacity
		4	https://bugs.webkit.org/show_bug.cgi?id=112370
		5
		6	According to spec, we avoid masking and clipping when preserves-3d is enabled.
		7	However, opacity should still work.
		8	Allowing opacity when preserves-3d is on.
		9
		10	Reviewed by NOBODY (OOPS!).
		11
		12	Test: compositing/overlap-blending/preserves3d-opacity.html
		13
		14	* platform/graphics/texmap/TextureMapperGL.cpp:
		15	* platform/graphics/texmap/TextureMapperLayer.cpp:
		16	(WebCore::TextureMapperLayer::paintRecursive):
		17
1	2013-03-15 Noam Rosenthal <noam@webkit.org>	18	2013-03-15 Noam Rosenthal <noam@webkit.org>
2		19
3	[Texmap] Change brightness filter to match new spec	20	[Texmap] Change brightness filter to match new spec

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +12 lines
		1	2013-03-15 No'am Rosenthal <noam@webkit.org>
		2
		3	[Texmap] REGRESSION (r144190): Failure at style with webkit-transform and opacity
		4	https://bugs.webkit.org/show_bug.cgi?id=112370
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	New ref-test for opacity+preserves-3d.
		9
		10	* compositing/overlap-blending/preserves3d-opacity-expected.html: Added.
		11	* compositing/overlap-blending/preserves3d-opacity.html: Added.
		12
1	2013-03-14 John Bauman <jbauman@chromium.org>	13	2013-03-14 John Bauman <jbauman@chromium.org>
2		14
3	Layout Test plugins/plugin-clip-subframe.html is failing	15	Layout Test plugins/plugin-clip-subframe.html is failing

Line 0 a/LayoutTests/compositing/overlap-blending/preserves3d-opacity-expected.html_sec1
- a/LayoutTests/compositing/overlap-blending/preserves3d-opacity-expected.html +27 lines
	1	<!DOCTYPE HTML>
	2	<html>
	3	<head>
	4	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
	5	<style type="text/css" media="screen">
	6	div {
	7	-webkit-box-sizing: border-box;
	8	}
	9	.solid {
	10	position: absolute;
	11	width: 200px;
	12	height: 200px;
	13	background-color: green;
	14	}
	15
	16	.opacity { opacity: .1; }
	17
	18	.composited {
	19	-webkit-transform: translate3d(0, 0, 0);
	20	}
	21	* { margin: 0; padding: 0; }
	22
	23	</style>
	24	</head>
	25	<div class="opacity solid composited">123</div>
	26
	27	</html>