summaryrefslogtreecommitdiffstats
path: root/WebKit/android/jni/JavaBridge.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fixes license headers for all files in WebKit/android, other than those in stl/.Steve Block2009-11-131-1/+1
| | | | | | | | | | | | | These files have not yet been upstreamed to webkit.org. WebKit requires either a BSD-style or LGPL 2.1 license for all code. We use a BSD-style 2-clause license for Android-specific files that will be upstreamed to webkit.org. This change adds licenses where absent or simply fixes the names of copyright holders in the license text to 'THE COPYRIGHT OWNER' and cleans up formatting. Files in stl/ currently use licenses other than BSD-style and will require more careful treatment. Change-Id: I67ad4b8932e432d3eaaeecdfeb0d09418496228d
* Add check null of getRealObject(). When a WebView isGrace Kloba2009-10-021-3/+20
| | | | | | | removed, there is a slight chance that getRealObject() for WebView's JavaObject be null. Fix http://b/issue?id=2159815
* Add SystemInterface to the android_npapi so that we can expose system relatedGrace Kloba2009-08-051-0/+16
| | | | properties. Currently it only has getApplicationDataDirectory.
* Merge commit 'goog/master' into webkit_mergeFeng Qian2009-06-181-1/+49
|\ | | | | | | | | | | | | | | Resolved conflicts: WebCore/Android.mk WebCore/storage/LocalStorageArea.h WebCore/storage/SessionStorageArea.cpp WebCore/storage/StorageEvent.cpp
| * cherry-pick 0f07938f7e51e7a7eb4239b8a30e64b68dac8c66 due to automerger snafuGrace Kloba2009-06-161-1/+49
| |
* | Get WebKit r44544.Feng Qian2009-06-171-7/+4
|/
* Move Browser test plugin from webkit project to development project.Grace Kloba2009-05-141-3/+50
| | | | Change how we set plugin path as we can support more than one path now.
* am 870c405: Merge change 587 into donutAndroid (Google) Code Review2009-04-291-7/+0
|\ | | | | | | | | | | | | Merge commit '870c40582102e848fd71f82a9e65e7dbd7b8835c' * commit '870c40582102e848fd71f82a9e65e7dbd7b8835c': Move imagecache into android_runtime from browser
| * Move imagecache into android_runtime from browserMike Reed2009-04-271-7/+0
| | | | | | | | | | Now that Java is also using ashmem and globalpool for images, move the management of the globalpool budget into android_runtime
* | AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-7/+0
| | | | | | | | Automated import of CL 145796
* | Automated import from //branches/master/...@141633,141633Patrick Scott2009-03-241-11/+1
|/
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+319
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-319/+0
|
* auto import from //branches/cupcake/...@127101The Android Open Source Project2009-01-201-10/+7
|
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-41/+32
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-0/+331