summaryrefslogtreecommitdiffstats
path: root/WebKit/mac/Plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-274-0/+62
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-203-16/+17
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-092-3/+20
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0218-384/+353
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-164-5/+12
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-082-9/+9
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-275-15/+47
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-258-16/+31
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-1414-107/+115
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-1119-315/+554
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-2710-77/+210
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-169-84/+131
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-151-1/+8
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Merge webkit.org at r54127 : Resolve conflicts in WebCore/bridgeSteve Block2010-02-041-7/+0
| | | | | | | | Keep ours for generic bridge code as this is a work in progress. Take theirs for conflicts on other platforms due to bridge changes. Take theirs for updates for recently moved JSC JNI bridge. Change-Id: I7db68450a369bb652755cc4b9555083c76b07510
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-0416-72/+345
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to ↵Steve Block2010-01-191-1/+1
| | | | | | | | | | | | 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
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-173-36/+61
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-1011-39/+166
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-2012-49/+173
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge in WebKit r47029.Ben Murdoch2009-08-1137-294/+1886
|
* AI 146110: add missing files to webkitCary Clark2009-04-1433-832/+1551
| | | | | | brings it in sync with webkit svn cl 42046 Automated import of CL 146110
* Automated import from //branches/master/...@141953,141953Cary Clark2009-03-2418-0/+3839
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-0520-2886/+2955
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0340-0/+9018
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0340-9018/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1737-2147/+2595
|
* Initial ContributionThe Android Open Source Project2008-10-212-40/+8
|
* external/webkit r30707Upstream1970-01-1241-0/+8602