summaryrefslogtreecommitdiffstats
path: root/WebCore/Android.v8bindings.mk
Commit message (Collapse)AuthorAgeFilesLines
* Merge Webkit at r73109: Fix Makefiles.Shimeng (Simon) Wang2010-12-221-1/+1
| | | | Change-Id: If8cc4cfc06399c67b08cf5157852de90876c3d55
* Merge WebKit at r72272: Fix conflicts.Russell Brenner2010-12-021-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/Android.v8bindings.mk http://trac.webkit.org/changeset/71802 WebCore/bindings/v8/V8Proxy.cpp http://trac.webkit.org/changeset/71735 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/71767 http://trac.webkit.org/changeset/72116 (several APIs purged) WebCore/loader/ResourceLoader.cpp http://trac.webkit.org/changeset/71884 WebCore/platform/graphics/MediaPlayer.cpp http://trac.webkit.org/changeset/72117 WebCore/platform/image-decoders/ImageDecoder.cpp http://trac.webkit.org/changeset/72130 WebCore/rendering/RenderBlockLineLayout.cpp http://trac.webkit.org/changeset/72235 WebCore/rendering/RenderView.cpp http://trac.webkit.org/changeset/71851 Change-Id: If0a3466754b9755c1f4be97bf589f88c48eece0a
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-0/+4
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r71558: Fix MakefilesTeng-Hui Zhu2010-11-171-1/+0
| | | | Change-Id: I6e437c61405ca117da435b32a8a933a3aa53ba32
* Merge Webkit at r71558: Fix conflicts.Teng-Hui Zhu2010-11-171-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/loader/FrameLoader.cpp http://trac.webkit.org/changeset/70960 http://trac.webkit.org/changeset/70971 WebCore/css/CSSStyleSelector.cpp http://trac.webkit.org/changeset/71218 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/71218 WebCore/html/HTMLLinkElement.cpp http://trac.webkit.org/changeset/71159 WebCore/platform/android/PlatformBridge.h http://trac.webkit.org/changeset/71484 WebCore/platform/android/TemporaryLinkStubs.cpp http://trac.webkit.org/changeset/71484 WebCore/rendering/RenderTableSection.cpp http://trac.webkit.org/changeset/71382 http://trac.webkit.org/changeset/71251 WebCore/rendering/RenderLayer.cpp http://trac.webkit.org/changeset/71536 WebCore/rendering/RenderTable.cpp http://trac.webkit.org/changeset/71382 WebCore/Android.v8bindings.mk http://trac.webkit.org/changeset/71515 WebCore/bindings/scripts/CodeGeneratorV8.pm http://trac.webkit.org/changeset/71227 http://trac.webkit.org/changeset/71230 Change-Id: I3ad8c6bc6e36c90aedebedf915a8614b2c786550
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-171-0/+6
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Fix Makefiles.John Reck2010-11-091-0/+1
| | | | Change-Id: I53862fae2dd81232760db726c7783437af5f58f4
* Merge Webkit at r70209: Fix Makefiles.Ben Murdoch2010-10-261-6/+11
| | | | Change-Id: Ib60d9a927bad38e128765e122e86bcc547a785cf
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-0/+5
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge Webkit at r68651 : Fix Makefiles.Kristian Monsen2010-10-071-0/+1
| | | | | | | | Two perl scripts now generate .cpp files as well as .h files: http://trac.webkit.org/changeset/68521/trunk/WebCore/css/makevalues.pl http://trac.webkit.org/changeset/65942/trunk/WebCore/css/makeprop.pl Change-Id: Ic820536494d259200a69e07711d8cf19d5654b31
* Merge Webkit at r66666 : Fix makefiles, including some conflicts.Kristian Monsen2010-09-111-0/+1
| | | | Change-Id: Ia903fa56d31594944939f03d0b8dec021f7964bb
* Merge Webkit at r65072 : Fix Makefiles.Ben Murdoch2010-08-121-7/+0
| | | | Change-Id: I2da1ae98ee39f7f817d4b4363140872b931ac8bf
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-121-0/+5
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r63859: Fix conflicts.Ben Murdoch2010-07-271-2/+0
| | | | | | | | | | | | html/HTMLCanvasElement.h due to http://trac.webkit.org/changeset/63502 html/HTMLLinkElement.cpp due to http://trac.webkit.org/changeset/63622 Android.mk and WebCore/Android.mk due to http://trac.webkit.org/changeset/63735 WebCore/page/Settings.cpp|h due to http://trac.webkit.org/changeset/63537 WebCore/page/EventHandler.cpp|h due to http://trac.webkit.org/changeset/63807 WebCore/Android.jscbindings.mk due to http://trac.webkit.org/changeset/63193 WebCore/platform/network/ResourceHandle.h due to http://trac.webkit.org/changeset/63332 Change-Id: I03c929b97550014373f044f56c248040b66118f0
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-271-0/+1
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge Webkit at r63173 : Fix Makefiles.Leon Clarke2010-07-201-2/+0
| | | | | | | | | | | Note that MathML tags and attribute names are now generated, and SVG tags and attribute names are always generated. This is because the HTML5 parser relies on knowing about the tags even if the features are disabled. See https://bugs.webkit.org/show_bug.cgi?id=42050 https://bugs.webkit.org/show_bug.cgi?id=42059 Change-Id: Ie8b66217989673f90ffc61aabf499ab91a6a6bd1
* Merge Webkit at r63173 : Fix conflicts.Leon Clarke2010-07-201-7/+1
| | | | | | | | | | | | | | | | | | | | Android.v8bindings.mk: IDBBindingUtilities caused by http://trac.webkit.org/changeset/63064 CSSCompitedStyleDeclaration.cpp conflict caused by http://trac.webkit.org/changeset/63038 'Computed style is not implemented for padding-start, padding-end, margin-start, margin-end' HTMLDocumentParser.cpp conflict caused by http://trac.webkit.org/changeset/63165 'HTML5 Parser: document.write after onload blows away document' Navigator.h conflict caused by http://trac.webkit.org/changeset/62577 Page.cpp caused by http://trac.webkit.org/changeset/62502 ResourceHandleAndroid.cpp by http://trac.webkit.org/changeset/62736 HTMLLinkElement.* by the upstreaming of link prefetching at http://trac.webkit.org/changeset/63032 Change-Id: I5b9d3eef87cd525a9fc7d862676a41fc4122cba0
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-201-0/+9
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-091-1/+0
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge webkit.org at r61121: Fix Makefiles.Ben Murdoch2010-06-181-0/+2
| | | | Change-Id: Ief303a7cc7e10561e016ffe7b737dc94cc852a61
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-1/+0
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Fix makefilesKristian Monsen2010-05-251-0/+2
| | | | Change-Id: Ie53e458fbec03234aeb3ba16ce4d90aa629d3575
* Merge Webkit at r58956: Update Android makefiles.Ben Murdoch2010-05-141-7/+0
| | | | Change-Id: Ie3bcd0e3d0363ad5fdfa26e275af3cca5f147ca2
* Merge webkit.org at r58033 : Fix conflicts in V8NavigatorCustom.cppSteve Block2010-05-111-0/+1
| | | | | | | This file has been deleted upstream now that more V8 bindings are auto-generated, but we have local modifications, so we must keep these parts. Change-Id: I0d1497bf3f54f977ef4753800b127a32f38a30ea
* Merge webkit.org at r58033 : Fix MakefilesSteve Block2010-05-111-25/+2
| | | | Change-Id: Ie97b3c249bbda11ec4bc249be915f88361858d85
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-5/+20
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Enable XSLT in Android webkit.Shimeng (Simon) Wang2010-04-221-0/+4
| | | | | | | | Before this change, the libwebcore size is: 4902184 Bytes After this change, the libwebcore size is: 5103712 Bytes The diff is: 200KB. Change-Id: I2554a043c2686de56c802e8a9e02cce604fb25c0
* Enable XPATH in Android browser.Shimeng (Simon) Wang2010-04-191-0/+4
| | | | | Issue: 2582105 Change-Id: I270de4478e639bba8ba9a12558dff05746e991b0
* Cherry pick patch in https://bugs.webkit.org/show_bug.cgi?id=36665Andrei Popescu2010-03-291-0/+1
| | | | | | | | which adds V8 bindings for page cache. Fix b: 2533219 Change-Id: I57f067adbbef76b4f8ec6c50b9e85fb2b7fc619a
* Cherry-pick WebKit change 54957 to use V8 DerivedSourcesAllInOne.cppSteve Block2010-02-181-0/+1
| | | | | | | This updates Android to match Chromium See http://trac.webkit.org/changeset/54957 Change-Id: I41c082460f00e1c0ec32bf180205ca40fd2f190a
* Merge webkit.org at r54731 : Update Android to reflect refactoring of ↵Steve Block2010-02-161-1/+2
| | | | | | | | RuntimeEnabledFeatures.cpp see http://trac.webkit.org/changeset/54593 Change-Id: Iab1af86c65db24849fbdb07cc4b1692133d7ae87
* Merge webkit.org at r54340 : Fix MakefilesSteve Block2010-02-151-2/+0
| | | | Change-Id: I86b9b8485cc9594841407ac6958c8dea3903749e
* Merge webkit.org at r54340 : Fix merge conflictsSteve Block2010-02-151-12/+2
| | | | | | | | | | | | - Take both for Android makefiles, other than typo for JavaNPObjectV8 upstream - Take theirs for XCode project file and ChangeLog - Fix trivial header conflict in V8DocumentCustom - Keep ours for fix in JNIUtilityPrivate.cpp - Take theirs for V8DOMWrapper.cpp. Conflict is due to Android addition of TouchEvents, which conflicts with http://trac.webkit.org/changeset/54259 - Take both for Android addition of applicationInstalledCallback - Take both for Android JSC JIT changes in Platform.h Change-Id: Ib1a748f204a07a7e736feeee6a0f30f7453754a7
* Merge webkit.org at r54340 : Initial merge by gitSteve Block2010-02-151-0/+23
| | | | Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
* Implement navigator.isApplicationInstalled() APIAndrei Popescu2010-02-091-0/+1
| | | | | | This CL contains the V8 DOM bindings and IDL changes. Fix b:2371005
* Merge webkit.org at r54127 : Fix MakefilesSteve Block2010-02-041-5/+11
| | | | | | | Note that we update the XCode project file to add the new GeolocationPositionCache files to allow us to build Android WebKit on Mac. Change-Id: Iab5f73da50b0457cf6212d0aa1a8f6a413027f50
* Merge webkit.org at r54127 : Resolve conflicts in V8 touch events bindings.Steve Block2010-02-041-1/+0
| | | | | | | The V8 touch event bindings weren't upstreamed, but this code has now all been deleted in favour of auto-generation. See http://trac.webkit.org/changeset/52663 for the change that removes the indexed getters used for touch events Change-Id: Ie59c504d7efcb408c18f76d085db63bc1c4a96c4
* Merge webkit.org at r54127 : Keep ours for Makefiles.Steve Block2010-02-041-4/+0
| | | | Change-Id: I120600c8aa2f52cb5b0c69181477863c61f87a11
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-5/+7
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Update V8 JNI bridge code to match final version submitted to webkit.orgSteve Block2010-02-021-2/+2
| | | | | | | | | | | | | | No functional changes, style changes only See the following WebKit changes ... JavaStringV8 : http://trac.webkit.org/changeset/54132 JavaInstanceV8 : http://trac.webkit.org/changeset/54165 JavaClassV8 : http://trac.webkit.org/changeset/54169 JNIUtilityPrivate : http://trac.webkit.org/changeset/54171 JNIBridgeV8 : http://trac.webkit.org/changeset/54175 JavaNPObjectV8 : http://trac.webkit.org/changeset/54237 Change-Id: I7cc9d19e74043d1bac1a576cdc97a780fe317b5d
* V8 can now use WebCore/bridge/jni/JNIBridge.cppSteve Block2010-01-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JNIBridge.cpp is now used by both JSC and V8 This removes the last file from V8Bindings $ diff WebCore/bridge/jni/JNIBridge.cpp V8Binding/jni/jni_runtime.cpp 2d1 < * Copyright (C) 2003, 2004, 2005, 2007, 2009 Apple Inc. All rights reserved. 28c27 < #include "JNIBridge.h" --- > #include "jni_runtime.h" 30,32c29 < #if ENABLE(MAC_JAVA_BRIDGE) < < #include "CString.h" --- > #include "JNIUtility.h" 35,45d31 < < #ifdef NDEBUG < #define JS_LOG(formatAndArgs...) ((void)0) < #else < #define JS_LOG(formatAndArgs...) { \ < fprintf(stderr, "%s:%d -- %s: ", __FILE__, __LINE__, __FUNCTION__); \ < fprintf(stderr, formatAndArgs); \ < } < #endif < < using namespace JSC; 49d34 < 106,109d90 < #if USE(JSC) < ASSERT(JSLock::lockCount() > 0); < #endif < 127,130d107 < #if USE(JSC) < JSLock lock(SilenceAssertionsOnly); < #endif < 177,178d153 < < #endif // ENABLE(MAC_JAVA_BRIDGE) Change-Id: I3f0aabc5af56083aa950eca1609b2fe9b46726c9
* V8 can now use WebCore/bridge/jni/JNIBridge.hSteve Block2010-01-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JNIBridge.h is now used by both JSC and V8 $ diff WebCore/bridge/jni/JNIBridge.h V8Binding/jni/jni_runtime.h 2d1 < * Copyright (C) 2003, 2004, 2005, 2007, 2009, 2010 Apple Inc. All rights reserved. 27,30c26,27 < #ifndef JNIBridge_h < #define JNIBridge_h < < #if ENABLE(MAC_JAVA_BRIDGE) --- > #ifndef jni_runtime_h > #define jni_runtime_h 31a29 > #include "Bridge.h" 34,35c32,33 < #if USE(JSC) < #include "JavaStringJSC.h" --- > #if USE(V8) > #include "JavaStringV8.h" 64,66d61 < #if USE(JSC) < operator UString() const { return m_impl.uString(); } < #endif 118,120c113 < #endif // ENABLE(MAC_JAVA_BRIDGE) < < #endif // JNIBridge_h --- > #endif // jni_runtime_h Change-Id: I59c7dafb295aa7c81e79283333266c3f9f5a9a52
* Updates V8 versions of JavaMethod and JavaParameter to match JSC versionsSteve Block2010-01-261-0/+1
| | | | | | | | | V8 versions of JavaMethod and JavaParameter are provided by jni_runtime. This change updates those classes to match the JSC versions in JNIBridge. The changes are syntactic only and do not affect behavior. This will allow jni_runtime to be merged with JNIBridge. Change-Id: I2fceed94e1b57d133a068f51a2a40797447b7b58
* Moves V8's JavaField from V8's jni_runtime to JavaClassV8 and fixes styleSteve Block2010-01-261-0/+1
| | | | | | | | | | | | | | | | JavaField is script-engine specific. The JSC version of JavaField was moved out of the script-independent file JNIBridge (previosuly named jni_runtime) in http://trac.webkit.org/changeset/53849 This change makes the equivalent move for V8. This will make V8's version of jni_runtime script-independent, allowing it to be merged with JNIBridge in WebCore in the future. This change is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=34166 Change-Id: I7b35bfe4e8e7820623a824028eb64d06421bdb6b
* Fix build byAndrei Popescu2010-01-251-0/+1
| | | | | - adding WebCore/svg to the include path. This should not be guarded by #if ENABLE(SVG) in the makefiles. - calling PluginView::getNPObject from PlatformBridge only when V8 is used.
* Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix styleSteve Block2010-01-211-0/+1
| | | | Change-Id: Icf99c709929ef14551de61e55780b97767575f01
* Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix styleSteve Block2010-01-211-1/+2
| | | | | | | This is the V8 equivalent of http://trac.webkit.org/changeset/53412 It is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33951 Change-Id: Id22d59b7a5e0be72d594d454bb41c58760d824ff
* Rename V8 jni_utility_private to JNIUtilityPrivate and fixes styleSteve Block2010-01-201-2/+2
| | | | | | | This is the V8 equivalent of http://trac.webkit.org/changeset/51756 It is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33901 Change-Id: I336687e546748a7823f5e2d18f1ac1112a30a60c
* Move V8 jni_class to bridge/jni/v8/JavaClassV8 and fix styleSteve Block2010-01-201-0/+1
| | | | | | | This is the V8 equivalent of http://trac.webkit.org/changeset/53443 It is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33898 Change-Id: I27dcf73cc7d8c0303243ea632361f2210819cbc4
* 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