[Qt] Make RenderThemeQStyle/ScrollbarThemeQStyle compile without QStyle/QtWidgets
Created attachment 166896 [details] Patch
Created attachment 166898 [details] Patch
Attachment 166898 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/qt/WebCoreSupport/QWebStyle.cpp:274: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/QStyleInterface.h:76: Extra space before last semicolon. If this should be an empty statement, use { } instead. [whitespace/semicolon] [5] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:280: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:283: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:301: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:390: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:420: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:430: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:474: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:504: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:516: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:529: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:541: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/ScrollbarThemeQStyle.cpp:137: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/ScrollbarThemeQStyle.cpp:138: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/ScrollbarThemeQStyle.cpp:143: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 16 in 14 files If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 166899 [details] Patch
Attachment 166899 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/qt/WebCoreSupport/QWebStyle.cpp:274: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/QStyleInterface.h:76: Extra space before last semicolon. If this should be an empty statement, use { } instead. [whitespace/semicolon] [5] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:280: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:283: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:390: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:430: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:474: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:504: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:516: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:529: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 10 in 14 files If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 166900 [details] Patch
Attachment 166900 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/qt/WebCoreSupport/QWebStyle.cpp:274: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/QStyleInterface.h:76: Extra space before last semicolon. If this should be an empty statement, use { } instead. [whitespace/semicolon] [5] Source/WebCore/platform/qt/RenderThemeQStyle.cpp:388: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 3 in 14 files If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 166902 [details] Patch
Attachment 166902 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/qt/WebCoreSupport/QWebStyle.cpp:274: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/QStyleInterface.h:76: Extra space before last semicolon. If this should be an empty statement, use { } instead. [whitespace/semicolon] [5] Total errors found: 2 in 14 files If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 167062 [details] Patch New patch with better ChangeLog description
Attachment 167062 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/qt/WebCoreSupport/QWebStyle.cpp:274: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/QStyleInterface.h:76: Extra space before last semicolon. If this should be an empty statement, use { } instead. [whitespace/semicolon] [5] Total errors found: 2 in 14 files If any of these errors are false positives, please file a bug against check-webkit-style.
The patch attached is one big combined change. Individual changes that are too small for trunk but illustrate the refactoring are at https://github.com/tronical/webkit/commits/rendertheme-split-individual
Created attachment 167088 [details] Patch Updated patch with changes as per review with Tor Arne and Pierre
Attachment 167088 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.cpp:256: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/qt/QStyleFacade.h:76: Extra space before last semicolon. If this should be an empty statement, use { } instead. [whitespace/semicolon] [5] Total errors found: 2 in 14 files If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 167088 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=167088&action=review r=me >> Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.cpp:256 >> + style()->drawControl(QStyle::CE_RadioButton, &option, painter, widget); > > Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] nitpick before landing
Reverted r130495 for reason: Made WK2 tests crash Committed r130496: <http://trac.webkit.org/changeset/130496>
Committed r130723: <http://trac.webkit.org/changeset/130723>