summaryrefslogtreecommitdiffstats
path: root/WebKit/chromium/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-1447-287/+429
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-11116-3141/+6387
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-2724-235/+364
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Merge webkit.org at r54731 : Fix remaining merge conflictsSteve Block2010-02-161-12/+0
| | | | | | | | | | | | - AutoFillPopupMenuClient.h - Take theirs, git got confused - PluginView.h - Conflict due to new OS macro - Gradient.cpp - Conflict due to new argument due to setPlatformGradientSpaceTransform - Android.derived.v8bindings.mk - Keep ours - DragImage.h - Take both - V8DocumentCustom.cpp - Take theirs - XCode project - Take both to keep Android-addition of GeolocationPositionCache Change-Id: I3f294a71af93fb4e02b57e0169bd25143132df15
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-1648-331/+7342
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-1528-33/+3225
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-0467-355/+3268
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Cherry-pick WebKit change 52103 - Add a client based Geolocation providerSteve Block2010-01-181-0/+1
| | | | | | | | 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-17131-0/+28513
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
generated by cgit v1.1 at 2025-05-18 19:43:38 +0000