Bug 167393 – LoadWebLocalizedStrings method should be moved in correct file

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Aakash Jain]

Inside WebKit/mac/Misc/WebLocalizableStrings.mm LoadWebLocalizedStrings method is only for iOS (surrounded by #if PLATFORM(IOS)), also this method is only called from a single location in a iOS specific file named WebKit/ios/Misc/WebUIKitSupport.mm.

In order to organize the code better, LoadWebLocalizedStrings() should be moved it iOS specific file WebKit/ios/Misc/WebUIKitSupport.mm

[Aakash Jain]

Created attachment 299660 [details]
Proposed patch

[WebKit Commit Bot]

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


ERROR: Source/WebKit/ios/Misc/WebUIKitSupport.mm:57:  No space between ^ and block definition.  [whitespace/brackets] [4]
Total errors found: 1 in 3 files


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

[Aakash Jain]

Created attachment 299664 [details]
Updated patch

[Alexey Proskuryakov]

Comment on attachment 299664 [details]
Updated patch

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

> Source/WebKit/ios/Misc/WebUIKitSupport.mm:48
> +void LoadWebLocalizedStrings(void);

Can this function be a static one too? If made static, it won't need a declaration.

> Source/WebKit/ios/Misc/WebUIKitSupport.mm:66
> +void LoadWebLocalizedStrings(void)

As this is a C++ file (not plain C), "(void)" is not needed, "()" is the right way to write it.

[Aakash Jain]

Created attachment 299715 [details]
Updated patch

Made LoadWebLocalizedStrings static, and removed void.

[WebKit Commit Bot]

Comment on attachment 299715 [details]
Updated patch

Rejecting attachment 299715 [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-01', 'validate-changelog', '--check-oops', '--non-interactive', 299715, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

ChangeLog entry in Source/WebKit/ios/ChangeLog contains OOPS!.

Full output: http://webkit-queues.webkit.org/results/2947779

[Aakash Jain]

Created attachment 299716 [details]
Updated patch

Added reviewer name in ChangeLog.

[WebKit Commit Bot]

Comment on attachment 299716 [details]
Updated patch

Clearing flags on attachment: 299716

Committed r211156: <http://trac.webkit.org/changeset/211156>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.