summaryrefslogtreecommitdiffstats
path: root/WebCore/html/HTMLTokenizer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-121-0/+2
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-041-5/+2
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-201-3/+8
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-296/+437
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-0/+1493
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-2134/+0
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-49/+1
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Fix conflictsSteve Block2010-05-271-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | DeviceOrientation - WebCore/Android.derived.jscbindings.mk - WebCore/Android.derived.v8bindings.mk - WebCore/page/Page.cpp Trivial - WebCore/css/CSSParser.cpp - WebCore/page/Settings.cpp - WebCore/page/Settings.h - WebCore/rendering/style/RenderStyle.h Code deletion - See http://trac.webkit.org/changeset/59749 - WebCore/html/HTMLTokenizer.cpp PluginView JSC guards uspstreaming - WebCore/plugins/PluginView.cpp - WebCore/plugins/PluginView.h Refactoring, see http://trac.webkit.org/changeset/59784 - WebCore/rendering/RenderLayer.cpp RenderBlock::columnGap() and columnRects() are now public, see http://trac.webkit.org/changeset/59784 - WebCore/rendering/RenderBlock.h Change-Id: I409c68d334d60c3854b4b0365c18e6f63884afa6
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-133/+149
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-13/+5
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-10/+60
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Updates Document::setExtraLayoutDelay to reflect recent submission to ↵Steve Block2010-01-071-4/+0
| | | | | | | | | | | | | webkit.org. setExtraLayoutDelay was an Android addition and was upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=32875 Removes Document::extraLayoutDelay by incorporating the extra delay in Document::minimumLayoutDelay. Removes ANDROID_MOBILE guards, as this extra code is not inhernetly specific to Android, and is a no-op if Document::setExtraLayoutDelay is not called. This removes the last uses of ANDROID_MOBILE. Change-Id: I1e18a994f32b29558dcf9a5c76aefab62e9fc13d
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-14/+2
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-6/+29
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-4/+3
| | | | | | | | | | | | | 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-6/+20
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge in WebKit r47029.Ben Murdoch2009-08-111-42/+63
|
* am 14d2a338: Add security fix as seen in http://trac.webkit.org/changeset/44799Cary Clark2009-06-261-2/+6
|\ | | | | | | | | | | | | Merge commit '14d2a338a0dd9fe7f2e7833ce90aed2f6eef6e34' * commit '14d2a338a0dd9fe7f2e7833ce90aed2f6eef6e34': Add security fix as seen in http://trac.webkit.org/changeset/44799
| * Add security fix as seen in http://trac.webkit.org/changeset/44799Cary Clark2009-06-261-2/+6
| |
* | Get WebKit r44544.Feng Qian2009-06-171-7/+35
| |
* | AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-21/+9
|/ | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-404/+384
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+2087
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-2087/+0
|
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-30/+8
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-149/+383
|
* Initial ContributionThe Android Open Source Project2008-10-211-295/+163
|
* external/webkit r30707Upstream1970-01-121-0/+2007
generated by cgit v1.1 at 2025-05-15 13:20:24 +0000