| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
| |
See http://trac.webkit.org/changeset/72852
Change-Id: I8ab3171330e475bec7eade78b35b11304f74579a
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
This is effectively a revert of
"Merge Webkit at r73109: render frame docWidth/docHeight method changed."
See http://trac.webkit.org/changeset/72852 and
http://trac.webkit.org/changeset/73063
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: I81915808439847dce87beefdd527f77962e074b5
|
| |
|
|
|
|
|
| |
Change-Id: I492d321eea76f2d2c5278e44ae9c2fe37b5834a6
See:
http://trac.webkit.org/changeset/72852
http://trac.webkit.org/changeset/73063
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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
|
| |
|
|
| |
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
|
| |
|
|
|
|
|
|
|
| |
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
|
| |
|
|
| |
Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
