summaryrefslogtreecommitdiffstats
path: root/WebCore/loader/FrameLoader.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-28/+31
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-1/+3
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-1/+3
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Reverts Android-specific change to avoid adding history items for fragment ↵Steve Block2010-01-071-5/+0
| | | | | | | | scrolls initiated by script. Bug: 2360542 Change-Id: I4a60840dfb89753b4f56f96b5017269bfcf99392
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-0/+5
| | | | | | | | | | | | | | | 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-2/+17
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-101-59/+10
| | | | | | | 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-349/+356
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-1/+0
| | | | | | | | | | | | | 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-120/+48
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Add ANDROID_USER_GESTURE back to WebCore.Patrick Scott2009-09-241-0/+7
| | | | | | | 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-2/+0
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-0/+2
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-21/+6
|
* Remove ANDROID_USER_GESTURE as the bug it fixed no longer applies.Patrick Scott2009-06-221-7/+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.
* Ues loadFrameRequest instead of loadPostRequest so that we don't need to ↵Grace Kloba2009-06-191-5/+0
| | | | change WebKit any more.
* Get WebKit r44544.Feng Qian2009-06-171-106/+95
|
* Check in patch for webkit bug 25710. History navigation by fragement breaks ↵Ben Murdoch2009-06-051-2/+2
| | | | | | 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-54/+18
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-52/+58
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+701
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-701/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-53/+77
|
* Initial ContributionThe Android Open Source Project2008-10-211-3/+14
|
* external/webkit r30707Upstream1970-01-121-0/+666
generated by cgit v1.1 at 2024-09-10 16:34:39 +0000