From 82eeb7b660065e6e990280e6563ca7eafe4be1cd Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 11 Aug 2010 15:21:07 +0100 Subject: Merge Webkit at r65072 : Fix conflicts. HTMLInputElement.cpp: New include. See http://trac.webkit.org/changeset/64616 TemporaryLinkStubs.cpp, Navigator.h: Relocation of string forwarders. See http://trac.webkit.org/changeset/65021 GraphicsContext.h, ImageSource.h: addition of WebCore namespace on Chromium's NativeImagePtr type. See http://trac.webkit.org/changeset/64584 Platform.h: Renaming of iPhone PLATFORM macros. See http://trac.webkit.org/changeset/64798 Change-Id: Ife412e30f733fe6bb66321a3600814d6499ddf70 --- JavaScriptCore/wtf/Platform.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'JavaScriptCore') diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 8bf0d86..95eb67f 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -1060,15 +1060,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ #endif #endif -<<<<<<< HEAD #if PLATFORM(ANDROID) && !defined WTF_USE_ACCELERATED_COMPOSITING #define WTF_USE_ACCELERATED_COMPOSITING 1 #endif -#if PLATFORM(IPHONE) -======= #if PLATFORM(IOS) ->>>>>>> webkit.org at r65072 #define WTF_USE_ACCELERATED_COMPOSITING 1 #endif -- cgit v1.1