summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/Android.jscbindings.mk
Commit message (Collapse)AuthorAgeFilesLines
* 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
generated by cgit v1.1 at 2024-08-28 09:14:12 +0000