summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/break_lines.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-221-2/+2
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge Webkit at r64264 : Fix conflicts.Kristian Monsen2010-08-041-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracs of the changes: WebCore/html/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/63998/trunk/WebCore/html/HTMLDocumentParser.cpp WebCore/page/EventHandler.cpp WebCore/page/EventHandler.h http://trac.webkit.org/changeset/63888 WebCore/page/Page.cpp http://trac.webkit.org/changeset/64208 WebCore/page/Settings.cpp WebCore/page/Settings.h http://trac.webkit.org/changeset/64110 WebCore/rendering/RenderLayerCompositor.h http://trac.webkit.org/changeset/64054/trunk/WebCore/rendering/RenderLayerCompositor.h WebCore/rendering/RenderTableSection.cpp http://trac.webkit.org/changeset/63994/trunk/WebCore/rendering/RenderTableSection.cpp WebCore/rendering/break_lines.cpp http://trac.webkit.org/changeset/64207 Change-Id: I34167b43899ee5066e33b40867cd569ce53f9207
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-041-28/+91
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge webkit.org at r54127 : Fix merge conflict in break_lines.cppSteve Block2010-02-041-7/+4
| | | | | | See http://trac.webkit.org/changeset/53839 Change-Id: I123e8296c4b6bcfa4abd70ef67f9db14275bdf4c
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-20/+45
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* 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
* Get WebKit r44544.Feng Qian2009-06-171-3/+3
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+124
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-124/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-0/+6
|
* Initial ContributionThe Android Open Source Project2008-10-211-6/+4
|
* external/webkit r30707Upstream1970-01-121-0/+120