summaryrefslogtreecommitdiffstats
path: root/WebCore/html/HTMLFrameSetElement.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-021-9/+0
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r64523 : Fix other conflictsSteve Block2010-08-091-4/+0
| | | | | | | | | | | | | | | | | | | | | - WebCore/Android.mk Conflict due to error introduced upstream. See http://trac.webkit.org/changeset/64344/trunk/WebCore/Android.mk and http://trac.webkit.org/changeset/60228/trunk/WebCore/Android.mk - WebCore/html/HTMLFrameSetElement.cpp Conflict due to ANDROID_FLATTEN_FRAMESET See http://trac.webkit.org/changeset/64383 - WebCore/page/Navigator.h Conflict due to APPLICATION_INSTALLED See http://trac.webkit.org/changeset/64371 - WebCore/rendering/SVGResourcesCycleSolver.cpp Conflict due to local ENABLE(FILTERS) guard See http://trac.webkit.org/changeset/64440 Change-Id: Ibafe3b92117c3a7b3eaaa44c6cf3d04c8c6027c2
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-091-0/+4
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-20/+0
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-1/+1
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-15/+8
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-3/+3
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge webkit.org at r58033 : Move Android iframe-flattening code to ↵Steve Block2010-05-111-1/+1
| | | | | | | | | | | | | | | | | | | RenderIFrame.cpp The Android iframe-flattening code was in RenderPartObject. The rendering classes have been refactored upstream in http://trac.webkit.org/changeset/57866 so that most of RenderPartObject was moved to RenderIFrame. RenderPartObject was then removed in http://trac.webkit.org/changeset/57900. Iframe-flattening was also added upstream in http://trac.webkit.org/changeset/56718. This change takes the Android iframe-flattening code from RenderPartObject and moves it to RenderIFrame. It also renames FLATTEN_IFRAME to ANDROID_FLATTEN_IFRAME and FLATTEN_FRAMESET to ANDROID_FLATTEN_FRAMESET for clarity. Change-Id: I1af8d042f8d0c4abd513f8a315ac681360c1cc53
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-0/+4
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-0/+2
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-110/+4
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-21/+11
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-11/+21
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-6/+132
|
* Get WebKit r44544.Feng Qian2009-06-171-8/+9
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-4/+3
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+220
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-220/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-7/+7
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+3
|
* external/webkit r30707Upstream1970-01-121-0/+217
generated by cgit v1.1 at 2025-05-18 12:24:40 +0000