Skip to content

Drop IsDeprecatedWeakRefSmartPointerException from SQLiteStorageArea & StorageAreaBase#35116

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
cdumez:281393_StorageAreaBase
Oct 14, 2024
Merged

Drop IsDeprecatedWeakRefSmartPointerException from SQLiteStorageArea & StorageAreaBase#35116
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
cdumez:281393_StorageAreaBase

Conversation

@cdumez
Copy link
Contributor

@cdumez cdumez commented Oct 13, 2024

f1f97ea

Drop IsDeprecatedWeakRefSmartPointerException from SQLiteStorageArea & StorageAreaBase
https://bugs.webkit.org/show_bug.cgi?id=281393

Reviewed by Darin Adler.

* Source/WebKit/NetworkProcess/storage/LocalStorageManager.cpp:
(WebKit::LocalStorageManager::hasDataInMemory const):
(WebKit::LocalStorageManager::clearDataInMemory):
(WebKit::LocalStorageManager::clearDataOnDisk):
(WebKit::LocalStorageManager::close):
(WebKit::LocalStorageManager::handleLowMemoryWarning):
(WebKit::LocalStorageManager::syncLocalStorage):
(WebKit::LocalStorageManager::connectionClosedForLocalStorageArea):
(WebKit::LocalStorageManager::connectionClosedForTransientStorageArea):
(WebKit::LocalStorageManager::connectToLocalStorageArea):
(WebKit::LocalStorageManager::protectedLocalStorageArea const):
(WebKit::LocalStorageManager::connectToTransientLocalStorageArea):
* Source/WebKit/NetworkProcess/storage/LocalStorageManager.h:
* Source/WebKit/NetworkProcess/storage/MemoryStorageArea.cpp:
(WebKit::MemoryStorageArea::create):
(WebKit::MemoryStorageArea::clone const):
* Source/WebKit/NetworkProcess/storage/MemoryStorageArea.h:
* Source/WebKit/NetworkProcess/storage/SQLiteStorageArea.cpp:
(WebKit::SQLiteStorageArea::create):
* Source/WebKit/NetworkProcess/storage/SQLiteStorageArea.h:
* Source/WebKit/NetworkProcess/storage/SessionStorageManager.cpp:
(WebKit::SessionStorageManager::clearData):
(WebKit::SessionStorageManager::connectionClosed):
(WebKit::SessionStorageManager::addStorageArea):
(WebKit::SessionStorageManager::connectToSessionStorageArea):
(WebKit::SessionStorageManager::cancelConnectToSessionStorageArea):
(WebKit::SessionStorageManager::disconnectFromStorageArea):
(WebKit::SessionStorageManager::cloneStorageArea):
* Source/WebKit/NetworkProcess/storage/SessionStorageManager.h:
* Source/WebKit/NetworkProcess/storage/StorageAreaBase.cpp:
(WebKit::StorageAreaBase::hasListeners const): Deleted.
* Source/WebKit/NetworkProcess/storage/StorageAreaBase.h:
(WebKit::StorageAreaBase::hasListeners const):

Canonical link: https://commits.webkit.org/285106@main

9845132

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 🧪 gtk-wk2
✅ 🛠 vision-sim 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@cdumez cdumez self-assigned this Oct 13, 2024
@cdumez cdumez added the WebKit2 Bugs relating to the WebKit2 API layer label Oct 13, 2024
@webkit-ews-buildbot
Copy link
Collaborator

Safer C++ Build #1509

❌ Found 8 new failures. Please address these issues before landing. See WebKit Guidelines for Safer C++ Programming.
(cc @rniwa)

@cdumez cdumez force-pushed the 281393_StorageAreaBase branch from 5a15089 to 7d2a0c9 Compare October 13, 2024 18:53
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 13, 2024
@cdumez cdumez marked this pull request as ready for review October 13, 2024 20:51
@cdumez cdumez removed the merging-blocked Applied to prevent a change from being merged label Oct 13, 2024
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To match the other local variable names, this would just be transientStorage.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To match the other local variable names, this would just be transientStorage. Shorter is likely better, but also more consistent would be nicer. Not really important either way. If I was writhing the code, in a class named "storage manager" I’d use the word "area" rather than "storage", since "storage" is implied by the class.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't leave an extra blank line.

@cdumez cdumez force-pushed the 281393_StorageAreaBase branch from 7d2a0c9 to 9845132 Compare October 14, 2024 00:38
@cdumez cdumez added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Oct 14, 2024
…& StorageAreaBase

https://bugs.webkit.org/show_bug.cgi?id=281393

Reviewed by Darin Adler.

* Source/WebKit/NetworkProcess/storage/LocalStorageManager.cpp:
(WebKit::LocalStorageManager::hasDataInMemory const):
(WebKit::LocalStorageManager::clearDataInMemory):
(WebKit::LocalStorageManager::clearDataOnDisk):
(WebKit::LocalStorageManager::close):
(WebKit::LocalStorageManager::handleLowMemoryWarning):
(WebKit::LocalStorageManager::syncLocalStorage):
(WebKit::LocalStorageManager::connectionClosedForLocalStorageArea):
(WebKit::LocalStorageManager::connectionClosedForTransientStorageArea):
(WebKit::LocalStorageManager::connectToLocalStorageArea):
(WebKit::LocalStorageManager::protectedLocalStorageArea const):
(WebKit::LocalStorageManager::connectToTransientLocalStorageArea):
* Source/WebKit/NetworkProcess/storage/LocalStorageManager.h:
* Source/WebKit/NetworkProcess/storage/MemoryStorageArea.cpp:
(WebKit::MemoryStorageArea::create):
(WebKit::MemoryStorageArea::clone const):
* Source/WebKit/NetworkProcess/storage/MemoryStorageArea.h:
* Source/WebKit/NetworkProcess/storage/SQLiteStorageArea.cpp:
(WebKit::SQLiteStorageArea::create):
* Source/WebKit/NetworkProcess/storage/SQLiteStorageArea.h:
* Source/WebKit/NetworkProcess/storage/SessionStorageManager.cpp:
(WebKit::SessionStorageManager::clearData):
(WebKit::SessionStorageManager::connectionClosed):
(WebKit::SessionStorageManager::addStorageArea):
(WebKit::SessionStorageManager::connectToSessionStorageArea):
(WebKit::SessionStorageManager::cancelConnectToSessionStorageArea):
(WebKit::SessionStorageManager::disconnectFromStorageArea):
(WebKit::SessionStorageManager::cloneStorageArea):
* Source/WebKit/NetworkProcess/storage/SessionStorageManager.h:
* Source/WebKit/NetworkProcess/storage/StorageAreaBase.cpp:
(WebKit::StorageAreaBase::hasListeners const): Deleted.
* Source/WebKit/NetworkProcess/storage/StorageAreaBase.h:
(WebKit::StorageAreaBase::hasListeners const):

Canonical link: https://commits.webkit.org/285106@main
@webkit-commit-queue
Copy link
Collaborator

Committed 285106@main (f1f97ea): https://commits.webkit.org/285106@main

Reviewed commits have been landed. Closing PR #35116 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit f1f97ea into WebKit:main Oct 14, 2024
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Oct 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

WebKit2 Bugs relating to the WebKit2 API layer

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants