Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Commit d1614b3

Browse files
[TextureMapper][GTK] Test compositing/clipping/border-radius-stacking-context-clip.html is failing
https://bugs.webkit.org/show_bug.cgi?id=214868 Reviewed by Carlos Garcia Campos. Source/WebCore: If a replica layer has m_state.pos, m_layerTransforms.combined should be translated by them. * platform/graphics/texmap/TextureMapperLayer.cpp: (WebCore::TextureMapperLayer::computeTransformsRecursive): * platform/graphics/texmap/TextureMapperLayer.h: LayoutTests: * platform/gtk/TestExpectations: Unmarked compositing/clipping/border-radius-stacking-context-clip.html. * platform/gtk/compositing/reflections/nested-reflection-transformed-expected.png: Updated. * platform/gtk/compositing/reflections/nested-reflection-transformed2-expected.png: Updated. * platform/gtk/compositing/reflections/reflection-positioning2-expected.png: Updated. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@269072 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 5d0fdd6 commit d1614b3

File tree

8 files changed

+31
-1
lines changed

8 files changed

+31
-1
lines changed

LayoutTests/ChangeLog

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2020-10-27 Fujii Hironori <[email protected]>
2+
3+
[TextureMapper][GTK] Test compositing/clipping/border-radius-stacking-context-clip.html is failing
4+
https://bugs.webkit.org/show_bug.cgi?id=214868
5+
6+
Reviewed by Carlos Garcia Campos.
7+
8+
* platform/gtk/TestExpectations: Unmarked compositing/clipping/border-radius-stacking-context-clip.html.
9+
* platform/gtk/compositing/reflections/nested-reflection-transformed-expected.png: Updated.
10+
* platform/gtk/compositing/reflections/nested-reflection-transformed2-expected.png: Updated.
11+
* platform/gtk/compositing/reflections/reflection-positioning2-expected.png: Updated.
12+
113
2020-10-27 Martin Robinson <[email protected]>
214

315
Overflow scrollIntoView wrong with borders

LayoutTests/platform/gtk/TestExpectations

-1
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,6 @@ webkit.org/b/169918 compositing/webgl/webgl-no-alpha.html [ Missing Failure ]
447447
webkit.org/b/169918 compositing/webgl/webgl-reflection.html [ Missing Failure ]
448448
webkit.org/b/169918 compositing/fixed-with-fixed-layout.html [ Crash ]
449449
webkit.org/b/169918 compositing/video/video-background-color.html [ Crash Pass ]
450-
webkit.org/b/214868 compositing/clipping/border-radius-stacking-context-clip.html [ ImageOnlyFailure ]
451450

452451
# WebGL related failures
453452
webkit.org/b/169917 fast/canvas/webgl/antialiasing-enabled.html [ Failure Pass ]
Loading
Loading
Loading

Source/WebCore/ChangeLog

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2020-10-27 Fujii Hironori <[email protected]>
2+
3+
[TextureMapper][GTK] Test compositing/clipping/border-radius-stacking-context-clip.html is failing
4+
https://bugs.webkit.org/show_bug.cgi?id=214868
5+
6+
Reviewed by Carlos Garcia Campos.
7+
8+
If a replica layer has m_state.pos, m_layerTransforms.combined
9+
should be translated by them.
10+
11+
* platform/graphics/texmap/TextureMapperLayer.cpp:
12+
(WebCore::TextureMapperLayer::computeTransformsRecursive):
13+
* platform/graphics/texmap/TextureMapperLayer.h:
14+
115
2020-10-27 Martin Robinson <[email protected]>
216

317
Overflow scrollIntoView wrong with borders

Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ void TextureMapperLayer::computeTransformsRecursive()
7676
m_layerTransforms.combinedForChildren = m_layerTransforms.combined;
7777
m_layerTransforms.combined.translate3d(-originX, -originY, -m_state.anchorPoint.z());
7878

79+
if (m_isReplica)
80+
m_layerTransforms.combined.translate(-m_state.pos.x(), -m_state.pos.y());
81+
7982
if (!m_state.preserves3D)
8083
m_layerTransforms.combinedForChildren = m_layerTransforms.combinedForChildren.to2dTransform();
8184
m_layerTransforms.combinedForChildren.multiply(m_state.childrenTransform);
@@ -577,6 +580,7 @@ void TextureMapperLayer::setMaskLayer(TextureMapperLayer* maskLayer)
577580
void TextureMapperLayer::setReplicaLayer(TextureMapperLayer* replicaLayer)
578581
{
579582
if (replicaLayer) {
583+
replicaLayer->m_isReplica = true;
580584
replicaLayer->m_effectTarget = makeWeakPtr(*this);
581585
m_state.replicaLayer = makeWeakPtr(*replicaLayer);
582586
} else

Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h

+1
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ class WEBCORE_EXPORT TextureMapperLayer : public CanMakeWeakPtr<TextureMapperLay
213213
RefPtr<Nicosia::AnimatedBackingStoreClient> m_animatedBackingStoreClient;
214214
#endif
215215
bool m_isBackdrop { false };
216+
bool m_isReplica { false };
216217

217218
struct {
218219
TransformationMatrix localTransform;

0 commit comments

Comments
 (0)