summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/bridge/jni/jsc
Commit message (Collapse)AuthorAgeFilesLines
* Fix some leaked JNI local references in the Java BridgeSteve Block2011-09-011-1/+5
| | | | | | | This includes a cherry-pick of http://trac.webkit.org/changeset/92689 Bug: 5244518 Change-Id: I38704f2307ab667ee6019fb096265609e27618cc
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-102-2/+2
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-089-151/+115
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Fix Java Bridge.Ben Murdoch2011-06-022-8/+0
| | | | | | | | | | Fix conflicts and reflect the upstream changes made in http://trac.webkit.org/changeset/80467. Note that our JNIUtilityPrivate.cpp is significantly forked from upstream. Change-Id: I390f1089d861fa29b6c15118638d029dea4356d8
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-0212-305/+375
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r76408: Fix Bridge.hBen Murdoch2011-05-232-2/+2
| | | | | | | | Cherry pick of upstream http://trac.webkit.org/changeset/79988 Needed now due to FastAllocBase and Noncopyable changes in this merge. Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-1211-0/+1802
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84