Bug 125239

Summary:

[iOS] Upstream WebCore/rendering changes

Product:

WebKit

Reporter:

Daniel Bates <dbates>

Component:

WebCore Misc.

Assignee:

Daniel Bates <dbates>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

aestes, buildbot, commit-queue, ddkilzer, eflews.bot, gtk-ews, gyuyoung.kim, rniwa, xan.lopez

Priority:

Version:

528+ (Nightly build)

Hardware:

Unspecified

OS:

Unspecified

Bug Depends on:

125191, 125193

Bug Blocks:

Attachments:

Description	Flags
Patch	none
Patch	none
Patch	simon.fraser: review+

Daniel Bates

Reported 2013-12-04 11:57:59 PST

Upstream iOS-specific changes to WebCore/rendering.

Attachments
Patch (221.27 KB, patch) 2013-12-04 13:47 PST, Daniel Bates	no flags	Details Formatted Diff Diff
Patch (221.33 KB, patch) 2013-12-04 14:53 PST, Daniel Bates	no flags	Details Formatted Diff Diff
Patch (221.34 KB, patch) 2013-12-06 10:08 PST, Daniel Bates	simon.fraser: review+	Details Formatted Diff Diff
Show Obsolete (2) View All Add attachment proposed patch, testcase, etc.

Daniel Bates

Comment 1 2013-12-04 13:47:23 PST

Created attachment 218443 [details] Patch

WebKit Commit Bot

Comment 2 2013-12-04 13:49:55 PST

Attachment 218443 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/rendering/InlineBox.cpp', u'Source/WebCore/rendering/InlineBox.h', u'Source/WebCore/rendering/InlineTextBox.cpp', u'Source/WebCore/rendering/RenderBlock.cpp', u'Source/WebCore/rendering/RenderBlock.h', u'Source/WebCore/rendering/RenderBox.cpp', u'Source/WebCore/rendering/RenderBox.h', u'Source/WebCore/rendering/RenderBoxModelObject.cpp', u'Source/WebCore/rendering/RenderButton.cpp', u'Source/WebCore/rendering/RenderElement.cpp', u'Source/WebCore/rendering/RenderEmbeddedObject.cpp', u'Source/WebCore/rendering/RenderFileUploadControl.cpp', u'Source/WebCore/rendering/RenderFrameSet.cpp', u'Source/WebCore/rendering/RenderIFrame.h', u'Source/WebCore/rendering/RenderImage.cpp', u'Source/WebCore/rendering/RenderImage.h', u'Source/WebCore/rendering/RenderInline.cpp', u'Source/WebCore/rendering/RenderInline.h', u'Source/WebCore/rendering/RenderLayer.cpp', u'Source/WebCore/rendering/RenderLayer.h', u'Source/WebCore/rendering/RenderLayerBacking.cpp', u'Source/WebCore/rendering/RenderLayerBacking.h', u'Source/WebCore/rendering/RenderLayerCompositor.cpp', u'Source/WebCore/rendering/RenderLayerCompositor.h', u'Source/WebCore/rendering/RenderLayerFilterInfo.h', u'Source/WebCore/rendering/RenderMenuList.cpp', u'Source/WebCore/rendering/RenderMenuList.h', u'Source/WebCore/rendering/RenderObject.cpp', u'Source/WebCore/rendering/RenderObject.h', u'Source/WebCore/rendering/RenderScrollbar.h', u'Source/WebCore/rendering/RenderSearchField.cpp', u'Source/WebCore/rendering/RenderText.cpp', u'Source/WebCore/rendering/RenderText.h', u'Source/WebCore/rendering/RenderTextControl.cpp', u'Source/WebCore/rendering/RenderTextControl.h', u'Source/WebCore/rendering/RenderTextControlMultiLine.cpp', u'Source/WebCore/rendering/RenderTextControlSingleLine.cpp', u'Source/WebCore/rendering/RenderTextLineBoxes.cpp', u'Source/WebCore/rendering/RenderTheme.cpp', u'Source/WebCore/rendering/RenderTheme.h', u'Source/WebCore/rendering/RenderThemeIOS.h', u'Source/WebCore/rendering/RenderThemeIOS.mm', u'Source/WebCore/rendering/RenderThemeMac.h', u'Source/WebCore/rendering/RenderThemeMac.mm', u'Source/WebCore/rendering/RenderVideo.cpp', u'Source/WebCore/rendering/RenderView.cpp', u'Source/WebCore/rendering/RenderView.h', u'Source/WebCore/rendering/RenderWidget.cpp', u'Source/WebCore/rendering/RootInlineBox.cpp', u'Source/WebCore/rendering/break_lines.cpp', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/rendering/RenderLayer.cpp:185: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayer.cpp:2725: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayer.cpp:2725: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderImage.cpp:89: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderImage.cpp:90: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderImage.cpp:90: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/rendering/RenderImage.cpp:91: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderImage.cpp:92: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderImage.cpp:93: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderImage.cpp:94: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderImage.cpp:94: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/rendering/RenderImage.cpp:95: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderImage.cpp:95: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/rendering/RenderImage.cpp:96: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderImage.cpp:96: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/rendering/RenderView.cpp:374: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderMenuList.cpp:81: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderBox.cpp:2937: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderBox.cpp:2937: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/rendering/RenderBox.cpp:2940: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderBox.cpp:2940: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/rendering/RenderBox.cpp:2942: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderBox.cpp:2942: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/rendering/RenderBox.cpp:2945: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderBox.cpp:2945: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] ERROR: Source/WebCore/rendering/RenderBox.cpp:2947: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:432: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:433: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:435: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:437: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:446: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:447: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderText.cpp:372: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderFileUploadControl.cpp:106: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderFileUploadControl.cpp:107: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderFileUploadControl.cpp:109: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] Total errors found: 36 in 52 files If any of these errors are false positives, please file a bug against check-webkit-style.

