Bug 98268

Summary:

[Qt] Make RenderThemeQStyle/ScrollbarThemeQStyle compile without QStyle/QtWidgets

Product:

WebKit

Reporter:

Simon Hausmann <hausmann>

Component:

New Bugs

Assignee:

Simon Hausmann <hausmann>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

pierre.rossi, vestbo, webkit.review.bot

Priority:

Version:

528+ (Nightly build)

Hardware:

Unspecified

OS:

Unspecified

Bug Depends on:

Bug Blocks:

88162

Attachments:

Description	Flags
Patch	none
Patch	none
Patch	none
Patch	none
Patch	none
Patch	none
Patch	vestbo: review+

Simon Hausmann

Reported 2012-10-03 08:06:10 PDT

[Qt] Make RenderThemeQStyle/ScrollbarThemeQStyle compile without QStyle/QtWidgets

Attachments
Patch (129.47 KB, patch) 2012-10-03 08:08 PDT, Simon Hausmann	no flags	Details Formatted Diff Diff
Patch (129.47 KB, patch) 2012-10-03 08:09 PDT, Simon Hausmann	no flags	Details Formatted Diff Diff
Patch (129.51 KB, patch) 2012-10-03 08:21 PDT, Simon Hausmann	no flags	Details Formatted Diff Diff
Patch (129.15 KB, patch) 2012-10-03 08:31 PDT, Simon Hausmann	no flags	Details Formatted Diff Diff
Patch (129.11 KB, patch) 2012-10-03 08:34 PDT, Simon Hausmann	no flags	Details Formatted Diff Diff
Patch (132.06 KB, patch) 2012-10-04 02:53 PDT, Simon Hausmann	no flags	Details Formatted Diff Diff
Patch (130.25 KB, patch) 2012-10-04 05:54 PDT, Simon Hausmann	vestbo: review+	Details Formatted Diff Diff
Show Obsolete (6) View All Add attachment proposed patch, testcase, etc.

Simon Hausmann

Comment 1 2012-10-03 08:08:41 PDT

Created attachment 166896 [details] Patch

Simon Hausmann

Comment 2 2012-10-03 08:09:48 PDT

Created attachment 166898 [details] Patch

WebKit Review Bot

Comment 3 2012-10-03 08:12:46 PDT

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.

Simon Hausmann

Comment 4 2012-10-03 08:21:39 PDT

Created attachment 166899 [details] Patch

WebKit Review Bot

Comment 5 2012-10-03 08:27:20 PDT

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.

Simon Hausmann

Comment 6 2012-10-03 08:31:06 PDT

Created attachment 166900 [details] Patch

WebKit Review Bot

Comment 7 2012-10-03 08:33:44 PDT

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.

Simon Hausmann

Comment 8 2012-10-03 08:34:32 PDT

Created attachment 166902 [details] Patch

WebKit Review Bot

Comment 9 2012-10-03 08:39:23 PDT

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.

Simon Hausmann

Comment 10 2012-10-04 02:53:25 PDT

Created attachment 167062 [details] Patch New patch with better ChangeLog description

WebKit Review Bot

Comment 11 2012-10-04 02:57:50 PDT

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.

Simon Hausmann

Comment 12 2012-10-04 03:11:10 PDT

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

Simon Hausmann

Comment 13 2012-10-04 05:54:28 PDT

Created attachment 167088 [details] Patch Updated patch with changes as per review with Tor Arne and Pierre

WebKit Review Bot

Comment 14 2012-10-04 05:57:51 PDT

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.

Tor Arne Vestbø

Comment 15 2012-10-05 04:21:20 PDT

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

Simon Hausmann

Comment 16 2012-10-05 05:36:28 PDT

Reverted r130495 for reason: Made WK2 tests crash Committed r130496: <http://trac.webkit.org/changeset/130496>

Simon Hausmann

Comment 17 2012-10-09 00:51:42 PDT

Committed r130723: <http://trac.webkit.org/changeset/130723>

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