summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderFrame.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-1/+1
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* 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-3/+2
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-0/+1
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge in WebKit r47029.Ben Murdoch2009-08-111-0/+9
|
* Get WebKit r44544.Feng Qian2009-06-171-8/+6
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-1/+1
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+53
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-53/+0
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+3
|
* external/webkit r30707Upstream1970-01-121-0/+50