Accepting request 596172 from GNOME:Factory
- Add webkit2gtk3-boo1088932-a11y-state-set.patch: fix crash when atk_object_ref_state_set is called on an AtkObject that's being destroyed (boo#1088932 webkit#184366). (forwarded request 596005 from mgorse) OBS-URL: https://build.opensuse.org/request/show/596172 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/webkit2gtk3?expand=0&rev=56
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
94de58e4f9
58
webkit2gtk3-boo1088932-a11y-state-set.patch
Normal file
58
webkit2gtk3-boo1088932-a11y-state-set.patch
Normal file
@ -0,0 +1,58 @@
|
||||
diff -urp webkitgtk-2.20.1.orig/Source/WebCore/accessibility/AccessibilityObject.cpp webkitgtk-2.20.1/Source/WebCore/accessibility/AccessibilityObject.cpp
|
||||
--- webkitgtk-2.20.1.orig/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-04-09 07:00:57.000000000 -0500
|
||||
+++ webkitgtk-2.20.1/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-04-10 21:07:52.446048647 -0500
|
||||
@@ -1771,7 +1771,7 @@ void AccessibilityObject::updateBackingS
|
||||
// Updating the layout may delete this object.
|
||||
RefPtr<AccessibilityObject> protectedThis(this);
|
||||
if (auto* document = this->document()) {
|
||||
- if (!document->view()->layoutContext().isInRenderTreeLayout() && !document->inRenderTreeUpdate() && !document->inStyleRecalc())
|
||||
+ if (!document->view()->layoutContext().isInRenderTreeLayout() && !document->inRenderTreeUpdate() && document->isSafeToUpdateStyleOrLayout())
|
||||
document->updateLayoutIgnorePendingStylesheets();
|
||||
}
|
||||
updateChildrenIfNecessary();
|
||||
diff -urp webkitgtk-2.20.1.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.20.1/Source/WebCore/dom/Document.cpp
|
||||
--- webkitgtk-2.20.1.orig/Source/WebCore/dom/Document.cpp 2018-03-05 05:36:37.000000000 -0600
|
||||
+++ webkitgtk-2.20.1/Source/WebCore/dom/Document.cpp 2018-04-10 21:07:52.454048680 -0500
|
||||
@@ -1940,11 +1940,10 @@ bool Document::needsStyleRecalc() const
|
||||
return false;
|
||||
}
|
||||
|
||||
-static bool isSafeToUpdateStyleOrLayout(const Document& document)
|
||||
+bool Document::isSafeToUpdateStyleOrLayout() const
|
||||
{
|
||||
bool isSafeToExecuteScript = ScriptDisallowedScope::InMainThread::isScriptAllowed();
|
||||
- auto* frameView = document.view();
|
||||
- bool isInFrameFlattening = frameView && frameView->isInChildFrameWithFrameFlattening();
|
||||
+ bool isInFrameFlattening = view() && view()->isInChildFrameWithFrameFlattening();
|
||||
bool isAssertionDisabled = ScriptDisallowedScope::LayoutAssertionDisableScope::shouldDisable();
|
||||
return isSafeToExecuteScript || isInFrameFlattening || !isInWebProcess() || isAssertionDisabled;
|
||||
}
|
||||
@@ -1967,7 +1966,7 @@ bool Document::updateStyleIfNeeded()
|
||||
}
|
||||
|
||||
// The early exit above for !needsStyleRecalc() is needed when updateWidgetPositions() is called in runOrScheduleAsynchronousTasks().
|
||||
- RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(isSafeToUpdateStyleOrLayout(*this));
|
||||
+ RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(isSafeToUpdateStyleOrLayout());
|
||||
|
||||
resolveStyle();
|
||||
return true;
|
||||
@@ -1983,7 +1982,7 @@ void Document::updateLayout()
|
||||
ASSERT_NOT_REACHED();
|
||||
return;
|
||||
}
|
||||
- RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(isSafeToUpdateStyleOrLayout(*this));
|
||||
+ RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(isSafeToUpdateStyleOrLayout());
|
||||
|
||||
RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView());
|
||||
|
||||
diff -urp webkitgtk-2.20.1.orig/Source/WebCore/dom/Document.h webkitgtk-2.20.1/Source/WebCore/dom/Document.h
|
||||
--- webkitgtk-2.20.1.orig/Source/WebCore/dom/Document.h 2018-03-05 04:11:41.000000000 -0600
|
||||
+++ webkitgtk-2.20.1/Source/WebCore/dom/Document.h 2018-04-10 21:07:52.454048680 -0500
|
||||
@@ -1253,6 +1253,7 @@ public:
|
||||
|
||||
bool inStyleRecalc() const { return m_inStyleRecalc; }
|
||||
bool inRenderTreeUpdate() const { return m_inRenderTreeUpdate; }
|
||||
+ WEBCORE_EXPORT bool isSafeToUpdateStyleOrLayout() const;
|
||||
|
||||
void updateTextRenderer(Text&, unsigned offsetOfReplacedText, unsigned lengthOfReplacedText);
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 11 15:53:22 UTC 2018 - mgorse@suse.com
|
||||
|
||||
- Add webkit2gtk3-boo1088932-a11y-state-set.patch: fix crash when
|
||||
atk_object_ref_state_set is called on an AtkObject that's being
|
||||
destroyed (boo#1088932 webkit#184366).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 10 10:23:30 UTC 2018 - bjorn.lie@gmail.com
|
||||
|
||||
- Update to version 2.20.1:
|
||||
+ Improve error message when Gigacage cannot allocate virtual
|
||||
memory.
|
||||
+ Add missing WebKitWebProcessEnumTypes.h to
|
||||
webkit-web-extension.h.
|
||||
+ Improve web process memory monitor thresholds.
|
||||
+ Fix a web process crash when the web view is created and
|
||||
destroyed quickly.
|
||||
+ Fix a network process crash when load is cancelled while
|
||||
searching for stored HTTP auth credentials.
|
||||
+ Fix the build when ENABLE_VIDEO, ENABLE_WEB_AUDIO and
|
||||
ENABLE_XSLT are disabled.
|
||||
+ Fix several crashes and rendering issues.
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 12 16:18:01 UTC 2018 - dimstar@opensuse.org
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
%endif
|
||||
%bcond_without python3
|
||||
Name: webkit2gtk3
|
||||
Version: 2.20.0
|
||||
Version: 2.20.1
|
||||
Release: 0
|
||||
Summary: Library for rendering web content, GTK+ Port
|
||||
License: LGPL-2.0-or-later AND BSD-3-Clause
|
||||
@ -52,6 +52,8 @@ Source99: webkit2gtk3.keyring
|
||||
Patch0: webkitgtk-typelib-sharelib-link.patch
|
||||
# PATCH-FIX-UPSTREAM webkit2gtk3-python3.patch bsc#1079812 mgorse@suse.com -- port to Python 3.
|
||||
Patch1: webkit2gtk3-python3.patch
|
||||
# PATCh-FIX-UPSTREAM webkit2gtk3-boo1088932-a11y-state-set.patch boo#1088932 webkit#184366 mgorse@suse.com -- fix crash when atk_object_ref_state_set is called on an AtkObject that's being destroyed.
|
||||
Patch2: webkit2gtk3-boo1088932-a11y-state-set.patch
|
||||
BuildRequires: Mesa-libEGL-devel
|
||||
BuildRequires: Mesa-libGL-devel
|
||||
BuildRequires: Mesa-libGLESv1_CM-devel
|
||||
@ -260,6 +262,7 @@ invoking a Perl or Python script.
|
||||
%if %{with python3}
|
||||
%patch1 -p1
|
||||
%endif
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
# Here we must muzzle our dog so it doesn't eat all the memory
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:57f640f720bd9a8a7207f3321cf803a15c2f207b4e7b75ff1be17bc1eeb00a3c
|
||||
size 16617492
|
||||
@ -1,6 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCWqZPAwAKCRDz0yLQ7EWC
|
||||
w9knAJ9r0mLoxKLqyS/1uQ9VzBd/Z7+CSACgkTCoD3PiJrScGB5RsyPItZZvXWs=
|
||||
=CLxQ
|
||||
-----END PGP SIGNATURE-----
|
||||
3
webkitgtk-2.20.1.tar.xz
Normal file
3
webkitgtk-2.20.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:43e43285fa4e393080cc4fbd5ad8644749a75b1e0b811b230b63ae56806c8959
|
||||
size 16619312
|
||||
6
webkitgtk-2.20.1.tar.xz.asc
Normal file
6
webkitgtk-2.20.1.tar.xz.asc
Normal file
@ -0,0 +1,6 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCWsx5fgAKCRDz0yLQ7EWC
|
||||
w5CiAJwM7PJnrPY5s6hpwI9tVgXg3wP96gCfTvwajksGsnx76Uz9nolKi35oPW0=
|
||||
=BgHS
|
||||
-----END PGP SIGNATURE-----
|
||||
Loading…
x
Reference in New Issue
Block a user