summaryrefslogtreecommitdiffstats
path: root/WebCore/page/FrameView.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-2558/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-101-48/+101
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Fix scrolling on sites hosting content inside a single <frame>Ben Murdoch2011-03-151-9/+5
| | | | | | | | | | | | Force a layout of the frameview when we detect that a frames content post flattening is wider than the original frame. Also force a relayout of the frame as necessary to sync the correct dimensions (i.e. when navigation occurs inside the frame) Bug:4051085 Change-Id: Ib2543601a71b6931bb3ec4bfda75a2cac26bb2a1
* Fix frameset expansion.Patrick Scott2011-02-251-10/+10
| | | | | | | | | | Do not expand frames that cannot scroll. Use contentsWidth and contentsHeight instead of exposing docWidth. Trigger a layout of the parent if the FrameView's layout reveals a larger content dimension. Remove iframe flattening code. Bug: 3370518 Bug: 3323913 Change-Id: I60e89caf335bfaf271f90ffd538c65f3735572da
* Improve the fixed element position calculationTeng-Hui Zhu2011-02-091-0/+23
| | | | | | | | | | | | | | | | | | | | | | In the previous WAR, we get the screen size from UI thread at every draw call. That is awkward. Now with Java side fix, we can get the screen size from setSize call now. However, forcing a full re-layout seems like an expensive operation. What we need to make the webkit to know the update can be done by just updating the fixed position elements only. So I have done these: 1. Take away the WAR by forcing the update at the convertToLayerCoord. 2. Get rid of the UI thread stuff used to tell WebViewCore the screen size. And get rid of the redundant variables, too. 3. update the fixed element at the setSize time. BTW, I also rename the PlatformBridge functions name. bug: 3397602 Change-Id: I0c422ecdb570de89aecb6e568d5067acf18ecfc6
* Fix some sites not responding.Patrick Scott2011-01-181-30/+27
| | | | | | | | | | | | Enter compositing for iframes after all layout tasks have completed. Remember the state of overflow scroll similar to RenderLayer so that it doesn't change while updating the compositing state. Return false in requiresAcceleratedCompositing if the iframe is hidden. I verified that this fails on Safari and have submitted a bug. Bug: 3325187 Change-Id: I20a9e1a595d14518f4c7a3e01fc1c4fa9035262c
* Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-161-2/+5
| | | | | | http://svn.webkit.org/repository/webkit/branches/chromium/597/WebCore@75681 Change-Id: Ibe552cf7af31f74b81e337eadf3d3b73a53daf60
* Remove ANDROID_SCROLL_ON_GOTO_ANCHOR in WebCore/config.hShimeng (Simon) Wang2011-01-071-7/+0
| | | | | | | | | This helps scrolling to a page#anchor link as shown in the bug. Not sure I understand the reason to have that setting at the first place. issue: 3225233 Change-Id: If2960d3c77be94b150e138a534007708f025dbad
* Merge WebKit at Chromium 9.0.597.55: trivial merge by gitBen Murdoch2011-01-071-1/+10
| | | | Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-061-5/+1
| | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
* Fix mlb shopping site not drawing correctly.Patrick Scott2011-01-041-0/+3
| | | | | | | Return false in hasOverflowScroll if flattening is on. Bug: 3309139 Change-Id: Ia4c981fab26154a38e66412d7e2938da32e7d718
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-221-15/+18
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Fix iframe scrolling.Patrick Scott2010-12-211-10/+25
| | | | | | | | | | | | | Do the same check everywhere for enabling scrolling in an iframe. Make sure the owner renderer is a RenderIFrame to avoid trying to composite an embedded object. Also check if the owner layer has visible content since some iframes are marked hidden. Dirty the parent normal flow list when turning on overflow scrolling for divs. Bug: 3280851 Bug: 3290276 Change-Id: I8d0a49324e06426c15abaf552874a32d6e2ee11a
* Turn off iframe compositing until it is more stable.Patrick Scott2010-12-171-1/+1
| | | | Change-Id: I2d54918b5910285bf7f1cfb408af8a6b038b65f9
* Do the same compositing check during layout.Patrick Scott2010-12-141-2/+7
| | | | | Change-Id: Ia38edb0a66f538d2020bdb9623e2fd2d7f3af97e Fix: 3280851
* Enable iframe scrolling.Patrick Scott2010-12-131-0/+7
| | | | | | | | | | Turn off iframe expansion and record iframes in a composited layer. Fix navigation by tracking iframe layers if needed. Remove the logic to add focused nodes to the last tracked layer as it is not needed and might add nodes to the wrong layer. Bug: 3219076, 3211666, 3201077, 3194321 Change-Id: Ifc0b83102438255db7e4b62ad260f50ebbdb0e50
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-0/+3
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-171-23/+118
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-091-3/+27
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge Webkit at r70209: Fix conflictsBen Murdoch2010-10-261-46/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/page/FrameView.cpp http://trac.webkit.org/changeset/69896 WebCore/html/parser/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/69283 WebCore/html/HTMLPlugInElement.h http://trac.webkit.org/changeset/69596 WebCore/html/HTMLInputElement.cpp http://trac.webkit.org/changeset/68996 http://trac.webkit.org/changeset/69378 WebCore/plugins/npapi.cpp http://trac.webkit.org/changeset/69808 WebCore/css/CSSComputedStyleDeclaration.cpp http://trac.webkit.org/changeset/69220 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/69196 WebCore/rendering/style/RenderStyle.h http://trac.webkit.org/changeset/68680 WebCore/rendering/RenderImage.cpp http://trac.webkit.org/changeset/68917 WebCore/platform/android/FileSystemAndroid.cpp http://trac.webkit.org/changeset/69594 WebCore/inspector/InspectorController.h http://trac.webkit.org/changeset/68767 See also Android change I4c724f2f52a5a9db6dca6b58032b6a902aac74b5 which is why this is a conflict. JavaScriptCore/parser/Parser.cpp http://trac.webkit.org/changeset/69516 Change-Id: I5a708c6590ba029a2b3ecc3b30478ea303e1f2f5
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-20/+65
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-071-1/+1
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-291-94/+17
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-161-8/+36
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-111-24/+41
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Allow WebKit to scroll selection on screen.Leon Scroggins2010-09-101-2/+2
| | | | | | | | | Requires a change to frameworks/base Bug 2679411 Bug 2659028 Change-Id: I482cefadc24c620c6d07cbce44acc216bdb9b8df
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-021-15/+16
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231-1/+1
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-121-1/+1
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-091-8/+12
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-041-11/+32
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* 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
generated by cgit v1.1 at 2025-02-03 12:13:36 +0000