182450 – [GTK] Unify builds for platform-specific files in WebKit layer

RESOLVED FIXED182450

[GTK] Unify builds for platform-specific files in WebKit layer

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

Summary [GTK] Unify builds for platform-specific files in WebKit layer

Michael Catanzaro

Reported 2018-02-02 14:28:47 PST

Unify builds for platform-specific files in WebKit layer. I'm afraid to touch the cross-platform files, but this at least should be safe. The API layer is fragile, because we have using declarations in the global namespace. That's avoidable, but will be more effort to fix. Next steps: * Handle WPE * Handle InjectedBundle/API (which is my main goal, there are so many files here)

Attachments
Patch (271.20 KB, patch) 2018-02-02 14:37 PST, Michael Catanzaro	no flags	Details Formatted Diff Diff
Patch (282.44 KB, patch) 2018-02-05 13:03 PST, Michael Catanzaro	no flags	Details Formatted Diff Diff
Patch (651.43 KB, patch) 2018-02-11 13:57 PST, Michael Catanzaro	cgarcia: review+ cgarcia: commit-queue-	Details Formatted Diff Diff
Show Obsolete (2) View All Add attachment proposed patch, testcase, etc.

Michael Catanzaro

Comment 1 2018-02-02 14:30:43 PST

Please ignore the style checker; placating it will not be reasonable with this patch.

Michael Catanzaro

Comment 2 2018-02-02 14:36:53 PST

Also, we should find a way to use unified builds for stuff that's not a WebKit framework, e.g. PluginProcess2 (many files there in both WebCore and WebKit layers) and everything under Tools (e.g. all the API tests).

Michael Catanzaro

Comment 3 2018-02-02 14:37:14 PST

Created attachment 333002 [details] Patch

EWS Watchlist

Comment 4 2018-02-02 14:40:03 PST

Attachment 333002 [details] did not pass style-queue: ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:216: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:230: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:243: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:256: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:269: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:282: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:294: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:307: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/gtk/WebKitPrintOperation.cpp:156: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/gtk/WebKitPrintOperation.cpp:169: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/gtk/WebKitPrintOperation.cpp:181: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp:129: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp:149: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp:168: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp:184: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp:200: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/Shared/API/glib/WebKitHitTestResult.cpp:151: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/Shared/API/glib/WebKitHitTestResult.cpp:165: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/Shared/API/glib/WebKitHitTestResult.cpp:178: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/Shared/API/glib/WebKitHitTestResult.cpp:191: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/Shared/API/glib/WebKitHitTestResult.cpp:204: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/Shared/API/glib/WebKitHitTestResult.cpp:217: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFileChooserRequest.cpp:136: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFileChooserRequest.cpp:152: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFileChooserRequest.cpp:167: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFileChooserRequest.cpp:181: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:872: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:938: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:957: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:971: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:985: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/gtk/WebKitWebInspector.cpp:126: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/gtk/WebKitWebInspector.cpp:138: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:559: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:574: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:588: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:606: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:623: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:641: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:655: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:671: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:684: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:697: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:711: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:727: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:740: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:754: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:767: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:780: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:793: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:806: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:819: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:833: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:847: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:862: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:875: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:891: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:904: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:917: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:933: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:947: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:960: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:989: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1008: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1023: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1041: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1057: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1072: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1089: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1104: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1119: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1160: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1180: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1193: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitDownload.cpp:163: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitDownload.cpp:176: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitDownload.cpp:194: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFindController.cpp:191: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFindController.cpp:204: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFindController.cpp:218: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFindController.cpp:231: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebResource.cpp:108: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebResource.cpp:121: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 83 in 102 files If any of these errors are false positives, please file a bug against check-webkit-style.

Michael Catanzaro

Comment 5 2018-02-05 08:30:43 PST

Looks like I forgot to add the SourcesGTK.txt to the patch file. That's pretty sad. I don't have it locally, so I'll have to do it again....

Michael Catanzaro

Comment 6 2018-02-05 13:03:19 PST

Created attachment 333115 [details] Patch

EWS Watchlist

Comment 7 2018-02-05 13:06:42 PST

