summaryrefslogtreecommitdiffstats
path: root/WebKitTools
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-101242-319841/+0
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-06124-8141/+7147
| | | | | | | 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-22189-7281/+11296
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-02134-1580/+5628
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-17107-440/+4076
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-09170-1187/+5344
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-26336-2159/+14925
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-07194-1437/+6794
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-2998-2040/+4780
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-1697-429/+4199
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Fix view_source.php for DumpRenderTree2Steve Block2010-09-131-2/+2
| | | | | | | | highlight_string() echos the result of the highlighting and returns a boolean success value. The existing code incorrectly echoes this boolean as part of the result. Change-Id: Icbfca6d8232ba3ad196f5909ad6c1ab4ac61f890
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-1189-699/+2260
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-02129-747/+2541
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Added script to show the source of the test.Maksymilian Osowski2010-09-011-0/+53
| | | | Change-Id: I192b0ecd7830f69193111ebf1d081dcd9495a51b
* Update get_layout_tests_dir_contents.php to account for new server document rootSteve Block2010-08-261-10/+5
| | | | | | | | See https://android-git.corp.google.com/g/#change,63194 which updates apach2.py to serve HTTP tests at server root Bug: 2951727 Change-Id: I4a5777d71843c1c2fdcd74a69b13e3c4750a45a0
* Merge "Updated the script to allow for chosing the mode (list files vs. list ↵Maksymilian Osowski2010-08-261-26/+43
|\ | | | | | | folders)."
| * Updated the script to allow for chosing the mode (list files vs. list folders).Maksymilian Osowski2010-08-261-26/+43
| | | | | | | | Change-Id: I7a87e5591aef888f47cceaf3f30f5f2752e336aa
* | Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-2398-912/+3623
| | | | | | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* | Merge "Added php script in WebKitTools/DumpRenderTree/android/ that fetches ↵Maksymilian Osowski2010-08-131-0/+98
|\ \ | |/ | | | | all the files under given path."
| * Added php script in WebKitTools/DumpRenderTree/android/ that fetches all the ↵Maksymilian Osowski2010-08-131-0/+98
| | | | | | | | | | | | files under given path. Change-Id: Iac6025007a549833bf8065dacd50f942b1b2f643
* | Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-12103-766/+3988
|/ | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-0973-1310/+3155
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-0454-421/+2077
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-27114-689/+4559
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-20157-1149/+6003
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-0978-510/+2468
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0283-263/+3317
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-16127-18317/+3787
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* 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
|
generated by cgit v1.1 at 2025-01-23 05:27:52 +0000