summaryrefslogtreecommitdiffstats
path: root/WebCore/page/SecurityOrigin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-9/+0
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-35/+68
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-24/+13
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-17/+134
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-22/+5
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-5/+22
|
* Merge commit 'goog/master' into mergeBen Murdoch2009-08-181-3/+4
|\ | | | | | | | | | | | | Conflicts: WebCore/bindings/v8/ScriptController.cpp WebCore/page/Geolocation.cpp WebCore/platform/android/GeolocationServiceAndroid.cpp
| * Fix a couple of bugs in SecurityOrigin when parsing database identifiers.Steve Block2009-08-131-3/+4
| |
* | Merge in WebKit r47029.Ben Murdoch2009-08-111-2/+91
|/
* Get WebKit r44544.Feng Qian2009-06-171-3/+7
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-7/+14
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-3/+7
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+295
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-295/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-0/+295