Attachment 368293 Details for Bug 196357 – Patch for landing

[patch] Patch for landing

bug-196357-20190425181816.patch (text/plain), 6.63 KB, created by Sihui Liu on 2019-04-25 18:18:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2019-04-25 18:18:16 PDT

Size: 6.63 KB

patch

obsolete

>Subversion Revision: 244669
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 392a5b91bb7cffa7a5f1952d2080cb02fa243f76..e8e6498da6c92309d7c70ac3661a11450a730985 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-04-25  Sihui Liu  <sihui_liu@apple.com>
>+
>+        [ iOS Sim ] REGRESSION (r242986) Layout Test storage/indexeddb/modern/idbtransaction-objectstore-failures-private.html is a flaky failure
>+        https://bugs.webkit.org/show_bug.cgi?id=196357
>+        <rdar://problem/49386836>
>+
>+        Reviewed by Geoffrey Garen.
>+
>+        Dispatch IDBRequest event to IDBTransaction if event of IDBTransaction has not been dispatched.
>+
>+        Covered by existing tests.
>+
>+        * Modules/indexeddb/IDBRequest.cpp:
>+        (WebCore::IDBRequest::dispatchEvent):
>+        * Modules/indexeddb/IDBTransaction.cpp:
>+        (WebCore::IDBTransaction::dispatchEvent):
>+        * Modules/indexeddb/IDBTransaction.h:
>+
> 2019-04-25  Timothy Hatcher  <timothy@apple.com>
> 
>         Disable ContentChangeObserver on iOSMac.
>diff --git a/Source/WebCore/Modules/indexeddb/IDBRequest.cpp b/Source/WebCore/Modules/indexeddb/IDBRequest.cpp
>index aa7543a1a3d4e52394691a947e1ccdc45beca69b..ce4f61a464366551a0c93eb4f11a2e212012732f 100644
>--- a/Source/WebCore/Modules/indexeddb/IDBRequest.cpp
>+++ b/Source/WebCore/Modules/indexeddb/IDBRequest.cpp
>@@ -318,7 +318,7 @@ void IDBRequest::dispatchEvent(Event& event)
> 
>     if (&event == m_openDatabaseSuccessEvent)
>         m_openDatabaseSuccessEvent = nullptr;
>-    else if (m_transaction && !m_transaction->isFinished())
>+    else if (m_transaction && !m_transaction->didDispatchAbortOrCommit())
>         targets = { this, m_transaction.get(), &m_transaction->database() };
> 
>     m_hasPendingActivity = false;
>diff --git a/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp b/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp
>index cb0397c48c6089626d8f70b5b5c8b5100ad7f967..157085ace7f5b74dd286326783e074941768be76 100644
>--- a/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp
>+++ b/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp
>@@ -641,6 +641,7 @@ void IDBTransaction::dispatchEvent(Event& event)
>     auto protectedThis = makeRef(*this);
> 
>     EventDispatcher::dispatchEvent({ this, m_database.ptr() }, event);
>+    m_didDispatchAbortOrCommit = true;
> 
>     if (isVersionChange()) {
>         ASSERT(m_openDBRequest);
>diff --git a/Source/WebCore/Modules/indexeddb/IDBTransaction.h b/Source/WebCore/Modules/indexeddb/IDBTransaction.h
>index 0313bf9116e2449cf5b810825f2ce93dbfb52e39..0758bd9e31ff58029912702c4031b181abdd9e66 100644
>--- a/Source/WebCore/Modules/indexeddb/IDBTransaction.h
>+++ b/Source/WebCore/Modules/indexeddb/IDBTransaction.h
>@@ -146,6 +146,7 @@ public:
> 
>     bool isFinishedOrFinishing() const;
>     bool isFinished() const { return m_state == IndexedDB::TransactionState::Finished; }
>+    bool didDispatchAbortOrCommit() const { return m_didDispatchAbortOrCommit; }
> 
>     IDBClient::IDBConnectionProxy& connectionProxy();
> 
>@@ -261,6 +262,7 @@ private:
>     RefPtr<IDBRequest> m_currentlyCompletingRequest;
> 
>     bool m_contextStopped { false };
>+    bool m_didDispatchAbortOrCommit { false };
> };
> 
> class TransactionActivator {
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index b6edc57eedc9966e45a0f7485236bae374e882c1..a7fd6cd35e60397007cbd65b486185cb99a00c96 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-04-25  Sihui Liu  <sihui_liu@apple.com>
>+
>+        [ iOS Sim ] REGRESSION (r242986) Layout Test storage/indexeddb/modern/idbtransaction-objectstore-failures-private.html is a flaky failure
>+        https://bugs.webkit.org/show_bug.cgi?id=196357
>+        <rdar://problem/49386836>
>+
>+        Reviewed by Geoffrey Garen.
>+
>+        * platform/ios-simulator-wk2/TestExpectations:
>+        * platform/mac-wk2/TestExpectations:
>+        * platform/mac/TestExpectations:
>+
> 2019-04-25  Shawn Roberts  <sroberts@apple.com>
> 
>         fast/harness/render-tree-as-text-options.html Rebaselined test for windows
>diff --git a/LayoutTests/platform/ios-simulator-wk2/TestExpectations b/LayoutTests/platform/ios-simulator-wk2/TestExpectations
>index a23d71aebe73b6c953ed61b14288260b67b26a6e..3714c4f749be4db364d59ca020d09bc3b70a7b1d 100644
>--- a/LayoutTests/platform/ios-simulator-wk2/TestExpectations
>+++ b/LayoutTests/platform/ios-simulator-wk2/TestExpectations
>@@ -75,8 +75,6 @@ webkit.org/b/196112 imported/w3c/web-platform-tests/mathml/relations/css-styling
> webkit.org/b/196112 imported/w3c/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck.html [ Pass ImageOnlyFailure ]
> webkit.org/b/196112 imported/w3c/web-platform-tests/mathml/relations/css-styling/mathvariant-italic.html [ Pass ImageOnlyFailure ]
> 
>-webkit.org/b/196357 storage/indexeddb/modern/idbtransaction-objectstore-failures-private.html [ Pass Failure ]
>-
> http/wpt/cache-storage/quota-third-party.https.html [ Slow ]
> http/wpt/fetch/response-opaque-clone.html [ Slow ]
> 
>diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
>index 6fae45df14543d816368c4765eab0f7b265a8ac2..d5c2a3f9ff5407e69671d42291464348ae59c002 100644
>--- a/LayoutTests/platform/mac-wk2/TestExpectations
>+++ b/LayoutTests/platform/mac-wk2/TestExpectations
>@@ -673,8 +673,6 @@ webkit.org/b/171763 compositing/tiling/non-active-window-tiles-size.html [ Pass
> 
> webkit.org/b/171837 [ Debug ] http/tests/security/storage-blocking-loosened-plugin.html [ Pass Failure ]
> 
>-webkit.org/b/171862  storage/indexeddb/modern/idbtransaction-objectstore-failures.html [ Pass Failure ]
>-
> webkit.org/b/171935 [ Sierra ] tiled-drawing/scrolling/fast-scroll-select-latched-mainframe.html [ Pass Failure ]
> 
> webkit.org/b/171939 [ Sierra Release ] media/track/track-cue-rendering-on-resize.html [ Pass Timeout ]
>diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
>index 66d0841f85017e584dd284555cf74f51dbd652f2..bcc584fad982161d816a1d4b3f79d6b5423f6ad9 100644
>--- a/LayoutTests/platform/mac/TestExpectations
>+++ b/LayoutTests/platform/mac/TestExpectations
>@@ -1593,8 +1593,6 @@ webkit.org/b/175998 http/tests/security/mixedContent/insecure-css-with-secure-co
> 
> webkit.org/b/165311 [ Sierra+ ] media/modern-media-controls/pip-support/pip-support-click.html [ Pass Failure ]
> 
>-webkit.org/b/176693 storage/indexeddb/modern/idbtransaction-objectstore-failures-private.html [ Pass Failure ]
>-
> # User-installed font infrastructure is ony present on certain OSes.
> webkit.org/b/180062 [ Sierra HighSierra ] fast/text/user-installed-fonts/disable.html [ ImageOnlyFailure ]
> webkit.org/b/180062 fast/text/user-installed-fonts/shadow-postscript.html [ ImageOnlyFailure ]

Actions: View | Formatted Diff | Diff

Attachments on bug 196357: 368242 | 368293