summaryrefslogtreecommitdiffstats
path: root/WebCore/loader/FrameLoader.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r58033 : Resolve merge conflictsSteve Block2010-05-111-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-231/+149
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-1/+3
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Make sure WebKit's page cache does not cache pages with unload handlers.Andrei Popescu2010-03-291-6/+0
| | | | | | Fix b: 2552004 Change-Id: Iac6737fbb9a1eca734ea7474f99ccf66ee916bd7
* Revert "Revive my change to not add anchor navigations to the history in ↵Patrick Scott2010-03-231-7/+0
| | | | | | some cases." This reverts commit a6e5d463b2fbb6ad4e154719d6846231a32764a7.
* Revive my change to not add anchor navigations to the history in some cases.Patrick Scott2010-03-031-0/+7
| | | | | | | | | Do not add history items when there is an anchor navigation if the user did not initiate the event. We backed out this change because cnn.com fixed itself but now app.showtime-app.com does the same trick and prevents the Browser from being able to go back.
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-5/+8
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-151-3/+5
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Fix conflict in FrameLoader.cpp due to Android ↵Steve Block2010-02-041-3/+0
| | | | | | | | ARCHIVE See http://trac.webkit.org/changeset/52314 Change-Id: Ic6d1b8164ebe646450d5866882e1b692e3076060
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-23/+57
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Reverts Android-specific change to avoid adding history items for fragment ↵Steve Block2010-01-071-22/+0
| | | | | | | | scrolls initiated by script. Bug: 2360542 Change-Id: I4a60840dfb89753b4f56f96b5017269bfcf99392
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-38/+19
| | | | | | | | | | | | | | | 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-176/+249
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Pull down change 51321 from webkit.org.Patrick Scott2009-12-091-2/+2
| | | | | Calls to EventNames() was causing multiple copies of the event names to be created. This could cause false negatives in hash map lookups.
* Experimental change. Cache pages with unload eventGrace Kloba2009-12-031-0/+6
| | | | | for back/forward. This will improve the history navigation. But it may break some sites. See discussion in https://bugs.webkit.org/show_bug.cgi?id=29021.
* Change window focus only if the user initiated the event.Patrick Scott2009-11-191-0/+8
| | | | | | | | | | | | | This does not work in the javascript case because the user gesture is stored in the caller's script environment and that knowledge is not obtainable in the receiving frame. However, this change allows targeted links to change the focus to the correct window but prevents sites like slate.com from changing back to the opening window. This change will be followed by a simple revert of the previous change in the Browser app. Bug: 2161671
* Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-101-71/+0
| | | | | | | 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-823/+154
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-1/+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 : Fix merge conflicts.Steve Block2009-10-201-3/+2
| | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-793/+286
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Fix bug 2132969Patrick Scott2009-10-081-0/+7
| | | | | | | | | Check for a user gesture before adding the history item during a fragment scroll. The bug has been reported to webkit.org with the suggested fix. Although upstream webkit does not have the user gesture additions defined by ANDROID_USER_GESTURE. Bug: 2132969
* Fix the user gesture change to be more like donut.Patrick Scott2009-09-301-1/+4
| | | | Bug: 2151004
* Add ANDROID_USER_GESTURE back to WebCore.Patrick Scott2009-09-241-0/+33
| | | | | | | We only care about the user gesture during a location change. Add the m_userGesture field to our ResourceRequest and check the value in canHandleRequest. This could be cleaner if WebCore passed around the ResourceRequest rather than constructing a new one.
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-27/+9
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-9/+27
|
* Add todo to remember to check with Grace if this merge was correctAndrei Popescu2009-08-131-0/+1
|
* Fix left over maunal mergesAndrei Popescu2009-08-131-29/+6
|
* dom, html and loader mergesAndrei Popescu2009-08-121-21/+1
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-163/+139
|
* Remove ANDROID_USER_GESTURE as the bug it fixed no longer applies.Patrick Scott2009-06-221-46/+0
| | | | | | | I tested the original bug and found that without this change, the link works perfectly fine. The only thing that does not work with this change is redirects within iframes that are to non-http protocols. This is ok since iframes can always change the parent window's location if this is the desired behavior.
* Get WebKit r44544.Feng Qian2009-06-171-403/+388
|
* Check in patch for webkit bug 25710. History navigation by fragement breaks ↵Ben Murdoch2009-06-051-5/+6
| | | | | | database transactions. https://bugs.webkit.org/show_bug.cgi?id=25710, landed to webkit in r44468
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-420/+273
| | | | Automated import of CL 145796
* AI 144661: Fix #175030. Preserve the zoom factor during refresh. Remove the ↵Grace Kloba2009-04-061-6/+0
| | | | | | | | code change in FrameLoader.cpp which was to preserve the zoom factor when we first did layout. Now we only use the initialZoomScale if it is a standard load. If it is history load, restoreScale() should be called before didFirstLayout(), in the other cases, like reload, refresh, replace, we don't change the zoom factor. BUG=175030 Automated import of CL 144661
* auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-181-1/+10
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-334/+587
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+5283
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-5283/+0
|
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-15/+8
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-450/+782
|
* Initial ContributionThe Android Open Source Project2008-10-211-104/+218
|
* SVN commits 30708-30711WebKit Authors2008-10-211-0/+2
|
* external/webkit r30707Upstream1970-01-121-0/+4842
generated by cgit v1.1 at 2024-09-10 16:53:11 +0000