From 5e80dc803f3d1ea0f11ed3f3a8ebaceeffe5672a Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Sat, 14 Dec 2019 09:22:40 -0800 Subject: [PATCH] fix(wk): fix gtk debug assertion --- browser_patches/webkit/BUILD_NUMBER | 2 +- browser_patches/webkit/patches/bootstrap.diff | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index b633d3d9f0..4fba33e90d 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1 +1 @@ -1036 +1037 diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 9fda87eb76..5b2d77b0ed 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -4616,7 +4616,7 @@ index bd3657bb087..f8fa8e3db22 100644 if (id value = [defaults objectForKey:@"WebKitEnableLegacyTLS"]) parameters.enableLegacyTLS = [value boolValue]; diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -index 9693809e34e..b45a4e7aa61 100644 +index 9693809e34e..beb27640580 100644 --- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp @@ -37,6 +37,7 @@ @@ -4633,7 +4633,7 @@ index 9693809e34e..b45a4e7aa61 100644 +void DrawingAreaProxyCoordinatedGraphics::waitForBackingStoreUpdate(Function&& callback) +{ -+ m_callbacks.set(m_currentBackingStoreStateID, WTFMove(callback)); ++ m_callbacks.set(m_currentBackingStoreStateID + 1, WTFMove(callback)); +} + void DrawingAreaProxyCoordinatedGraphics::waitForBackingStoreUpdateOnNextPaint() @@ -4645,7 +4645,7 @@ index 9693809e34e..b45a4e7aa61 100644 + Vector notified; + for (auto& [key, value] : m_callbacks) { -+ if (backingStoreStateID > key) { ++ if (backingStoreStateID >= key) { + notified.append(key); + value(); + }