summaryrefslogtreecommitdiffstats
path: root/WebCore/storage
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-2650-636/+1196
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-0723-105/+306
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-2931-121/+364
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-1622-179/+332
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-1151-2295/+247
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-0245-83/+1732
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-2348-90/+1302
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-1255-287/+1074
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-0955-195/+1220
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-0415-55/+68
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-2741-295/+677
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-2020-97/+154
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-0921-663/+1030
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0228-103/+310
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-1640-255/+689
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Fix conflicts.Leon Clarke2010-06-081-4/+0
| | | | | | | The changes to DomWindow.cpp are needed by @60104 moving things from the frame to the FrameView http://trac.webkit.org/changeset/60104 Change-Id: I8a7aa0478c2f0239bc52bb5078c446e5c8c84972
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-0838-92/+960
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-275-5/+9
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Added header needed for AndroidKristian Monsen2010-05-251-0/+2
| | | | Change-Id: I15e893f845e1d4b0c15548350511e45eee35dbb1
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-2539-87/+1278
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-1422-27/+617
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-1149-413/+1293
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-272-7/+15
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Update Android to reflect recent upstreaming of V8 runtime feature default ↵Steve Block2010-02-191-2/+0
| | | | | | | | values See http://trac.webkit.org/changeset/55020 Change-Id: I4d6c067dcafc43d2798c55e042e446d4964b326f
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-164-14/+91
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Fix Mac buildSteve Block2010-02-151-2/+1
| | | | | | | - Database.cpp - This Android-specific change was made in https://android-git.corp.google.com/g/#change,39575 - XCode project - GeolocationPositionCache was accidentally removed in https://android-git.corp.google.com/g/#change,40365 Change-Id: I60f8361ba352c7fa8d35dc829e203f6c653f0ef2
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-153-0/+28
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Fix conflicts due to V8 feature runtime enabler ↵Steve Block2010-02-041-1/+4
| | | | | | | | | | | | flags These have been modified to default to true on Android. We also set the new flags to default to true. Note that the enabler flag for database has changed. See http://trac.webkit.org/changeset/53595 Change-Id: I2832c4bcb316f481a33a8c00e7fe90dffa8dcdcf
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-0441-187/+973
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-1725-270/+646
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-1012-70/+86
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Adds ScriptController::initializeThreading(), to allow initializeThreading() ↵Steve Block2009-10-271-8/+2
| | | | | | | | | | to be used with both JSC and V8 without the use of ifdefs. See https://bugs.webkit.org/show_bug.cgi?id=30678 This has now been upstreamed to webkit.org, so submitting to Android to avoid future merge conflicts. Change-Id: Ia17a9f02060f04b11a8bffa367164162775516ba
* Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-201-14/+0
| | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-2051-426/+1007
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Cherry pick of WebKit commit r49018, fix for b/2067397. Enable ↵Ben Murdoch2009-10-061-23/+37
| | | | Database.changVersion().
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-1912-238/+9
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-1812-9/+238
|
* Continue with linker error fixes.Ben Murdoch2009-08-171-0/+5
|
* r47029: Merges WebCore/page, plugins and storage.Ben Murdoch2009-08-125-44/+0
|
* Merge in WebKit r47029.Ben Murdoch2009-08-1134-939/+1211
|
* Cherry pick fix for webkit bug 25711 ↵Ben Murdoch2009-07-074-1/+54
| | | | (https://bugs.webkit.org/show_bug.cgi?id=25711) landed in r45594. Fixes a bug in the Database API that caused the underlying SQLite DB to become locked until browser restart.
* Fix V8 build.Feng Qian2009-06-221-0/+1
|
* Merge commit 'goog/master' into webkit_mergeFeng Qian2009-06-1822-4/+95
|\ | | | | | | | | | | | | | | Resolved conflicts: WebCore/Android.mk WebCore/storage/LocalStorageArea.h WebCore/storage/SessionStorageArea.cpp WebCore/storage/StorageEvent.cpp
| * Enable DOM Storage in master with JSC bindings.Ben Murdoch2009-06-1522-3/+95
| |
* | Get WebKit r44544.Feng Qian2009-06-1716-102/+210
|/
* Apply fixes for webkit bugs 24776 and 25616 to add ENABLE(DATABASE) guards. ↵Ben Murdoch2009-05-1534-16/+145
| | | | This makes the macro work, so ENABLE_DATABASE can be toggled in config.h and the JavaScriptCore.derived.mk or V8Bindings.derived.mk.
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-1011-154/+17
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-0513-55/+88
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0362-0/+7146
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0362-7146/+0
|
generated by cgit v1.1 at 2024-07-04 21:31:06 +0000