Bug 178681 – Remove scopeguard from platform

• Status: RESOLVED
• Resolution: FIXED
• Component: Platform

[Christopher Reid]

FileSystem uses scopeguard so filesystem can't be moved into PAL while scopeguard is in WebCore.

[Christopher Reid]

Created attachment 324604 [details]
Patch

[Build Bot]

Attachment 324604 [details] did not pass style-queue:


ERROR: Source/WebCore/Modules/indexeddb/IDBRequest.h:40:  Code inside a namespace should not be indented.  [whitespace/indent] [4]
ERROR: Source/WebCore/ChangeLog:8:  You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible.  [changelog/nonewtests] [5]
ERROR: Tools/TestWebKitAPI/Tests/WebCore/FileMonitor.cpp:31:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 3 in 15 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Christopher Reid]

Created attachment 324606 [details]
Patch

Fixing style issues

[Christopher Reid]

Created attachment 324610 [details]
Patch

Patch - Fixing a poorly merged line

[Brady Eidson]

I'm surprised so few places use this.

Regardless, there's nothing "Platform" about this class - It belongs in WTF

[Sam Weinig]

WTF already has ScopeExit, which looks similar. Maybe we can just remove ScopeGuard.

[Christopher Reid]

Created attachment 324764 [details]
patch

Here's a patch replacing Webcore::ScopeGuard with WTF::ScopeExit

[Build Bot]

Attachment 324764 [details] did not pass style-queue:


ERROR: Source/WebCore/workers/service/ServiceWorkerContainer.cpp:45:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKit/Shared/mac/ChildProcessMac.mm:39:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebCore/platform/FileSystem.cpp:31:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp:48:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebCore/platform/network/BlobRegistryImpl.cpp:44:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Tools/TestWebKitAPI/Tests/WebCore/FileMonitor.cpp:31:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 6 in 11 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Christopher Reid]

Created attachment 324765 [details]
Patch

Fixing style issues for scopeguard removal patch

[Christopher Reid]

Created attachment 324766 [details]
Patch

Accidentally uploaded an older patch

[Alex Christensen]

Comment on attachment 324766 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=324766&action=review

> Source/WebCore/Modules/indexeddb/IDBRequest.h:174
> +    std::unique_ptr<WTF::ScopeExit<std::function<void()>>> m_cursorRequestNotifier;

Is there a reason this needs to be std::function?  We're trying to use WTF::Function instead because it's non-copyable.

[Christopher Reid]

(In reply to Alex Christensen from comment #11)
> Comment on attachment 324766 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=324766&action=review
> 
> > Source/WebCore/Modules/indexeddb/IDBRequest.h:174
> > +    std::unique_ptr<WTF::ScopeExit<std::function<void()>>> m_cursorRequestNotifier;
> 
> Is there a reason this needs to be std::function?  We're trying to use
> WTF::Function instead because it's non-copyable.

For some reason I thought ScopeGuard was using std::function, but I was mistaken. I'll change it to WTF::Function.

[Christopher Reid]

Created attachment 324932 [details]
Patch

Using WTF::Function instead of std::function

[Build Bot]

Attachment 324932 [details] did not pass style-queue:


ERROR: Source/WebCore/ChangeLog:8:  You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible.  [changelog/nonewtests] [5]
Total errors found: 1 in 12 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Christopher Reid]

Created attachment 324934 [details]
Patch

Using WTF::Function instead of std::function - Fixing style issue

[Christopher Reid]

Created attachment 324938 [details]
Patch

Using WTF::Function instead of std::function -- Missed a new scope guard that was added today :(

[Brady Eidson]

Comment on attachment 324938 [details]
Patch

LGTM once EWS is all green.

[WebKit Commit Bot]

Comment on attachment 324938 [details]
Patch

Clearing flags on attachment: 324938

Committed r224018: <https://trac.webkit.org/changeset/224018>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/35568687>