summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/Android.jscbindings.mk
Commit message (Collapse)AuthorAgeFilesLines
* Remove option to build WebKit with JSCSteve Block2012-02-161-241/+0
| | | | | | | | | | | | | | | | | | V8 has been the default JS engine since Froyo and has shipped on all devices in Gingerbread onwards. However, we continued to support JSC for a number of reasons. See bug for details. Now that we can use V8 in all cases, we should drop support for JSC to eliminate the maintenance overhead. Adds a clean step as this changes a Makefile. Note that this was previously landed as https://android-git.corp.google.com/g/#/c/162144/, but broke the full_x86-eng build, so was reverted. Bug: 5495373 Change-Id: I3d41362f93b9f3d034f17150aaa402379e75d367
* Revert "Remove option to build WebKit with JSC"Steve Block2012-02-021-0/+241
| | | | | | | | This reverts commit c7a3e9f1af3485e19dee3ea3897580d33c1b9ffe. This broke the full_x86-eng build, as V8 does not support x86. Bug: 5495373
* Remove option to build WebKit with JSCSteve Block2012-02-021-241/+0
| | | | | | | | | | | | V8 has been the default JS engine since Froyo and has shipped on all devices in Gingerbread onwards. However, we continued to support JSC because V8 requires ARMv7 and at the time, the emulator did not support this. Now that the emulator supports ARMv7, we should drop support for JSC to eliminate the maintenance overhead. Bug: 5495373 Change-Id: Ib31fa1b4927099cf16e9e465233c8667317e209c
* Add support for Float64Array.Ben Murdoch2011-12-021-0/+1
| | | | | | | | | | | | | | Cherry pick from WebKit r87197 to add support for Float64Array. Note that this requires at least V8 3.3. In particular, this CL means that we will consume less memory executing Emscripten code. See http://trac.webkit.org/changeset/87197/ Bug: 5558474 Change-Id: I686d59acfdb56d03496f407d114826f35b4ff2c8
* Merge WebKit at r84325: Fix makefiles.Ben Murdoch2011-06-101-4/+1
| | | | | | | See http://trac.webkit.org/changeset/82562 for new XMLTreeViewer generation. Change-Id: I52c8d510602e7e77ea6a134510f8e5bb6b0c4d9a
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-101-0/+4
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Fix makefilesSteve Block2011-06-081-0/+2
| | | | Change-Id: Ia541ed77797442b5894b6fb88b3b829cc59c3535
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-081-1/+1
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Fix makefiles.Ben Murdoch2011-06-021-2/+0
| | | | | | | | | | | | | Add new and remove deleted files to fix makefiles. See http://trac.webkit.org/changeset/79861 for new XSLTreeViewer generation. Also remove a stub from TemporaryLInkStubs that we now get by compiling the correct files in JSC (see http://trac.webkit.org/changeset/78634). Change-Id: I550b035b7c9c915b42738366da7817dca020c9a8
* Merge WebKit at r80534: Fix conflicts.Ben Murdoch2011-06-021-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android.jscbindings.mk 79223 Conflict due to http://trac.webkit.org/changeset/79223 Android.mk Conflicts due to http://trac.webkit.org/changeset/79825 and http://trac.webkit.org/changeset/79978 Android.v8bindings.mk 80367 Conflicts due to http://trac.webkit.org/changeset/80103 and http://trac.webkit.org/changeset/80367 HTMLMediaElement.cpp Conflicts due to http://trac.webkit.org/changeset/80030 and local TOUCH_EVENTS modifications. HTMLDocumentParser.cpp Conflict due to http://trac.webkit.org/changeset/79772 and local ANDROID_INSTRUMENT modifications. CachedResourceLoader.cpp|h Conflicts due to http://trac.webkit.org/changeset/78602 and ANDROID_BLOCK_NETWORK_IMAGE. MemoryCache.h Conflicts due to http://trac.webkit.org/changeset/78848 and ANDROID_INSTRUMENT. FrameView.cpp Conflict due to http://trac.webkit.org/changeset/78928 and locally added updatePositionedObjects function. NetworkStateNotifier JobjectWrapper.cpp Git seems to have got confused with a rename here in JobjectWrapper.cpp, keep ours. Conflicts due to http://trac.webkit.org/changeset/79563 and local Android additions. PluginViewNone.cpp 79904 Conflicts due to http://trac.webkit.org/changeset/79904 and local cherry pick of http://trac.webkit.org/changeset/79988 RenderBox.cpp Conflicts due to http://trac.webkit.org/changeset/79467 and local android modifications. Change-Id: I98bd80de86b5169212da137ad3df42c1c35e8931
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-021-2/+10
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-241-2/+2
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Fix conflicts.Ben Murdoch2011-05-231-3/+0
| | | | | | | | | | | | | | | | | | | | | Android.jscbindings.mk Conflict due to local addition of EntrySyncCustom.cpp and http://trac.webkit.org/changeset/76216 V8NPUtils.cpp Conflict due to local cherry pick of http://trac.webkit.org/changeset/78994 and merge of http://trac.webkit.org/changeset/76264 FrameView.h Conflict due to local addition of updatePositionedObjects() and http://trac.webkit.org/changeset/76278 RangeInputType.cpp SliderThumbElement.cpp Conflicts due to Android addition of touch handling code in slider code. See http://trac.webkit.org/changeset/76147 .gitignore - keep ours Change-Id: I38aeb361a37e7939f805c6689d7cc8fc720b3e52
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-231-1/+4
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Merge WebKit at r75315: Fix MakefilesSteve Block2011-05-131-16/+0
| | | | | | See http://trac.webkit.org/changeset/74646 Change-Id: Ib0ef9902925ddb13ec97fad0753515b10b1d3c01
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-0/+250
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84