summaryrefslogtreecommitdiffstats
path: root/WebCore/history
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-1221-3452/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-102-53/+2
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Merge WebKit at Chromium 9.0.597.106: Initial merge by GitSteve Block2011-02-162-2/+53
| | | | | | | | | Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. This corresponds to r78455 on the 597 release branch. Change-Id: I72375d9b61a767449086f0c9dc4105b2a6b62ddc
* Use float to preserve scales' accuracy.Shimeng (Simon) Wang2011-01-111-6/+6
| | | | | | | | | | | This change helps page navigation, since the restored scale is accurate. This change has a corresponding change in frameworks/base. https://android-git.corp.google.com/g/#change,88121 issue: 3225233 Change-Id: I7e5601e8412e8b81e7f32c9ffb9e6c114db95169
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-177-129/+125
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-095-61/+62
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-263-10/+47
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-292-1/+2
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-113-3/+42
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-022-2/+20
| | | | 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-10/+10
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-094-28/+0
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-041-1/+1
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-209-104/+381
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-024-11/+23
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-163-12/+288
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Code clean up, http://b/issue?id=2724743Grace Kloba2010-05-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change Widget:screenWidth() to Widget:textWrapWidth() as the text wrap width may be different than the screen width after pinch zoom. Change AndroidWebHistoryBridge's m_screenWidthScale to m_textWrapScale to reflect its meaning. Remove unused screenWidth/screenHeight in PlatformBridge. Merge two restore methods to one. There is a matching CL in framework/base. Only setUseFixedLayout if layout width is different than screen width. Change from Node* to Ref<Node> to avoid a crash. Fix http://b/issue?id=2660396
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-113-4/+4
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Make sure WebKit's page cache does not cache pages with unload handlers.Andrei Popescu2010-03-291-4/+0
| | | | | | Fix b: 2552004 Change-Id: Iac6737fbb9a1eca734ea7474f99ccf66ee916bd7
* Serialize/unserialize screen width scale, which is used when restoring sites.Shimeng (Simon) Wang2010-03-051-2/+2
| | | | | | | | Also change the scales' default value to 0, so in WebViewCore.java, in case the scales are not set inside webkit, the default logic can be used. This helps in case a mobile site is loaded but no scales is saved, and when restored, the mobile site will have wrong restored scales because default values are not 0.
* 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-049-69/+48
| | | | 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-173-17/+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-177-7/+107
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge change I85893753 into eclair-mr2Android (Google) Code Review2009-12-091-1/+1
|\ | | | | | | | | * changes: Pull down change 51321 from webkit.org.
| * 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.
* | Modify AndroidWebHistoryBridge to prepare uploadingGrace Kloba2009-12-071-2/+2
| | | | | | | | | | | | detachHistoryItem() to WebKit. I think it is easy to read this way that the constructor sets the m_historyItem and the new method will detach it.
* | Continue https://android-git.corp.google.com/g/#change,34687,Grace Kloba2009-12-071-1/+1
|/ | | We should use #if PLATFORM(ANDROID) now
* Merge change Iceb63592 into eclair-mr2Android (Google) Code Review2009-12-031-0/+4
|\ | | | | | | | | * changes: Experimental change. Cache pages with unload event 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.
| * 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.
* | Rework CL, https://android-git.corp.google.com/g/#change,34511Grace Kloba2009-12-032-3/+2
|/ | | due to the history unfork change.
* another file to fix the buildGrace Kloba2009-12-031-0/+2
|
* After turning on page cache, the parent HistoryItemGrace Kloba2009-12-031-0/+4
| | | | | can be destroyed before the child HistoryItem, add an extra checking to avoid crash.
* Android History unforking pt3: Changes to the notifyHIstoryItemChanged ↵Ben Murdoch2009-12-032-38/+8
| | | | | | | | function and the places it is used. This needs to be upstreamed to webkit.org. Change-Id: I5dc4e40939448e0b1dfcd6393082036fc8174aa9
* Android History unforking pt2: BackForwardList changes. Fire a notification ↵Ben Murdoch2009-12-031-36/+9
| | | | | | | | to the FrameLoaderClient that the BackForwardList has been modified. This needs to be upstreamed to webkit.org. Change-Id: I14633c51276bd92ed56139b4c473cc8ac9bacb72
* Android history unforking pt 1: Add Android specific files and #if ↵Ben Murdoch2009-12-033-13/+121
| | | | | | | | PLATFORM(ANDROID) guarded code in WebCore/history/HistoryItem.cpp This should be upstreamed to webkit.org Change-Id: I3f822d5a6579080658242f846214e1c3fe31fa01
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-6/+11
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-207-68/+160
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge in WebKit r47029.Ben Murdoch2009-08-119-21/+205
|
* Get WebKit r44544.Feng Qian2009-06-176-38/+274
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-107-38/+67
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-0512-248/+626
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0310-0/+1770
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0310-1770/+0
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-092-10/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-175-137/+85
|
* Initial ContributionThe Android Open Source Project2008-10-215-21/+160
|
* external/webkit r30707Upstream1970-01-1210-0/+1693
generated by cgit v1.1 at 2024-09-28 18:54:42 +0000