summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/storage
Commit message (Collapse)AuthorAgeFilesLines
* Cherry-pick WebKit change 98548 to fix debug buildSteve Block2011-10-282-4/+8
| | | | | | | See http://trac.webkit.org/changeset/98548 Bug: 5448972 Change-Id: I099d9ca9e63cbc6e8c3e163ecb2b0a0c82d1141a
* Cherry-pick WebKit change 89708 to fix debug buildSteve Block2011-10-285-13/+13
| | | | | | | See http://trac.webkit.org/changeset/89708 Bug: 5448972 Change-Id: I03d576b0c819fdb9a6d99fea8099cf7120945a45
* Cherry pick WebKit r87114Ben Murdoch2011-08-171-1/+1
| | | | | | | http://trac.webkit.org/changeset/87114 Bug: 5139032 Change-Id: Ia5a3607ad9163e19d2be5df522fddea3ccd6357e
* Merge WebKit at branches/chromium/742 r88085: Initial merge by git.Steve Block2011-06-141-0/+2
| | | | Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-1021-158/+3356
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Fix conflicts due to new StorageTrackerSteve Block2011-06-082-14/+7
| | | | | | | | | | | | | | | | - FileSystemAndroid.cpp, FileSystemPOSIX.cpp Use new common version of listDirectory(), which is identical to the existing Android version. - StorageNamespace.h, StorageNamespaceImpl.h Conflict due to Android's clearPage() - PageGroup.cpp Conflict due to Android's clearDomStorage() See http://trac.webkit.org/changeset/80892 Change-Id: Ifac131155f5019959de8761438cd0372547b0e6c
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-0848-173/+1339
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-0263-1350/+2059
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-2445-554/+618
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-2314-28/+74
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-166-16/+23
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-12176-0/+18742
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84