fix(wk): fix gtk debug assertion

This commit is contained in:
Pavel Feldman 2019-12-14 09:22:40 -08:00
parent 927669b890
commit 5e80dc803f
2 changed files with 4 additions and 4 deletions

View file

@ -1 +1 @@
1036 1037

View file

@ -4616,7 +4616,7 @@ index bd3657bb087..f8fa8e3db22 100644
if (id value = [defaults objectForKey:@"WebKitEnableLegacyTLS"]) if (id value = [defaults objectForKey:@"WebKitEnableLegacyTLS"])
parameters.enableLegacyTLS = [value boolValue]; parameters.enableLegacyTLS = [value boolValue];
diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp 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 --- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
@ -4633,7 +4633,7 @@ index 9693809e34e..b45a4e7aa61 100644
+void DrawingAreaProxyCoordinatedGraphics::waitForBackingStoreUpdate(Function<void ()>&& callback) +void DrawingAreaProxyCoordinatedGraphics::waitForBackingStoreUpdate(Function<void ()>&& callback)
+{ +{
+ m_callbacks.set(m_currentBackingStoreStateID, WTFMove(callback)); + m_callbacks.set(m_currentBackingStoreStateID + 1, WTFMove(callback));
+} +}
+ +
void DrawingAreaProxyCoordinatedGraphics::waitForBackingStoreUpdateOnNextPaint() void DrawingAreaProxyCoordinatedGraphics::waitForBackingStoreUpdateOnNextPaint()
@ -4645,7 +4645,7 @@ index 9693809e34e..b45a4e7aa61 100644
+ Vector<uint64_t> notified; + Vector<uint64_t> notified;
+ for (auto& [key, value] : m_callbacks) { + for (auto& [key, value] : m_callbacks) {
+ if (backingStoreStateID > key) { + if (backingStoreStateID >= key) {
+ notified.append(key); + notified.append(key);
+ value(); + value();
+ } + }