summaryrefslogtreecommitdiffstats
path: root/WebCore/page/FrameView.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-1/+1
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-201-10/+5
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Fix conflictsSteve Block2010-07-091-5/+1
| | | | | | | | | | HTMLDocumentParser.cpp - Conflict due to Android instrumentation - http://trac.webkit.org/changeset/62033 FrameView.cpp - Conflict due to iframe flattening - http://trac.webkit.org/changeset/62135 Settings.cpp/h - Conflict due to Android plugins - http://trac.webkit.org/changeset/62284 DragData.h - Conflict due to Android special-case - http://trac.webkit.org/changeset/62124 RenderThemeAndroid.cpp/h - Conflict due to not-yet-upstreamed video - http://trac.webkit.org/changeset/62104 Change-Id: If5bd7bf0de525454166c3ccea050da55b29644c3
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-1/+5
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Fix issue 2823805: let expanded iframe scroll.Shimeng (Simon) Wang2010-07-081-0/+2
| | | | | issue: 2823805 Change-Id: I39e24cd1359df0d0a44d7eee60a62a1990d74861
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-14/+101
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-0/+5
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-0/+80
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-4/+37
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-14/+18
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* 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 : Resolve merge conflictsSteve Block2010-05-111-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f - CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447 - Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request - Document.h - Take both, conflicts due to ANDROID_META_SUPPORT - DragImage.h - Take both, conflict due to Android addition - EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request - EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS - EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909 - FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS - FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE - FrameView.cpp - Take both, conflict due to Android frame flattening - Geolocation.h - Merge conflicts due to Android-specific changes - Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge - GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards - Gradient.h - Take both, conflict due to Android addition - HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7 - HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element - JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging - MediaPlayer.cpp/h - Take both, conflict due to Android-specific change - PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff - RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening - RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code - Settings.cpp/h - Conflict due to ANDROID_PLUGINS - TextInputController.h - Take upstream, git got confused - V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29 - V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards - WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge - Widget.h - Take both, conflict due to Android addition - jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset - mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-26/+109
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-1/+19
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* 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
generated by cgit v1.1 at 2025-11-28 08:57:12 +0000