summaryrefslogtreecommitdiffstats
path: root/WebCore/WebCore.xcodeproj/project.pbxproj
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-25117/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-101-102/+988
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-061-12/+0
| | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-221-113/+221
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-121/+133
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-171-68/+161
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-091-13/+172
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-192/+525
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-071-116/+366
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-291-205/+263
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-161-55/+163
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-111-477/+543
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-021-44/+102
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231-43/+251
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-121-96/+289
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-091-76/+176
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-041-29/+73
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-142/+215
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-201-444/+653
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-65/+240
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-264/+303
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-137/+240
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-276/+374
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-29/+115
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-258/+594
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-213/+303
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Resolve merge conflictsSteve Block2010-05-111-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f - CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447 - Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request - Document.h - Take both, conflicts due to ANDROID_META_SUPPORT - DragImage.h - Take both, conflict due to Android addition - EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request - EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS - EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909 - FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS - FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE - FrameView.cpp - Take both, conflict due to Android frame flattening - Geolocation.h - Merge conflicts due to Android-specific changes - Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge - GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards - Gradient.h - Take both, conflict due to Android addition - HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7 - HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element - JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging - MediaPlayer.cpp/h - Take both, conflict due to Android-specific change - PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff - RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening - RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code - Settings.cpp/h - Conflict due to ANDROID_PLUGINS - TextInputController.h - Take upstream, git got confused - V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29 - V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards - WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge - Widget.h - Take both, conflict due to Android addition - jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset - mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-149/+557
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-25/+41
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Merge webkit.org at r54731 : Fix remaining merge conflictsSteve Block2010-02-161-6/+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-161-5/+35
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Fix Mac buildSteve Block2010-02-151-0/+8
| | | | | | | - 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 : Fix merge conflictsSteve Block2010-02-151-14/+0
| | | | | | | | | | | | - Take both for Android makefiles, other than typo for JavaNPObjectV8 upstream - Take theirs for XCode project file and ChangeLog - Fix trivial header conflict in V8DocumentCustom - Keep ours for fix in JNIUtilityPrivate.cpp - Take theirs for V8DOMWrapper.cpp. Conflict is due to Android addition of TouchEvents, which conflicts with http://trac.webkit.org/changeset/54259 - Take both for Android addition of applicationInstalledCallback - Take both for Android JSC JIT changes in Platform.h Change-Id: Ib1a748f204a07a7e736feeee6a0f30f7453754a7
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-151-0/+50
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Fix MakefilesSteve Block2010-02-041-0/+8
| | | | | | | Note that we update the XCode project file to add the new GeolocationPositionCache files to allow us to build Android WebKit on Mac. Change-Id: Iab5f73da50b0457cf6212d0aa1a8f6a413027f50
* Merge webkit.org at r54127 : Take theirs for ChangeLogs and build files for ↵Steve Block2010-02-041-138/+0
| | | | | | other platforms. Change-Id: Ie4d7a2183c45d7dbfe2e49692ac573eea243360e
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-252/+571
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Adds new GeolocationPositionCache files to XCode projectSteve Block2010-02-031-0/+8
| | | | | | | | This is required to build Android WebKit on Mac. See https://android-git.corp.google.com/g/#change,38319 Change-Id: I838567637b55aeed4d7b77e382ec6c8cffdb9e47
* Fix XCode project to allow us to build Android WebKit on MacSteve Block2010-02-031-18/+30
| | | | | | | | | | | | | | | | | Recent cherry-picks of WebKit patches were merged incorrectly into the XCode project file. This change fixes those bad merges. The relevant changes are ... JavaInstance - http://trac.webkit.org/changeset/53412 - https://android-git.corp.google.com/g/#change,37667 JavaClass - http://trac.webkit.org/changeset/53443 - https://android-git.corp.google.com/g/#change,37669 JavaStringJSC - http://trac.webkit.org/changeset/53449 - https://android-git.corp.google.com/g/#change,37687 Bridge - http://trac.webkit.org/changeset/53464 - https://android-git.corp.google.com/g/#change,37680 JNIUtility - http://trac.webkit.org/changeset/53497 - https://android-git.corp.google.com/g/#change,37815 JNIBridge - http://trac.webkit.org/changeset/53557 - https://android-git.corp.google.com/g/#change,37961 JNIBridgeJSC - http://trac.webkit.org/changeset/53849 - https://android-git.corp.google.com/g/#change,38446 BridgeJSC - http://trac.webkit.org/changeset/53620 - https://android-git.corp.google.com/g/#change,37963 Change-Id: Ib434e467c8569781a8acbf1c9e7714946d6e4887
* Cherry-pick WebKit change 53849 to move JavaField and JavaArray from ↵Steve Block2010-01-261-0/+8
| | | | | | | | | JNIBridge to JNIBridgeJSC See http://trac.webkit.org/changeset/53849 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: Ic73bf8213ae677b69e763a6b04f8c94f7f1eaed1
* Cherry-pick WebKit change 53557 to rename jni_runtime to JNIBridgeSteve Block2010-01-211-8/+8
| | | | | | | See http://trac.webkit.org/changeset/53557 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: I9a74b4dbdb0a9580372d69cec9e8f9fcab750e49
* Cherry-pick WebKit change 53497 to rename jni_utility and ↵Steve Block2010-01-201-16/+16
| | | | | | | | | | | jni_utility_private to JNIUtility and JNIUtilityPrivate See http://trac.webkit.org/changeset/53497 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. This change required updating headers in Android-specific files in WebCore and WebKit. Change-Id: I4b80eb3eadcff66cbd261aa6ccef0f37927250b1
* resolved conflicts for merge of 3f4b1969 to masterSteve Block2010-01-201-8/+12
|\ | | | | | | Change-Id: I24c41d6ab08dd3594edd4ff62a1c823c904b9851
| * Cherry-pick WebKit change 53449 to move JSC-specific implementation of ↵Steve Block2010-01-191-0/+4
| | | | | | | | | | | | | | | | | | JavaString to a private implementation class See http://trac.webkit.org/changeset/53449 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: I61cfea194d679d506d92ca3951032531d6908965
| * Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to ↵Steve Block2010-01-191-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | WebCore/bridge/Bridge See http://trac.webkit.org/changeset/53464 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Note that this change required an update to ScriptControllerAndroid.cpp and a manual fix in PluginView.cpp to add a temporary ANDROID guard. Change-Id: Ib2fe7793f7b3212e3b41324ff7dc5bb15c0e14b4
* | am f83060e8: am be164dbc: Cherry-pick WebKit change 53443 to move jni_class ↵Steve Block2010-01-191-8/+8
|\ \ | |/ | | | | | | | | | | | | | | to JavaClassJSC Merge commit 'f83060e89e8ba30d0321f33164a0c4819f837a03' * commit 'f83060e89e8ba30d0321f33164a0c4819f837a03': Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSC
| * Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSCSteve Block2010-01-191-8/+8
| | | | | | | | | | | | | | See http://trac.webkit.org/changeset/53443 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: I0f2b0581e0850694953f79d45242c44d16bbf5fa
* | resolved conflicts for merge of df644d06 to masterSteve Block2010-01-191-8/+8
|\ \ | |/ | | | | Change-Id: I02d6b5e94724091decfe0c26317554c86dcfb2da
| * Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSCSteve Block2010-01-191-8/+8
| | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/53412 Note that changes to WebCoreFrameBridge.cpp cpp were required as a result of this cherry-pick. Change-Id: I0a6f6fafc5b0d5d9337ef4e339c6a0c5dd188eb9
* | Cherry-pick WebKit change 52103 - Add a client based Geolocation providerSteve Block2010-01-181-0/+20
|/ | | | | | | | 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
generated by cgit v1.1 at 2025-09-13 15:48:40 +0000