summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/rendering/RenderBlock.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Cherry-pick WebKit change r98561 to fix a rendering crashSteve Block2012-04-271-0/+5
| | | | | | | See http://trac.webkit.org/changeset/98561 Bug: 6329121 Change-Id: Ie015bf4cc144cd2514d687202e1b247f9ca0799b
* Cherry-pick WebKit change r96294 as a prerequisite for r98561Steve Block2012-04-271-8/+10
| | | | | | | See http://trac.webkit.org/changeset/96294 Bug: 6329121 Change-Id: If5e731adc2751a8fc55a7baa3d7c205f47964b17
* CSS Background image implementationNicolas Roard2012-04-241-1/+5
| | | | | | bug:1352305 Change-Id: Id9caaae9b9442729110b52c75004f634d8284db4
* Cherry-pick WebKit change r107627 to fix a LayoutTest crashSteve Block2012-04-121-16/+15
| | | | | | | | | LayoutTests/fast/multicol/span/split-flow-anonymous-wrapper-crash.html See http://trac.webkit.org/changeset/107627 Bug: 6328992 Change-Id: Icc964ad0a6eb967f56fc298577a3b4515e81e886
* Cherry-pick WebKit change r94541 as a prerequisite for r107627Steve Block2012-04-121-1/+15
| | | | | | | See http://trac.webkit.org/changeset/94541 Bug: 6328992 Change-Id: Ib21562da28126db4d1c2898af818f8f5569236e0
* Cherry-pick WebKit change r88854 as a prerequisite for r107627Steve Block2012-04-121-1/+1
| | | | | | | See http://trac.webkit.org/changeset/88854 Bug: 6328992 Change-Id: I87cfd2aa0d76dec9b511067ba150db700d297a63
* Cherry-pick WebKit change r105769 to fix a LayoutTest crashSteve Block2012-04-121-2/+4
| | | | | | | | | fast/multicol/clone-block-children-inline-mismatch-crash.html See http://trac.webkit.org/changeset/105769 Bug: 6329129 Change-Id: Ia48c7e50adb7de3fc1e897a0de90b62a1ca63786
* Cherry-pick WebKit change r90068 to fix a rendering crashSteve Block2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | Note that this change does not apply cleanly in RenderBlock::destroy() without r85869. r85869 was intended to be an optimization only, with no functional change. However, it introduced two crashes, one of which is fixed in r90068 and the other in r86060. To avoid the need to cherry-pick both r85869 and r86060 as prerequisites, the patch for r90068 was applied manually to give the correct end result in RenderBlock::destroy(). We now pass the LayoutTests added in r90068 and the LayoutTest added in r86060 does not crash. See http://trac.webkit.org/changeset/90068 Bug: 5496903 Change-Id: Ica6dc2c70a4cd5c781ae77df95a8a4033c097708
* Cherry-pick WebKit r100677 to fix a rendering crashSteve Block2012-02-281-8/+13
| | | | | | | | This fixes a crash from positioned generated content under run-in. See http://trac.webkit.org/changeset/100677. Bug: 6079158 Change-Id: I3d2012c58f47e71ae500e33551dfab5587b84534
* Cherry pick 97075John Reck2011-10-201-5/+1
| | | | | | Bug: 5491444 Change-Id: If97d58a3d590e8e972bceec61e3ae16860a30088
* Cherry-pick WebKit change 89836 to fix a crash due to floats not being removedSteve Block2011-10-141-0/+3
| | | | | | | | | This is part 2 of 2 of the fix. See http://trac.webkit.org/changeset/89836 Bug: 5249309 Change-Id: If23a41a8e75e5fb6ba9e84e481ca44a319f678ef
* Cherry-pick WebKit change 89165 to fix a crash due to floats not being removedSteve Block2011-10-141-4/+38
| | | | | | | | | This is part 1 of 2 of the fix. See http://trac.webkit.org/changeset/89165 Bug: 5249309 Change-Id: I1159aab70e1fa6d3025761423c4164682dc97b64
* Remove old customized code.Shimeng (Simon) Wang2011-06-211-7/+0
| | | | | | | | | | | | This fixes slashdot.org after recent webkit merge, since the removed code will sometimes require extra layout. This code is two years old, and related to iframe flattening, which is not used any more in Android. Android still does frameset flattening. Verified sites such as developer.android.com are still working. issue: 4753055 Change-Id: I69f78bec53671eb488b629bde7cc2c3158f1a510
* Merge WebKit at branches/chromium/742 r88085: Initial merge by git.Steve Block2011-06-141-21/+67
| | | | Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-101-97/+25
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-081-107/+185
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-021-183/+261
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-241-214/+316
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-231-2/+2
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-161-19/+9
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-0/+6111
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84