diff --git a/webkit2gtk3-boo1088932-a11y-state-set.patch b/webkit2gtk3-boo1088932-a11y-state-set.patch index 7afb909..0505787 100644 --- a/webkit2gtk3-boo1088932-a11y-state-set.patch +++ b/webkit2gtk3-boo1088932-a11y-state-set.patch @@ -1,61 +1,13 @@ -Index: webkitgtk-2.21.5/Source/WebCore/accessibility/AccessibilityObject.cpp -=================================================================== ---- webkitgtk-2.21.5.orig/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-07-03 11:11:27.000000000 +0200 -+++ webkitgtk-2.21.5/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-07-24 11:54:06.402075029 +0200 -@@ -1783,7 +1783,7 @@ void AccessibilityObject::updateBackingS +diff -urp webkitgtk-2.22.6.orig/Source/WebCore/accessibility/AccessibilityObject.cpp webkitgtk-2.22.6/Source/WebCore/accessibility/AccessibilityObject.cpp +--- webkitgtk-2.22.6.orig/Source/WebCore/accessibility/AccessibilityObject.cpp 2019-02-12 16:58:51.735109641 -0600 ++++ webkitgtk-2.22.6/Source/WebCore/accessibility/AccessibilityObject.cpp 2019-02-12 17:00:53.987806344 -0600 +@@ -1780,6 +1780,9 @@ void AccessibilityObject::updateBackingS + if (!axObjectCache()) + return; + ++ if (WidgetHierarchyUpdatesSuspensionScope::isSuspended()) ++ return; ++ // Updating the layout may delete this object. RefPtr 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(); -Index: webkitgtk-2.21.5/Source/WebCore/dom/Document.cpp -=================================================================== ---- webkitgtk-2.21.5.orig/Source/WebCore/dom/Document.cpp 2018-07-20 08:09:06.000000000 +0200 -+++ webkitgtk-2.21.5/Source/WebCore/dom/Document.cpp 2018-07-24 11:54:06.434075417 +0200 -@@ -1936,11 +1936,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; - } -@@ -1963,7 +1962,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; -@@ -1979,7 +1978,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()); - -Index: webkitgtk-2.21.5/Source/WebCore/dom/Document.h -=================================================================== ---- webkitgtk-2.21.5.orig/Source/WebCore/dom/Document.h 2018-07-20 08:09:06.000000000 +0200 -+++ webkitgtk-2.21.5/Source/WebCore/dom/Document.h 2018-07-24 11:54:06.434075417 +0200 -@@ -1293,6 +1293,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); - diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 6f9df01..4c213d1 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Wed Feb 13 17:16:52 UTC 2019 - mgorse@suse.com + +- Replace webkit2gtk3-boo1088932-a11y-state-set.patch with a patch + proposed for webkit#188599. The original patch didn't always + prevent crashes. + ------------------------------------------------------------------- Sat Feb 9 15:44:38 UTC 2019 - bjorn.lie@gmail.com -- Update to version 2.22.6: +- Update to version 2.22.6 (boo#1124937): + Make kinetic scrolling slow down smoothly when reaching the ends of pages, instead of abruptly, to better match the GTK+ behaviour.