summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/js/ScriptController.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-520/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-171-0/+5
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-10/+4
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231-3/+15
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-0/+6
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-3/+4
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-1/+9
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-0/+17
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-10/+23
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-12/+12
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-29/+30
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-2/+3
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-151-27/+20
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-21/+16
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Refactor our touch event code to use the version submitted to webkit.org by ↵Ben Murdoch2010-01-201-1/+1
| | | | | | the Qt team. Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
* Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-171-9/+4
| | | | | | | | | | | | | | | Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-72/+35
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-39/+154
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Adds ScriptController::initializeThreading(), to allow initializeThreading() ↵Steve Block2009-10-271-0/+6
| | | | | | | | | | to be used with both JSC and V8 without the use of ifdefs. See https://bugs.webkit.org/show_bug.cgi?id=30678 This has now been upstreamed to webkit.org, so submitting to Android to avoid future merge conflicts. Change-Id: Ia17a9f02060f04b11a8bffa367164162775516ba
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-6/+10
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge in WebKit r47029.Ben Murdoch2009-08-111-12/+24
|
* Get WebKit r44544.Feng Qian2009-06-171-32/+17
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-24/+29
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-38/+51
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+376
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-376/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-0/+376