Bug 121049

Summary:

Move all collapsing margin code out of RenderBlock and into RenderBlockFlow

Product:

WebKit

Reporter:

Dave Hyatt <hyatt>

Component:

Layout and Rendering

Assignee:

Dave Hyatt <hyatt>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

bdakin, commit-queue, esprehn+autocc, glenn, kondapallykalyan, WebkitBugTracker

Priority:

Version:

528+ (Nightly build)

Hardware:

Unspecified

OS:

Unspecified

Bug Depends on:

Bug Blocks:

84924

Attachments:

Description	Flags
Patch	none
New patch that should pass style queue	none
Patch	dino: review+

Dave Hyatt

Reported 2013-09-09 14:42:16 PDT

Move all collapsing margin code out of RenderBlock and into RenderBlockFlow.

Attachments
Patch (132.98 KB, patch) 2013-09-09 14:45 PDT, Dave Hyatt	no flags	Details Formatted Diff Diff
New patch that should pass style queue (132.92 KB, patch) 2013-09-09 14:53 PDT, Dave Hyatt	no flags	Details Formatted Diff Diff
Patch (132.91 KB, patch) 2013-09-09 14:57 PDT, Dave Hyatt	dino: review+	Details Formatted Diff Diff
Show Obsolete (2) View All Add attachment proposed patch, testcase, etc.

Dave Hyatt

Comment 1 2013-09-09 14:45:49 PDT

Created attachment 211089 [details] Patch

WebKit Commit Bot

Comment 2 2013-09-09 14:48:48 PDT

Attachment 211089 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/rendering/RenderBlock.cpp', u'Source/WebCore/rendering/RenderBlock.h', u'Source/WebCore/rendering/RenderBlockFlow.cpp', u'Source/WebCore/rendering/RenderBlockFlow.h', u'Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp', u'Source/WebCore/rendering/RenderTable.cpp']" exit_code: 1 Source/WebCore/rendering/RenderBlockFlow.h:123: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.h:129: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlock.h:1001: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/rendering/RenderBlockFlow.cpp:62: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:64: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:65: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] Source/WebCore/rendering/RenderBlockFlow.cpp:65: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:459: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:462: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:463: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:531: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:587: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:635: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:637: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:642: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:643: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:644: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:678: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:679: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:691: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:869: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:905: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:906: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:1213: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/rendering/RenderBlockFlow.cpp:1235: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 25 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style.

Dave Hyatt

Comment 3 2013-09-09 14:53:11 PDT

Created attachment 211091 [details] New patch that should pass style queue

WebKit Commit Bot

Comment 4 2013-09-09 14:54:34 PDT

Attachment 211091 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/rendering/RenderBlock.cpp', u'Source/WebCore/rendering/RenderBlock.h', u'Source/WebCore/rendering/RenderBlockFlow.cpp', u'Source/WebCore/rendering/RenderBlockFlow.h', u'Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp', u'Source/WebCore/rendering/RenderTable.cpp']" exit_code: 1 Source/WebCore/rendering/RenderBlock.h:1001: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/rendering/RenderBlockFlow.cpp:65: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Source/WebCore/rendering/RenderBlockFlow.cpp:587: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Total errors found: 3 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style.

Dave Hyatt

Comment 5 2013-09-09 14:57:44 PDT

Created attachment 211094 [details] Patch

Dave Hyatt

Comment 6 2013-09-11 12:49:51 PDT

Landed in r155555.

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