summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderBlock.h
Commit message (Collapse)AuthorAgeFilesLines
* Fixes a PLATFORM(ANDROID) guard in RenderBlock.h which causes problems when ↵Steve Block2009-11-251-0/+4
| | | | | | | | | | | building on Mac. This code was modified recently to aid upstreaming by wrapping all Android changes in PLATFORM(ANDROID). To allow the build to succeed on other paltforms, we need to be more careful with our use of the guards. See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=bc7b84de3fd863c500a8169fd00dca3811cadbb3#patch28 Change-Id: I4b0151ad62023821171742c5dfbba1dd7b39d8ed
* Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-3/+10
| | | | | | | | | | | | | webkit.org. - Fixes whitespace discrepancies between webkit.org and Android versions - Re-orders Android-specific changes to minimise the diff with webkit.org - Makes sure all Android-specific changes are appropriately guarded. - Fixes some Android-specific style problems None of these should introduce any functional changes for PLATFORM(ANDROID). Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-31/+8
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-4/+2
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-2/+4
|
* Compilation fixes.Ben Murdoch2009-08-171-2/+3
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-128/+154
|
* Get WebKit r44544.Feng Qian2009-06-171-7/+9
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-69/+107
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-50/+36
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+506
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-506/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-62/+77
|
* Initial ContributionThe Android Open Source Project2008-10-211-8/+18
|
* external/webkit r30707Upstream1970-01-121-0/+481