Bug 191492 – Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Benjamin Poulain]

Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend

[Benjamin Poulain]

Created attachment 354398 [details]
Patch

[Saam Barati]

Comment on attachment 354398 [details]
Patch

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

> Source/WTF/wtf/ObjcRuntimeExtras.h:-28
> -// FIXME: This file's name and function names refer to Objective-C as Objc with a lowercase C,
> -// but it should be ObjC with an uppercase C.

Maybe still keep the part about the file name?

[Benjamin Poulain]

Created attachment 354409 [details]
Patch

[Benjamin Poulain]

(In reply to Saam Barati from comment #2)
> > -// FIXME: This file's name and function names refer to Objective-C as Objc with a lowercase C,
> > -// but it should be ObjC with an uppercase C.
> 
> Maybe still keep the part about the file name?

My bad. Let's fix both :)

[Benjamin Poulain]

Created attachment 354417 [details]
Patch

[Benjamin Poulain]

I am not sure what's wrong with the bots. I may have to land it by hand :(

[Darin Adler]

Maybe the Windows bots have problems because the two file names are the same on a case folding file system. The same is true on Macs, but maybe on Windows it doesn’t handle it quite right.

[Benjamin Poulain]

Created attachment 354425 [details]
Patch

[EWS Watchlist]

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


ERROR: Source/JavaScriptCore/API/JSValue.mm:48:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:33:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm:42:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/WebView/WebView.mm:234:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebCore/rendering/RenderThemeMac.mm:80:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm:43:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebCore/platform/mac/WebCoreObjCExtras.mm:35:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/WebView/WebHTMLView.mm:146:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebCore/page/mac/EventHandlerMac.mm:71:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Tools/DumpRenderTree/mac/DumpRenderTree.mm:96:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebCore/platform/mac/WebCoreNSURLExtras.mm:35:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm:54:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKit/Platform/mac/StringUtilities.mm:32:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/WebCoreSupport/WebCachedFramePlatformData.h:31:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 14 in 36 files


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

[Benjamin Poulain]

Created attachment 354426 [details]
Patch

[EWS Watchlist]

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


ERROR: Source/JavaScriptCore/API/JSValue.mm:48:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:33:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm:42:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/WebView/WebView.mm:234:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebCore/rendering/RenderThemeMac.mm:80:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm:43:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebCore/platform/mac/WebCoreObjCExtras.mm:35:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/WebView/WebHTMLView.mm:146:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebCore/page/mac/EventHandlerMac.mm:71:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Tools/DumpRenderTree/mac/DumpRenderTree.mm:96:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebCore/platform/mac/WebCoreNSURLExtras.mm:35:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm:54:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKit/Platform/mac/StringUtilities.mm:32:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebKitLegacy/mac/WebCoreSupport/WebCachedFramePlatformData.h:31:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 14 in 36 files


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

[Benjamin Poulain]

Created attachment 354427 [details]
Patch

[Benjamin Poulain]

Ok, let's not risk breaking Windows.

The first patch renames the file to WTFObjCRuntimeExtras.h. Followed by second patch to give the correct name.

[WebKit Commit Bot]

Comment on attachment 354426 [details]
Patch

Clearing flags on attachment: 354426

Committed r238073: <https://trac.webkit.org/changeset/238073>

[Benjamin Poulain]

Created attachment 354497 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 354497 [details]
Patch

Rejecting attachment 354497 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 354497, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

ChangeLog entry in Source/WebCore/ChangeLog is not at the top of the file.

Full output: https://webkit-queues.webkit.org/results/9946027

[Benjamin Poulain]

Created attachment 354498 [details]
Patch for landing

[WebKit Commit Bot]

The commit-queue encountered the following flaky tests while processing attachment 354498 [details]:

workers/wasm-long-compile.html bug 191513 (author: [e-mail])
The commit-queue is continuing to process your patch.

[WebKit Commit Bot]

Comment on attachment 354498 [details]
Patch for landing

Clearing flags on attachment: 354498

Committed r238074: <https://trac.webkit.org/changeset/238074>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/45972473>

[Ross Kirsling]

I suppose the same casing fix should be made for JavaScriptCore/API/ObjcRuntimeExtras.h?

[Benjamin Poulain]

(In reply to Ross Kirsling from comment #22)
> I suppose the same casing fix should be made for
> JavaScriptCore/API/ObjcRuntimeExtras.h?

Eventually yes.

I fixed the WTF one since I'll probably add more features to it soon.

[Frédéric Wang (:fredw)]

Just for the record, one has to to delete existing ObjcRuntimeExtras.h copies in the WebKit build directory after this change in order to avoid build failures.

[Keith Miller]

Ben! You're killing me with this patch... The rename doesn't work if you rebase over both patches! All my checkouts are broken 😭!

[Benjamin Poulain]

(In reply to Keith Miller from comment #25)
> Ben! You're killing me with this patch... The rename doesn't work if you
> rebase over both patches! All my checkouts are broken 😭!

I am sorry. I did not expect this to go so poorly :(

I won't do that again.