diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-09 13:37:59 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 14:52:58 +0100 |
| commit | bbcce278be9be6a85f47928c38a74c8d36a13a85 (patch) | |
| tree | fe640d64b3947c079408a69bec6dfa431be9dd39 /Source/JavaScriptCore | |
| parent | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (diff) | |
| download | external_webkit-bbcce278be9be6a85f47928c38a74c8d36a13a85.zip external_webkit-bbcce278be9be6a85f47928c38a74c8d36a13a85.tar.gz external_webkit-bbcce278be9be6a85f47928c38a74c8d36a13a85.tar.bz2 | |
Merge WebKit at r84325: Fix conflicts.
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
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/wtf/Platform.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h index 3e93b60..43b234a 100644 --- a/Source/JavaScriptCore/wtf/Platform.h +++ b/Source/JavaScriptCore/wtf/Platform.h @@ -636,17 +636,10 @@ #define ENABLE_WEB_ARCHIVE 1 #endif /* PLATFORM(MAC) && !PLATFORM(IOS) */ -<<<<<<< HEAD #if PLATFORM(ANDROID) #define ENABLE_FULLSCREEN_API 1 #endif -#if PLATFORM(MAC) -#define WTF_USE_CARBON_SECURE_INPUT_MODE 1 -#endif - -======= ->>>>>>> WebKit.org at r84325 #if PLATFORM(CHROMIUM) && OS(DARWIN) #define WTF_USE_CF 1 #define WTF_USE_PTHREADS 1 @@ -686,10 +679,7 @@ #if PLATFORM(ANDROID) #define WTF_USE_PTHREADS 1 -<<<<<<< HEAD #define WTF_USE_SKIA 1 -======= ->>>>>>> WebKit.org at r84325 #define USE_SYSTEM_MALLOC 1 #define ENABLE_JAVA_BRIDGE 1 #define LOG_DISABLED 1 |