From 4326279fef480892cd059ad1c738f1320601d33f Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 4 Nov 2010 13:06:22 -0700 Subject: Merge Webkit at r70949: Fix conflicts. JavaScriptCore/wtf/Platform.h http://trac.webkit.org/changeset/70726 WebCore/Android.derived.v8bindings.mk http://trac.webkit.org/changeset/70854 WebCore/Android.jscbindings.mk http://trac.webkit.org/changeset/70854 WebCore/Android.mk http://trac.webkit.org/changeset/70854 WebCore/css/CSSStyleSelector.cpp http://trac.webkit.org/changeset/70250 WebCore/page/Settings.cpp http://trac.webkit.org/changeset/70714 WebCore/page/Settings.h http://trac.webkit.org/changeset/70714 WebCore/rendering/RenderBox.h http://trac.webkit.org/changeset/70482 http://trac.webkit.org/changeset/70664 http://trac.webkit.org/changeset/70917 Change-Id: I0cdaca316df016c3885a23d42ee2038777b7ccff --- JavaScriptCore/wtf/Platform.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'JavaScriptCore/wtf') diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index ac4ef5a..1877917 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -1074,29 +1074,13 @@ #define WTF_USE_ATSUI 1 #define WTF_USE_CORE_TEXT 0 #endif -<<<<<<< HEAD - -/* Accelerated compositing */ -#if !defined(BUILDING_ON_TIGER) -#define WTF_USE_ACCELERATED_COMPOSITING 1 -#endif #endif +/* Accelerated compositing */ #if PLATFORM(ANDROID) && !defined WTF_USE_ACCELERATED_COMPOSITING #define WTF_USE_ACCELERATED_COMPOSITING 1 #endif -#if PLATFORM(IOS) -#define WTF_USE_ACCELERATED_COMPOSITING 1 -#endif - -#if PLATFORM(QT) -#define WTF_USE_ACCELERATED_COMPOSITING 1 -======= ->>>>>>> webkit.org at r70949 -#endif - -/* Accelerated compositing */ #if (PLATFORM(MAC) && !defined(BUILDING_ON_TIGER)) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE) &&!defined(WIN_CAIRO)) #define WTF_USE_ACCELERATED_COMPOSITING 1 #endif -- cgit v1.1