Merge branch 'master' into f31
This commit is contained in:
commit
6ec945e415
@ -1,6 +1,6 @@
|
|||||||
diff -up firefox-71.0/widget/gtk/mozcontainer.cpp.mozilla-1593408 firefox-71.0/widget/gtk/mozcontainer.cpp
|
diff -up firefox-71.0/widget/gtk/mozcontainer.cpp.mozilla-1593408 firefox-71.0/widget/gtk/mozcontainer.cpp
|
||||||
--- firefox-71.0/widget/gtk/mozcontainer.cpp.mozilla-1593408 2019-11-26 01:02:30.000000000 +0100
|
--- firefox-71.0/widget/gtk/mozcontainer.cpp.mozilla-1593408 2019-11-26 01:02:30.000000000 +0100
|
||||||
+++ firefox-71.0/widget/gtk/mozcontainer.cpp 2019-11-27 11:41:20.539447954 +0100
|
+++ firefox-71.0/widget/gtk/mozcontainer.cpp 2019-11-28 11:29:58.522095531 +0100
|
||||||
@@ -76,6 +76,10 @@ static void moz_container_allocate_child
|
@@ -76,6 +76,10 @@ static void moz_container_allocate_child
|
||||||
MozContainerChild* child);
|
MozContainerChild* child);
|
||||||
static MozContainerChild* moz_container_get_child(MozContainer* container,
|
static MozContainerChild* moz_container_get_child(MozContainer* container,
|
||||||
@ -30,7 +30,7 @@ diff -up firefox-71.0/widget/gtk/mozcontainer.cpp.mozilla-1593408 firefox-71.0/w
|
|||||||
+ wl_subsurface_set_position(container->subsurface, container->subsurface_dx,
|
+ wl_subsurface_set_position(container->subsurface, container->subsurface_dx,
|
||||||
+ container->subsurface_dy);
|
+ container->subsurface_dy);
|
||||||
+ wl_surface_commit(parent_surface);
|
+ wl_surface_commit(parent_surface);
|
||||||
+ container->surface_position_needs_update = false;
|
+ container->surface_position_update = false;
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user