Issue 10170019: Merge 112935

Issue 10170019: Merge 112935 (Closed)

Created:
8 years, 8 months ago by Chris Evans

Modified:
8 years, 8 months ago

Reviewers:
kenrb, Hironori Bono

CC:
chromium-reviews

Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1084/

Visibility:
Public.

More Reviews

Description

Merge 112935 BUG=106413 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=114854

Patch Set 1 #

Total comments: 1

Created: 8 years, 8 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+20 lines, --2 lines)			Patch
A +	LayoutTests/fast/block/float/intruding-float-not-removed-from-descendant-crash.html	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
A +	LayoutTests/fast/block/float/intruding-float-not-removed-from-descendant-crash-expected.txt	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
M	Source/WebCore/rendering/RenderBlock.cpp	View	3 chunks	+22 lines, -0 lines	1 comment	Download

Messages

Total messages: 3 (0 generated)

Expand Messages | Collapse Messages

Hironori Bono

Greetings Chris, Unfortunately, this change causes build breaks on our official builders. Would it be ...

8 years, 8 months ago (2012-04-23 00:29:15 UTC) #2

kenrb

8 years, 8 months ago (2012-04-23 12:21:36 UTC) #3

I had forgotten about that problem: Ryosuke landed a change to RenderBlock.h
just before I uploaded my patch, causing compile errors on the merge.

In order to merge this without compile problems, you also have to merge:
http://trac.webkit.org/changeset/112566/

On 2012/04/23 00:29:15, Hironori Bono wrote:
> Greetings Chris,
> 
> Unfortunately, this change causes build breaks on our official builders. Would
> it be possible to replace isDescendant() with m_isDescendant?
> 
> (*1)
>
<http://chrome-master2.mtv.corp.google.com:8011/builders/win%2520beta/builds/6...>
> (*2)
>
<http://chrome-master2.mtv.corp.google.com:8011/builders/linux32%2520beta/buil...>
> (*3)
>
<http://chrome-master2.mtv.corp.google.com:8011/builders/mac%2520beta/builds/9...>
> 
> Regards,
> 
> Hironori Bono
> 
>
https://chromiumcodereview.appspot.com/10170019/diff/1/Source/WebCore/renderi...
> File Source/WebCore/rendering/RenderBlock.cpp (right):
> 
>
https://chromiumcodereview.appspot.com/10170019/diff/1/Source/WebCore/renderi...
> Source/WebCore/rendering/RenderBlock.cpp:4137: if
> (!floatingObject->isDescendant())
> It seems the M19 branch does not have
> RenderBlock::FloatingObject::isDescendant() and it causes build breaks on our
> official builders. Do we need to use 'floatingObject->m_isDescendant'?

Expand Messages | Collapse Messages