summaryrefslogtreecommitdiffstats
path: root/WebKit/mac
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 3f4b1969 to masterSteve Block2010-01-202-1/+10
|\ | | | | | | Change-Id: I24c41d6ab08dd3594edd4ff62a1c823c904b9851
| * Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to ↵Steve Block2010-01-192-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | WebCore/bridge/Bridge See http://trac.webkit.org/changeset/53464 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Note that this change required an update to ScriptControllerAndroid.cpp and a manual fix in PluginView.cpp to add a temporary ANDROID guard. Change-Id: Ib2fe7793f7b3212e3b41324ff7dc5bb15c0e14b4
* | Cherry-pick WebKit change 52103 - Add a client based Geolocation providerSteve Block2010-01-182-1/+16
|/ | | | | | | | This is required to ease the process of upstreaming the Geolocation maximumAge handling code. Note that changes to WebCoreFrameBridge.cpp and WebCoreJniOnLoad.cpp were required as a result of this. Change-Id: Icd8524da9050acda3b991051877c3b5cf262b2b3
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-1756-563/+1990
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Android History unforking pt3: Changes to the notifyHIstoryItemChanged ↵Ben Murdoch2009-12-032-2/+2
| | | | | | | | 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-032-0/+15
| | | | | | | | to the FrameLoaderClient that the BackForwardList has been modified. This needs to be upstreamed to webkit.org. Change-Id: I14633c51276bd92ed56139b4c473cc8ac9bacb72
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-1050-347/+1332
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-2074-199/+4709
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge in WebKit r47029.Ben Murdoch2009-08-11132-3980/+12737
|
* Implements a mechanism that limit the growth of the application cacheAndrei Popescu2009-07-213-0/+11
|
* Apply fixes for webkit bugs 24776 and 25616 to add ENABLE(DATABASE) guards. ↵Ben Murdoch2009-05-1510-2/+37
| | | | This makes the macro work, so ENABLE_DATABASE can be toggled in config.h and the JavaScriptCore.derived.mk or V8Bindings.derived.mk.
* AI 146110: add missing files to webkitCary Clark2009-04-1495-1506/+4897
| | | | | | brings it in sync with webkit svn cl 42046 Automated import of CL 146110
* Automated import from //branches/master/...@141953,141953Cary Clark2009-03-2426-8/+3839
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-05111-4895/+11242
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03355-0/+160058
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03355-160058/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-17202-10296/+17659
|
* Initial ContributionThe Android Open Source Project2008-10-2142-1437/+83069
|
* external/webkit r30707Upstream1970-01-12350-0/+71063