summaryrefslogtreecommitdiffstats
path: root/WebCore/GNUmakefile.am
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-86/+128
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Cherry-pick WebKit change 53849 to move JavaField and JavaArray from ↵Steve Block2010-01-261-0/+1
| | | | | | | | | JNIBridge to JNIBridgeJSC See http://trac.webkit.org/changeset/53849 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: Ic73bf8213ae677b69e763a6b04f8c94f7f1eaed1
* Cherry-pick WebKit change 53620 to move bridge interfaces Field, Class, ↵Steve Block2010-01-211-1/+2
| | | | | | | | | | | Instance and Array from Bridge to BridgeJSC See http://trac.webkit.org/changeset/53620 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Note that changes to WebCore.xcodeproj were not pulled, as they introduced merge conflicts. Change-Id: I63f3c4ed101badaea3207d53784de04aee49c2ab
* Cherry-pick WebKit change 53557 to rename jni_runtime to JNIBridgeSteve Block2010-01-211-1/+1
| | | | | | | See http://trac.webkit.org/changeset/53557 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: I9a74b4dbdb0a9580372d69cec9e8f9fcab750e49
* Cherry-pick WebKit change 53497 to rename jni_utility and ↵Steve Block2010-01-201-1/+1
| | | | | | | | | | | jni_utility_private to JNIUtility and JNIUtilityPrivate See http://trac.webkit.org/changeset/53497 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. This change required updating headers in Android-specific files in WebCore and WebKit. Change-Id: I4b80eb3eadcff66cbd261aa6ccef0f37927250b1
* resolved conflicts for merge of 3f4b1969 to masterSteve Block2010-01-201-2/+2
|\ | | | | | | Change-Id: I24c41d6ab08dd3594edd4ff62a1c823c904b9851
| * Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to ↵Steve Block2010-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | am f83060e8: am be164dbc: Cherry-pick WebKit change 53443 to move jni_class ↵Steve Block2010-01-191-1/+1
|\ \ | |/ | | | | | | | | | | | | | | to JavaClassJSC Merge commit 'f83060e89e8ba30d0321f33164a0c4819f837a03' * commit 'f83060e89e8ba30d0321f33164a0c4819f837a03': Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSC
| * Cherry-pick WebKit change 53443 to move jni_class to JavaClassJSCSteve Block2010-01-191-1/+1
| | | | | | | | | | | | | | See http://trac.webkit.org/changeset/53443 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Change-Id: I0f2b0581e0850694953f79d45242c44d16bbf5fa
* | resolved conflicts for merge of df644d06 to masterSteve Block2010-01-191-1/+2
|\ \ | |/ | | | | Change-Id: I02d6b5e94724091decfe0c26317554c86dcfb2da
| * Cherry-pick WebKit change 53412 to move jni_instance to JavaInstanceJSCSteve Block2010-01-191-1/+2
| | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/53412 Note that changes to WebCoreFrameBridge.cpp cpp were required as a result of this cherry-pick. Change-Id: I0a6f6fafc5b0d5d9337ef4e339c6a0c5dd188eb9
* | Cherry-pick WebKit change 52103 - Add a client based Geolocation providerSteve Block2010-01-181-0/+5
|/ | | | | | | | This is required to ease the process of upstreaming the Geolocation maximumAge handling code. Note that changes to WebCoreFrameBridge.cpp and WebCoreJniOnLoad.cpp were required as a result of this. Change-Id: Icd8524da9050acda3b991051877c3b5cf262b2b3
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-32/+73
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-13/+70
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-42/+178
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-74/+16
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-16/+74
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-57/+196
|
* Get WebKit r44544.Feng Qian2009-06-171-95/+164
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-66/+104
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-51/+215
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+2974
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-2974/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-903/+1822
|
* Initial ContributionThe Android Open Source Project2008-10-211-21/+16
|
* external/webkit r30707Upstream1970-01-121-0/+2060
generated by cgit v1.1 at 2025-01-12 02:42:45 +0000