summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderBlock.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-42/+89
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-14/+0
| | | | | | | | | | | | | | | Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-38/+100
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* am ffe27b58: Integrate WebKit security fix ↵Grace Kloba2009-11-171-7/+10
|\ | | | | | | | | | | | | | | | | http://trac.webkit.org/changeset/50466 Merge commit 'ffe27b58c77e71641efd3bd4258323cd4c29c39a' into eclair-mr2 * commit 'ffe27b58c77e71641efd3bd4258323cd4c29c39a': Integrate WebKit security fix
| * Integrate WebKit security fixGrace Kloba2009-11-171-7/+10
| | | | | | | | | | http://trac.webkit.org/changeset/50466 Fix http://b/issue?id=2268722
* | Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-338/+235
|/ | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-51/+30
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-30/+51
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-63/+122
|
* Get WebKit r44544.Feng Qian2009-06-171-145/+172
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-482/+833
| | | | Automated import of CL 145796
* AI 144458: Remove our hack to prevent drawing the selection, and set our ↵Leon Scroggins2009-04-031-11/+0
| | | | | | selection color to transparent. This gets us the same result while simplifying the merge. Automated import of CL 144458
* Automated import from //branches/master/...@141440,141440Grace Kloba2009-03-241-0/+7
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-413/+438
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+4697
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-4697/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-374/+615
|
* Initial ContributionThe Android Open Source Project2008-10-211-31/+88
|
* external/webkit r30707Upstream1970-01-121-0/+4399
generated by cgit v1.1 at 2025-11-30 21:13:01 +0000