Attachment 333115 [details] did not pass style-queue: ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:216: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:230: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:243: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:256: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:269: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:282: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:294: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp:307: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/gtk/WebKitPrintOperation.cpp:156: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/gtk/WebKitPrintOperation.cpp:169: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/gtk/WebKitPrintOperation.cpp:181: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp:129: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp:149: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp:168: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp:184: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp:200: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/Shared/API/glib/WebKitHitTestResult.cpp:151: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/Shared/API/glib/WebKitHitTestResult.cpp:165: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/Shared/API/glib/WebKitHitTestResult.cpp:178: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/Shared/API/glib/WebKitHitTestResult.cpp:191: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/Shared/API/glib/WebKitHitTestResult.cpp:204: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/Shared/API/glib/WebKitHitTestResult.cpp:217: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFileChooserRequest.cpp:136: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFileChooserRequest.cpp:152: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFileChooserRequest.cpp:167: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFileChooserRequest.cpp:181: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:872: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:938: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:957: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:971: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:985: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/gtk/WebKitWebInspector.cpp:126: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/gtk/WebKitWebInspector.cpp:138: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:559: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:574: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:588: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:606: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:623: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:641: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:655: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:671: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:684: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:697: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:711: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:727: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:740: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:754: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:767: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:780: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:793: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:806: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:819: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:833: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:847: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:862: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:875: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:891: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:904: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:917: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:933: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:947: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:960: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:989: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1008: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1023: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1041: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1057: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1072: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1089: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1104: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1119: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1160: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1180: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:1193: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitDownload.cpp:163: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitDownload.cpp:176: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitDownload.cpp:194: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFindController.cpp:191: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFindController.cpp:204: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFindController.cpp:218: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitFindController.cpp:231: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebResource.cpp:108: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] ERROR: Source/WebKit/UIProcess/API/glib/WebKitWebResource.cpp:121: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 83 in 103 files If any of these errors are false positives, please file a bug against check-webkit-style.

Carlos Garcia Campos

Comment 8 2018-02-05 23:43:24 PST

Comment on attachment 333115 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333115&action=review > Source/WebKit/Shared/API/glib/WebKitHitTestResult.cpp:67 > enum { > - PROP_0, > - > - PROP_CONTEXT, > - PROP_LINK_URI, > - PROP_LINK_TITLE, > - PROP_LINK_LABEL, > - PROP_IMAGE_URI, > - PROP_MEDIA_URI > + HIT_TEST_RESULT_PROP_0, > + > + HIT_TEST_RESULT_PROP_CONTEXT, > + HIT_TEST_RESULT_PROP_LINK_URI, > + HIT_TEST_RESULT_PROP_LINK_TITLE, > + HIT_TEST_RESULT_PROP_LINK_LABEL, > + HIT_TEST_RESULT_PROP_IMAGE_URI, > + HIT_TEST_RESULT_PROP_MEDIA_URI > }; Could we scope this using enum class instead? We are breaking the GObject convention after all adding this prefix. I guess we will need some ugly casts, though, so I'm not sure what uglier... > Source/WebKit/UIProcess/API/glib/WebKitAuthenticationRequest.cpp:59 > enum { > - CANCELLED, > + AUTHENTICATION_REQUEST_CANCELLED_SIGNAL, > > - LAST_SIGNAL > + AUTHENTICATION_REQUEST_LAST_SIGNAL > }; Same for the signals

Michael Catanzaro

Comment 9 2018-02-06 05:43:57 PST

