diff options
| author | Steve Block <steveblock@google.com> | 2010-02-05 14:38:24 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-15 10:52:59 +0000 |
| commit | 1eef9cbdc7e99b57fa05bfd7e4baefc4a452fbe8 (patch) | |
| tree | ced32617716bb0781d7d37837cf3e8d5fd5480ad /JavaScriptCore | |
| parent | 5e2bc6953fe6923165b8a5d7679939693a1d58d6 (diff) | |
| download | external_webkit-1eef9cbdc7e99b57fa05bfd7e4baefc4a452fbe8.zip external_webkit-1eef9cbdc7e99b57fa05bfd7e4baefc4a452fbe8.tar.gz external_webkit-1eef9cbdc7e99b57fa05bfd7e4baefc4a452fbe8.tar.bz2 | |
Merge webkit.org at r54340 : Fix merge conflicts
- 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
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 166a955..d61d596 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -929,13 +929,9 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ #if (CPU(X86) && PLATFORM(MAC)) \ || (CPU(X86_64) && PLATFORM(MAC)) \ || (CPU(ARM_THUMB2) && PLATFORM(IPHONE)) \ -<<<<<<< HEAD || (CPU(ARM_THUMB2) && PLATFORM(ANDROID) && ENABLE(ANDROID_JSC_JIT)) \ - || (CPU(X86) && PLATFORM(WIN)) -======= || (CPU(X86) && PLATFORM(WIN)) \ || (CPU(X86) && PLATFORM(WX)) ->>>>>>> webkit.org at r54340 #define ENABLE_YARR 1 #define ENABLE_YARR_JIT 1 #endif |