summaryrefslogtreecommitdiffstats
path: root/WebCore/page/FrameView.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r54731 : Fix merge conflicts due to frame flatteningSteve Block2010-02-161-3/+3
| | | | | | | | | Common frame flattening code was added upstream in http://trac.webkit.org/changeset/54440 We take this code, but also keep the current Android-specific implementation. Currently, the common code is disabled and we continue to use the Android version. The two will be combined at a later date. Change-Id: I194c7028b84a05d85040ca6199802c42a520be96
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-3/+12
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-25/+46
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Updates Document::setExtraLayoutDelay to reflect recent submission to ↵Steve Block2010-01-071-8/+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 : Fix general conflicts.Steve Block2009-12-171-13/+4
| | | | | | | | | | | | | | | 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-22/+70
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-101-0/+11
| | | | | | | Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor. See http://trac.webkit.org/changeset/49608 Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-0/+79
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* capture offscreen invalidates in webkitCary Clark2009-11-101-2/+5
| | | | | | | | | | | | | | The latest update of webkit changed the way drawing invalidates are captured. ScrollView::repaintContentRectangle now includes an intersect test that short-circuits if rect to repaint is outside the visible content. FrameView::repaintContentRectangle had logic to capture offscreen drawing, but only if the repaint rect was entirely clipped out. This changes both FrameView and ScrollView to send partial repaints to the offscreen code, up to four rects per draw. fixes http://b/issue?id=2207086
* Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-0/+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-52/+159
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge in WebKit r47029.Ben Murdoch2009-08-111-22/+278
|
* Get WebKit r44544.Feng Qian2009-06-171-38/+80
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-73/+273
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-291/+311
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+1258
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-1258/+0
|
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-31/+4
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-352/+499
|
* Initial ContributionThe Android Open Source Project2008-10-211-6/+52
|
* external/webkit r30707Upstream1970-01-121-0/+1092