summaryrefslogtreecommitdiffstats
path: root/WebCore/history/CachedFrame.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r54127 : Fix final trivial mergesSteve Block2010-02-041-3/+0
| | | | Change-Id: Ib24c66a3c609fd1c8ae9697f471a8abc85e5aa33
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-0/+10
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Stop forwarding touch events from Java when the top level document is ↵Ben Murdoch2010-01-271-0/+14
| | | | | | | | | | | detached rather than when eventHandlers are cleared for a frame. Also no longer keep track of the number of touch event handlers that a page has registered. If a page requests touch events, always send them from Java until a new page is loaded. This simplifies the logic when dealing with the page cache as otherwise as well as restoring the forwarding of touch events when a page is restored from the page cache, we would need to restore the number of touch handlers that have been registered. Change-Id: I0269e1632a37ccbf105bac658c2cb7f1d5cd3052
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-3/+0
| | | | | | | | | | | | | | | 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-0/+3
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Pull down change 51321 from webkit.org.Patrick Scott2009-12-091-1/+1
| | | | | 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/+4
| | | | | 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.
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-44/+109
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge in WebKit r47029.Ben Murdoch2009-08-111-0/+9
|
* Get WebKit r44544.Feng Qian2009-06-171-2/+4
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-6/+29
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-0/+133