summaryrefslogtreecommitdiffstats
path: root/WebKit/chromium
Commit message (Collapse)AuthorAgeFilesLines
* 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-1665-353/+9674
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-1537-65/+3654
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Take theirs for ChangeLogs and build files for ↵Steve Block2010-02-041-6/+0
| | | | | | other platforms. Change-Id: Ie4d7a2183c45d7dbfe2e49692ac573eea243360e
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-04112-439/+6645
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Cherry-pick WebKit change 52103 - Add a client based Geolocation providerSteve Block2010-01-182-0/+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-17258-54/+43242
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-102-9/+14
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-204-0/+387
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
generated by cgit v1.1 at 2025-12-01 06:37:44 +0000