summaryrefslogtreecommitdiffstats
path: root/WebKitTools
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-0846-35243/+36809
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-27102-297/+2254
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-25164-4658/+5087
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-14234-2923/+27466
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Resolve merge conflictsSteve Block2010-05-111-76/+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-11436-7237/+48159
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-2754-1106/+2523
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Remove Python generated files accidentally added to tree in WebKit mergeSteve Block2010-04-2658-0/+0
| | | | | | These were added in the WebKit merge to r54127 in https://android-git.corp.google.com/g/39242 Change-Id: I9cdcf2730d826393191e74cb77ab2ddf8de52920
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-16117-4538/+4819
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-1551-426/+1348
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-04362-5722/+33366
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-17140-1902/+12115
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-10109-1571/+6938
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-20129-1561/+12043
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge commit 'goog/master' into mergeAndrei Popescu2009-08-191-2/+2
|\
| * Fix errors when compiled under g++ 4.4.1 on Ubuntu 9.10a4Jack Palevich2009-08-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This environment ends up using the C++ version of strrchr rather than the C version. Apparently older environments use the C version of strrchr. I'm guessing the change is due to one of the standard C++ header files changing so that includes the new C++ version of strrchr. The difference is that the C version of strrchr is: char* strrchr(const char*, char); while the C++ version of strrchr is overloaded: const char* strrchr(const char*, char); char* strrchr(char*, char); This code depended on the C version to convert a const char* pointer into a non-const char* pointer. The fix is to change the code to work with a const char* result, and if that is not possible, manually insert a hard cast of the return value.
* | Revert "Merge WebKit r47420"Andrei Popescu2009-08-192-0/+227
| | | | | | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* | Merge WebKit r47420Ben Murdoch2009-08-182-227/+0
| |
* | Merge in WebKit r47029.Ben Murdoch2009-08-11203-23825/+48178
|/
* WebKitMerge tool fixes.Ben Murdoch2009-08-111-2/+2
|
* Makefile and webkitmerge tool edits needed to merge with latest webkit.Ben Murdoch2009-08-111-28/+29
|
* Implements a mechanism that limit the growth of the application cacheAndrei Popescu2009-07-215-0/+34
|
* Make this host tool compile with GCC 4.4Jack Palevich2009-06-251-0/+1
| | | | | | | | It has a dependency on cstdio (aka stdio.h), but was not explicitly including it. In previous versions of GCC the cstdio file was implictly included as a side-effect of including another library. This change is backwards compatible with earlier versions of GCC.
* update webkitmerge with git-specific commandsCary Clark2009-04-151-49/+118
|
* updated utf16 files that differ from webkit.org CL 42026Cary Clark2009-04-151-0/+0
|
* AI 146111: update webkitmerge to handle git, svg, fix bugsCary Clark2009-04-141-75/+212
| | | | | | | | | | | | | | | | //branches/master/android/external/webkit/WebCore/Android.derived.mk add exclusion rules for svg //branches/master/android/external/webkit/WebCore/Android.mk add exclusion exceptions (e.g., files from /skia/ that we use) remove the need to have '\' at the end of each file //branches/master/android/external/webkit/WebKitTools/android/webkitmerge/webkitmerge.cpp don't delete modified files, but mark them with MANUAL_MERGE_REQUIRED add --execute option (in progress) add --perforce, --git options fix double add of file when it appears in sandbox and new webkit BUG=1553405 Automated import of CL 146111
* AI 146110: add missing files to webkitCary Clark2009-04-14347-0/+71094
| | | | | | brings it in sync with webkit svn cl 42046 Automated import of CL 146110
* AI 144627: webkitmerge is a command line tool that merges newer version of ↵Cary Clark2009-04-063-0/+1856
| | | | | | | | | webkit to Android. It can be either run from XCode using the xcodeproj or from the command line. BUG=1553405 Automated import of CL 144627
* Automated import from //branches/master/...@141953,141953Cary Clark2009-03-24332-65474/+0
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03420-0/+110450
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03420-110450/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-17264-10064/+12272
|
* Initial ContributionThe Android Open Source Project2008-10-21151-2059/+62037
|
* external/webkit r30707Upstream1970-01-12407-0/+48264
generated by cgit v1.1 at 2024-07-15 16:51:34 +0000