summaryrefslogtreecommitdiffstats
path: root/WebCore/bridge/objc
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-1212-1936/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-092-15/+15
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-071-7/+5
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-233-10/+10
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-164-16/+16
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-083-15/+16
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-276-12/+13
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-115-24/+165
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-042-3/+3
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Cherry-pick WebKit change 53541 to fix style in WebCore/bridge/BridgeSteve Block2010-01-202-4/+4
| | | | | | | See http://trac.webkit.org/changeset/53541 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: Ifa112a8700149b21a1a1bbdf8366844adb3a9ae6
* 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 r50258 : Initial merge by git.Steve Block2009-11-102-5/+19
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-204-15/+49
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-1/+1
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-1/+1
|
* Merge in WebKit r47029.Ben Murdoch2009-08-113-15/+16
|
* Get WebKit r44544.Feng Qian2009-06-179-58/+58
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-059-128/+87
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0310-0/+1787
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0310-1787/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1710-0/+1787