EFL EWS Bot

Comment 3 2013-12-04 13:52:39 PST

Comment on attachment 218443 [details] Patch Attachment 218443 [details] did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/39938327

Build Bot

Comment 4 2013-12-04 14:01:05 PST

Comment on attachment 218443 [details] Patch Attachment 218443 [details] did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/40238044

kov's GTK+ EWS bot

Comment 5 2013-12-04 14:18:41 PST

Comment on attachment 218443 [details] Patch Attachment 218443 [details] did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/39738095

Daniel Bates

Comment 6 2013-12-04 14:21:32 PST

(In reply to comment #2) > ERROR: Source/WebCore/rendering/RenderLayer.cpp:185: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderLayer.cpp:2725: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderLayer.cpp:2725: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] See bug #125254. > ERROR: Source/WebCore/rendering/RenderImage.cpp:89: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderImage.cpp:90: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderImage.cpp:90: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] > ERROR: Source/WebCore/rendering/RenderImage.cpp:91: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderImage.cpp:92: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderImage.cpp:93: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderImage.cpp:94: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderImage.cpp:94: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] > ERROR: Source/WebCore/rendering/RenderImage.cpp:95: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderImage.cpp:95: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] > ERROR: Source/WebCore/rendering/RenderImage.cpp:96: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderImage.cpp:96: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] See bug #125246. In particular, the first error (RenderImage.cpp:89) is covered by this bug. I suspect the subsequent warnings are fallout from this bug. > ERROR: Source/WebCore/rendering/RenderView.cpp:374: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] See bug #125246. > ERROR: Source/WebCore/rendering/RenderMenuList.cpp:81: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] See bug #125254. > ERROR: Source/WebCore/rendering/RenderBox.cpp:2937: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderBox.cpp:2937: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] > ERROR: Source/WebCore/rendering/RenderBox.cpp:2940: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderBox.cpp:2940: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] > ERROR: Source/WebCore/rendering/RenderBox.cpp:2942: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderBox.cpp:2942: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] > ERROR: Source/WebCore/rendering/RenderBox.cpp:2945: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderBox.cpp:2945: Comma should be at the beggining of the line in a member initialization list. [whitespace/init] [4] > ERROR: Source/WebCore/rendering/RenderBox.cpp:2947: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] See bug #125246. > ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:432: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:433: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:435: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:437: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:446: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:447: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] See bug #125254. > ERROR: Source/WebCore/rendering/RenderText.cpp:372: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] See bug #125246. > ERROR: Source/WebCore/rendering/RenderFileUploadControl.cpp:106: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] > ERROR: Source/WebCore/rendering/RenderFileUploadControl.cpp:107: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] See bug #125254. > ERROR: Source/WebCore/rendering/RenderFileUploadControl.cpp:109: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] See bug #125246.

Build Bot

Comment 7 2013-12-04 14:22:18 PST

Comment on attachment 218443 [details] Patch Attachment 218443 [details] did not pass win-ews (win): Output: http://webkit-queues.appspot.com/results/39738092

Daniel Bates

Comment 8 2013-12-04 14:53:08 PST

Created attachment 218458 [details] Patch

WebKit Commit Bot

Comment 9 2013-12-04 14:56:21 PST

Attachment 218458 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/rendering/InlineBox.cpp', u'Source/WebCore/rendering/InlineBox.h', u'Source/WebCore/rendering/InlineTextBox.cpp', u'Source/WebCore/rendering/RenderBlock.cpp', u'Source/WebCore/rendering/RenderBlock.h', u'Source/WebCore/rendering/RenderBox.cpp', u'Source/WebCore/rendering/RenderBox.h', u'Source/WebCore/rendering/RenderBoxModelObject.cpp', u'Source/WebCore/rendering/RenderButton.cpp', u'Source/WebCore/rendering/RenderElement.cpp', u'Source/WebCore/rendering/RenderEmbeddedObject.cpp', u'Source/WebCore/rendering/RenderFileUploadControl.cpp', u'Source/WebCore/rendering/RenderFrameSet.cpp', u'Source/WebCore/rendering/RenderIFrame.h', u'Source/WebCore/rendering/RenderImage.cpp', u'Source/WebCore/rendering/RenderImage.h', u'Source/WebCore/rendering/RenderInline.cpp', u'Source/WebCore/rendering/RenderInline.h', u'Source/WebCore/rendering/RenderLayer.cpp', u'Source/WebCore/rendering/RenderLayer.h', u'Source/WebCore/rendering/RenderLayerBacking.cpp', u'Source/WebCore/rendering/RenderLayerBacking.h', u'Source/WebCore/rendering/RenderLayerCompositor.cpp', u'Source/WebCore/rendering/RenderLayerCompositor.h', u'Source/WebCore/rendering/RenderLayerFilterInfo.h', u'Source/WebCore/rendering/RenderMenuList.cpp', u'Source/WebCore/rendering/RenderMenuList.h', u'Source/WebCore/rendering/RenderObject.cpp', u'Source/WebCore/rendering/RenderObject.h', u'Source/WebCore/rendering/RenderScrollbar.h', u'Source/WebCore/rendering/RenderSearchField.cpp', u'Source/WebCore/rendering/RenderText.cpp', u'Source/WebCore/rendering/RenderText.h', u'Source/WebCore/rendering/RenderTextControl.cpp', u'Source/WebCore/rendering/RenderTextControl.h', u'Source/WebCore/rendering/RenderTextControlMultiLine.cpp', u'Source/WebCore/rendering/RenderTextControlSingleLine.cpp', u'Source/WebCore/rendering/RenderTextLineBoxes.cpp', u'Source/WebCore/rendering/RenderTheme.cpp', u'Source/WebCore/rendering/RenderTheme.h', u'Source/WebCore/rendering/RenderThemeIOS.h', u'Source/WebCore/rendering/RenderThemeIOS.mm', u'Source/WebCore/rendering/RenderThemeMac.h', u'Source/WebCore/rendering/RenderThemeMac.mm', u'Source/WebCore/rendering/RenderVideo.cpp', u'Source/WebCore/rendering/RenderView.cpp', u'Source/WebCore/rendering/RenderView.h', u'Source/WebCore/rendering/RenderWidget.cpp', u'Source/WebCore/rendering/RootInlineBox.cpp', u'Source/WebCore/rendering/break_lines.cpp', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/rendering/RenderLayer.cpp:185: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderMenuList.cpp:81: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] Total errors found: 2 in 52 files If any of these errors are false positives, please file a bug against check-webkit-style.

EFL EWS Bot

Comment 10 2013-12-04 16:52:53 PST

Comment on attachment 218458 [details] Patch Attachment 218458 [details] did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/42728037

EFL EWS Bot

Comment 11 2013-12-04 18:52:48 PST

Comment on attachment 218458 [details] Patch Attachment 218458 [details] did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/43328073

Daniel Bates

Comment 12 2013-12-06 10:08:05 PST

Created attachment 218603 [details] Patch

WebKit Commit Bot

Comment 13 2013-12-06 10:09:56 PST

Attachment 218603 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/rendering/InlineBox.cpp', u'Source/WebCore/rendering/InlineBox.h', u'Source/WebCore/rendering/InlineTextBox.cpp', u'Source/WebCore/rendering/RenderBlock.cpp', u'Source/WebCore/rendering/RenderBlock.h', u'Source/WebCore/rendering/RenderBox.cpp', u'Source/WebCore/rendering/RenderBox.h', u'Source/WebCore/rendering/RenderBoxModelObject.cpp', u'Source/WebCore/rendering/RenderButton.cpp', u'Source/WebCore/rendering/RenderElement.cpp', u'Source/WebCore/rendering/RenderEmbeddedObject.cpp', u'Source/WebCore/rendering/RenderFileUploadControl.cpp', u'Source/WebCore/rendering/RenderFrameSet.cpp', u'Source/WebCore/rendering/RenderIFrame.h', u'Source/WebCore/rendering/RenderImage.cpp', u'Source/WebCore/rendering/RenderImage.h', u'Source/WebCore/rendering/RenderInline.cpp', u'Source/WebCore/rendering/RenderInline.h', u'Source/WebCore/rendering/RenderLayer.cpp', u'Source/WebCore/rendering/RenderLayer.h', u'Source/WebCore/rendering/RenderLayerBacking.cpp', u'Source/WebCore/rendering/RenderLayerBacking.h', u'Source/WebCore/rendering/RenderLayerCompositor.cpp', u'Source/WebCore/rendering/RenderLayerCompositor.h', u'Source/WebCore/rendering/RenderLayerFilterInfo.h', u'Source/WebCore/rendering/RenderMenuList.cpp', u'Source/WebCore/rendering/RenderMenuList.h', u'Source/WebCore/rendering/RenderObject.cpp', u'Source/WebCore/rendering/RenderObject.h', u'Source/WebCore/rendering/RenderScrollbar.h', u'Source/WebCore/rendering/RenderSearchField.cpp', u'Source/WebCore/rendering/RenderText.cpp', u'Source/WebCore/rendering/RenderText.h', u'Source/WebCore/rendering/RenderTextControl.cpp', u'Source/WebCore/rendering/RenderTextControl.h', u'Source/WebCore/rendering/RenderTextControlMultiLine.cpp', u'Source/WebCore/rendering/RenderTextControlSingleLine.cpp', u'Source/WebCore/rendering/RenderTextLineBoxes.cpp', u'Source/WebCore/rendering/RenderTheme.cpp', u'Source/WebCore/rendering/RenderTheme.h', u'Source/WebCore/rendering/RenderThemeIOS.h', u'Source/WebCore/rendering/RenderThemeIOS.mm', u'Source/WebCore/rendering/RenderThemeMac.h', u'Source/WebCore/rendering/RenderThemeMac.mm', u'Source/WebCore/rendering/RenderVideo.cpp', u'Source/WebCore/rendering/RenderView.cpp', u'Source/WebCore/rendering/RenderView.h', u'Source/WebCore/rendering/RenderWidget.cpp', u'Source/WebCore/rendering/RootInlineBox.cpp', u'Source/WebCore/rendering/break_lines.cpp', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/rendering/RenderLayer.cpp:185: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderMenuList.cpp:81: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] Total errors found: 2 in 52 files If any of these errors are false positives, please file a bug against check-webkit-style.

Simon Fraser (smfr)

Comment 14 2013-12-06 10:54:43 PST

Comment on attachment 218603 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218603&action=review Pleaes refresh from iOS sources. I think longer term we should replace #if PLATFORM(IOS) with functional macros, like #if USE(TOUCH_OVERFLOW_SCROLLING) or whatever. > Source/WebCore/rendering/InlineTextBox.cpp:1018 > + float documentScale = renderer().frame().documentScale(); This is stale code. > Source/WebCore/rendering/RenderBlock.cpp:3569 > + // On the phone we want to constrain VisiblePositions to the editable region closest to the input position, so "On the phone" -> "On iOS" > Source/WebCore/rendering/RenderLayerCompositor.cpp:2681 > +#if PLATFORM(IOS) > +float RenderLayerCompositor::minimumDocumentScale() const > +{ > + return m_renderView.frameView().frame().minimumDocumentScale(); > +} > + > +bool RenderLayerCompositor::allowCompositingLayerVisualDegradation() const > +{ > + Page* page = m_renderView.frameView().frame().page(); > + return !page || page->settings().allowCompositingLayerVisualDegradation(); > +} > +#endif > + > float RenderLayerCompositor::deviceScaleFactor() const > { > +#if PLATFORM(IOS) > + return m_renderView.frameView().frame().deviceScaleFactor(); > +#else > Page* page = this->page(); > return page ? page->deviceScaleFactor() : 1; > +#endif > } > > float RenderLayerCompositor::pageScaleFactor() const > { > +#if PLATFORM(IOS) > + return m_renderView.frameView().frame().documentScale(); > +#else > Page* page = this->page(); > return page ? page->pageScaleFactor() : 1; > +#endif > } Your patch is stale here. > Source/WebCore/rendering/RenderMenuList.cpp:52 > +#include "LocalizedStrings.h" Is this necessary? > Source/WebCore/rendering/RenderObject.cpp:1156 > +// which are annotated with additional state which helps the iPhone draw selections in its unique way. the iPhone -> iOS

Daniel Bates

Comment 15 2013-12-06 11:30:39 PST

(In reply to comment #14) > (From update of attachment 218603 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=218603&action=review > > Pleaes refresh from iOS sources. > > I think longer term we should replace #if PLATFORM(IOS) with functional macros, like #if USE(TOUCH_OVERFLOW_SCROLLING) or whatever. > I agree. I'll look to fix this up and/or file follow-up bugs as applicable. > > Source/WebCore/rendering/InlineTextBox.cpp:1018 > > + float documentScale = renderer().frame().documentScale(); > > This is stale code. Will fix. > > > Source/WebCore/rendering/RenderBlock.cpp:3569 > > + // On the phone we want to constrain VisiblePositions to the editable region closest to the input position, so > > "On the phone" -> "On iOS" > Will fix. > > Source/WebCore/rendering/RenderLayerCompositor.cpp:2681 > > +#if PLATFORM(IOS) > > +float RenderLayerCompositor::minimumDocumentScale() const > > +{ > > + return m_renderView.frameView().frame().minimumDocumentScale(); > > +} > > + > > +bool RenderLayerCompositor::allowCompositingLayerVisualDegradation() const > > +{ > > + Page* page = m_renderView.frameView().frame().page(); > > + return !page || page->settings().allowCompositingLayerVisualDegradation(); > > +} > > +#endif > > + > > float RenderLayerCompositor::deviceScaleFactor() const > > { > > +#if PLATFORM(IOS) > > + return m_renderView.frameView().frame().deviceScaleFactor(); > > +#else > > Page* page = this->page(); > > return page ? page->deviceScaleFactor() : 1; > > +#endif > > } > > > > float RenderLayerCompositor::pageScaleFactor() const > > { > > +#if PLATFORM(IOS) > > + return m_renderView.frameView().frame().documentScale(); > > +#else > > Page* page = this->page(); > > return page ? page->pageScaleFactor() : 1; > > +#endif > > } > > Your patch is stale here. Will fix. > > > Source/WebCore/rendering/RenderMenuList.cpp:52 > > +#include "LocalizedStrings.h" > > Is this necessary? > Yes, it's necessary as we call htmlSelectMultipleItems() (defined in LocalizedStrings.h) in RenderMenuList::setTextFromOption(). > > Source/WebCore/rendering/RenderObject.cpp:1156 > > +// which are annotated with additional state which helps the iPhone draw selections in its unique way. > > the iPhone -> iOS Will fix.

Daniel Bates

Comment 16 2013-12-06 11:56:54 PST

Committed r160236: <http://trac.webkit.org/changeset/160236>

Daniel Bates

Comment 17 2013-12-23 15:22:32 PST

Committed iOS build fix in <http://trac.webkit.org/changeset/161028>.

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