(In reply to Carlos Garcia Campos from comment #8) > Could we scope this using enum class instead? We are breaking the GObject > convention after all adding this prefix. I guess we will need some ugly > casts, though, so I'm not sure what uglier... That would be much uglier. We'd have to use casts every time we want to index the properties or signals array.

Michael Catanzaro

Comment 10 2018-02-08 08:36:58 PST

Carlos?

Carlos Garcia Campos

Comment 11 2018-02-08 22:21:32 PST

Is it really worth it with all the renames? I don't like it, TBH, but I will not oppose if it's really worth it. Does this also mean that while working on the api, changing one file will require to rebuild all others?

Carlos Garcia Campos

Comment 12 2018-02-08 22:23:21 PST

(In reply to Michael Catanzaro from comment #0) > Unify builds for platform-specific files in WebKit layer. I'm afraid to > touch the cross-platform files, but this at least should be safe. > > The API layer is fragile, because we have using declarations in the global > namespace. That's avoidable, but will be more effort to fix. > > Next steps: > > * Handle WPE > * Handle InjectedBundle/API (which is my main goal, there are so many files > here) Yes, the DOM API is huge and it never changes, we should indeed build that part unified.

Michael Catanzaro

Comment 13 2018-02-09 08:01:07 PST

(In reply to Carlos Garcia Campos from comment #11) > Is it really worth it with all the renames? I don't like it, TBH, but I will > not oppose if it's really worth it. I'll measure build times before and after this patch. I bet the difference from just this patch will be fairly minimal, but my preference is to try to unify the entire build since it does add up. > Does this also mean that while working > on the api, changing one file will require to rebuild all others? The bundles are groups of at most eight files, so changing one file will require a rebuild of seven others.

Michael Catanzaro

Comment 14 2018-02-09 09:49:43 PST

Extremely unscientific: Before: real 40m14.002s user 254m57.307s sys 35m12.456s After: real 39m2.599s user 250m42.108s sys 33m14.889s Looks like a 1% reduction in build time. Not much on its own, but it all adds up. I'll do the DOM API next.

Carlos Garcia Campos

Comment 15 2018-02-10 00:26:58 PST

(In reply to Michael Catanzaro from comment #14) > Extremely unscientific: > > Before: > > real 40m14.002s > user 254m57.307s > sys 35m12.456s > > After: > > real 39m2.599s > user 250m42.108s > sys 33m14.889s > > Looks like a 1% reduction in build time. Not much on its own, but it all > adds up. I'll do the DOM API next. I prefer to keep the API implementation (except DOM bindings) unmodified then.

Michael Catanzaro

Comment 16 2018-02-10 09:45:35 PST

OK, fair enough

Michael Catanzaro

Comment 17 2018-02-11 13:57:59 PST

Created attachment 333572 [details] Patch

Michael Catanzaro

Comment 18 2018-02-11 13:59:19 PST

This new patch unifies the DOM API, but not the rest of the web process API, nor the UI process API.

Michael Catanzaro

Comment 19 2018-02-11 16:14:56 PST

(In reply to Michael Catanzaro from comment #14) > Extremely unscientific: > > Before: > > real 40m14.002s > user 254m57.307s > sys 35m12.456s > > After: > > real 39m2.599s > user 250m42.108s > sys 33m14.889s > > Looks like a 1% reduction in build time. Not much on its own, but it all > adds up. I'll do the DOM API next. New version: real 34m18.091s user 229m10.313s sys 31m4.763s I wonder what we can get it down to once we unify the cross-platform files.

Michael Catanzaro

Comment 20 2018-02-11 17:38:07 PST

I'll fix WPE before landing; looks like WEBKIT_COMPUTE_SOURCES should only be run for GTK for now. (WPE patch will come next.)

Carlos Garcia Campos

Comment 21 2018-02-11 23:23:32 PST

Comment on attachment 333572 [details] Patch Thanks!

Michael Catanzaro

Comment 22 2018-02-12 08:30:08 PST

Committed r228373: <https://trac.webkit.org/changeset/228373>

Michael Catanzaro

Comment 23 2018-02-17 11:12:17 PST

(In reply to Michael Catanzaro from comment #19) > New version: > > real 34m18.091s > user 229m10.313s > sys 31m4.763s This was a debug build. I just tested a release build for my blog, and I got: real 33m36.435s user 214m9.971s sys 29m55.811s So there's now almost no difference between debug and release builds.

Note You need to log in before you can comment on or make changes to this bug.

Status RESOLVED

Resolution FIXED

Priority P2

Severity Normal

Classification Unclassified

Version Other

Hardware PC

OS Linux

Product WebKit

Component WebKitGTK

Assignee

Michael Catanzaro

Reported

2018-02-02 14:28 PST

Modified

2018-02-17 11:12 PST History

CC List

4 users Show

URL

Keywords

Depends on

Blocks