diff options
| author | John Reck <jreck@google.com> | 2010-11-04 13:06:22 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 11:38:05 -0800 |
| commit | 4326279fef480892cd059ad1c738f1320601d33f (patch) | |
| tree | 13de437387ce10eedf27a72222c466562f32dd3e /JavaScriptCore/wtf | |
| parent | e14391e94c850b8bd03680c23b38978db68687a8 (diff) | |
| download | external_webkit-4326279fef480892cd059ad1c738f1320601d33f.zip external_webkit-4326279fef480892cd059ad1c738f1320601d33f.tar.gz external_webkit-4326279fef480892cd059ad1c738f1320601d33f.tar.bz2 | |
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
Diffstat (limited to 'JavaScriptCore/wtf')
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 18 |
1 files changed, 1 insertions, 17 deletions
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 |