summaryrefslogtreecommitdiffstats
path: root/Source/JavaScriptCore
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at branches/chromium/742 r89068: Initial merge by Git.Ben Murdoch2011-07-131-7/+17
| | | | | | Take us to top of Chrome 12 release branch (12.0.742.130) Change-Id: I4408a97e343a118cf4a1bb9d71367bcc2c16ae48
* Adds WebTiming IDL files to build and sets ENABLE_WEB_TIMINGSteve Block2011-06-141-0/+1
| | | | | Bug: 4442995 Change-Id: I9c37d7022946fd66e1ee635328182bf1456b0de7
* Merge WebKit at branches/chromium/742 r88085: Initial merge by git.Steve Block2011-06-142-10/+3
| | | | Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
* Move all ANDROID defines to wtf/Platform.hSteve Block2011-06-141-18/+103
| | | | | | | | | | | | | | This patch moves many defines from WebCore/config.h to keep all of the Android defines together. Also, WebCore/config.h should not be used by JavaScriptCore (though currently it is on Android), whereas wtf/Platform.h is always included. Some Android defines in WebCore/config.h are already usptreamed, but will be removed in https://bugs.webkit.org/show_bug.cgi?id=62602 Change-Id: Ic6d8c45f4f846a2a7a2d9766179302526c10e2af
* Merge WebKit at r84325: Fix makefiles.Ben Murdoch2011-06-101-3/+2
| | | | | | | See http://trac.webkit.org/changeset/82562 for new XMLTreeViewer generation. Change-Id: I52c8d510602e7e77ea6a134510f8e5bb6b0c4d9a
* Merge WebKit at r84325: Fix conflicts.Ben Murdoch2011-06-101-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platform.h ENABLE_FULLSCREEN_API (http://trac.webkit.org/changeset/83997) WTF_USE_SKIA (http://trac.webkit.org/changeset/84106) JSNavigatorCustom.cpp V8NavigatorCustom.cpp ENABLE(APPLICATION_INSTALLED) (http://trac.webkit.org/changeset/83287) CSSStyleSelector.cpp ANDROID_CSS_RING (http://trac.webkit.org/changeset/83986) Document.cpp ANDROID_META_SUPPORT (http://trac.webkit.org/changeset/83349) ANDROID_INSTRUMENT (http://trac.webkit.org/changeset/82992) HTMLInputElement.cpp ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS (http://trac.webkit.org/changeset/82534) RangeInputType.cpp ENABLE(TOUCH_EVENTS) (http://trac.webkit.org/changeset/83256/) ChromeClient.h ANDROID_INSTALLABLE_WEB_APPS (http://trac.webkit.org/changeset/83375) EventHandler.cpp PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83522) Settings ANDROID_PLUGINS (http://trac.webkit.org/changeset/83201) ANDROID_BLOCK_NETWORK_IMAGE (http://trac.webkit.org/changeset/83628) Gradient.cpp Graphicscontext.cpp HTMLCanvasElement.cpp USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84088) USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84101) PluginView.h ANDROID_PLUGINS (http://trac.webkit.org/changeset/84071) RenderBox.h ANDROID_LAYOUT (http://trac.webkit.org/changeset/82611) RenderIframe.cpp (moved code to RenderPart.cpp) PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83518) RenderLayer.cpp ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83899) RenderLayer.h RenderLayerBacking.cpp ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83820) Change-Id: Ieabe98f4e01610b6a73e961b673e2fa99b0010e7
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-10294-4798/+12825
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r82507: Fix makefilesSteve Block2011-06-081-0/+1
| | | | Change-Id: Ia541ed77797442b5894b6fb88b3b829cc59c3535
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-08290-3107/+14905
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Update uses of PLATFORM(SKIA).Ben Murdoch2011-06-021-1/+1
| | | | | | | | | PLATFORM(SKIA) is replaced with USE(SKIA), see http://trac.webkit.org/changeset/79578 Fix conflicts and update our code to reflect this. Change-Id: Ia23956874418552eb8f107d389557a4cdcb225b6
* Merge WebKit at r80534: Fix makefiles.Ben Murdoch2011-06-022-1/+10
| | | | | | | | | | | | | 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: Intial merge by GitBen Murdoch2011-06-02271-27306/+32481
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guardSteve Block2011-05-251-7/+1
| | | | | | | | | | | | | This replaces, and therefore conflicts with, Android's existing ENABLE_ARCHIVE guard. This change resolves the conflicts by taking the upstream guard in WebCore, updates WebKit to use the new guard, and enables this guard on Android. See http://trac.webkit.org/changeset/78439 See also http://trac.webkit.org/changeset/78342 for FrameLoader.cpp Change-Id: I28ebaf3d69ea4c352ab4cfbf91c33a8ba25f89b5
* Merge WebKit at r78450: Fix MakefilesSteve Block2011-05-242-33/+12
| | | | | | PCRE switched for YARR - http://trac.webkit.org/changeset/78042 Change-Id: Ie5090e0d7a174e3c2975b807d0b4769b15494156
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-24216-11989/+7909
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-23112-459/+1358
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Fix some compiler warningsSteve Block2011-05-191-1/+1
| | | | Change-Id: I4c5fde4898313b26c9a97bd9571b02eaeb35c684
* Merge WebKit at r75993: Fix MakefilesBen Murdoch2011-05-161-7/+1
| | | | Change-Id: I81db2c8ade83fcaf85db13629a12b7e0d2e6dccc
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-1685-1895/+4063
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Fix MakefilesSteve Block2011-05-131-6/+2
| | | | | | See http://trac.webkit.org/changeset/74646 Change-Id: Ib0ef9902925ddb13ec97fad0753515b10b1d3c01
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121928-0/+535558
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
generated by cgit v1.1 at 2025-05-21 00:36:26 +0000