Changeset 70320 in webkit


Ignore:
Timestamp:
Oct 22, 2010 11:40:30 AM (14 years ago)
Author:
Adam Roben
Message:

Turn on ENABLE_3D_RENDERING on all Windows builds

Reviewed by Sam Weinig.

JavaScriptCore:

Remove the QuartzCorePresent.h mechanism

This header was used to detect whether QuartzCore headers were present
on the system. Everyone should have these headers now so we no longer
need to detect.

  • JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh: Remove

code to generate QuartzCorePresent.h.

  • wtf/Platform.h: Stop including QuartzCorePresent.h on Windows and

collapse all USE_ACCELERATED_COMPOSITING settings into one #ifdef.

WebKitLibraries:

  • win/tools/vsprops/FeatureDefines.vsprops:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r70318 r70320  
     12010-10-22  Adam Roben  <aroben@apple.com>
     2
     3        Remove the QuartzCorePresent.h mechanism
     4
     5        This header was used to detect whether QuartzCore headers were present
     6        on the system. Everyone should have these headers now so we no longer
     7        need to detect.
     8
     9        Reviewed by Sam Weinig.
     10
     11        * JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh: Remove
     12        code to generate QuartzCorePresent.h.
     13
     14        * wtf/Platform.h: Stop including QuartzCorePresent.h on Windows and
     15        collapse all USE_ACCELERATED_COMPOSITING settings into one #ifdef.
     16
    1172010-10-22  Adam Barth  <abarth@webkit.org>
    218

  • trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh

    r63833 r70320  
    11#!/usr/bin/bash
    2 
    3 # Determine if we have QuartzCore so we can turn on
    4 QUARTZCORE_H_PATH=$(cygpath -u "${WEBKITLIBRARIESDIR}/include/QuartzCore/QuartzCore.h")
    5 QUARTZCOREPRESENT_H_PATH=$(cygpath -u "${WEBKITOUTPUTDIR}/include/private/QuartzCorePresent.h")
    6 if test \( ! -f "${QUARTZCOREPRESENT_H_PATH}" \) -o \( -f "${QUARTZCORE_H_PATH}" -a \( "${QUARTZCORE_H_PATH}" -nt "${QUARTZCOREPRESENT_H_PATH}" \) \)
    7 then
    8     mkdir -p "$(dirname "${QUARTZCOREPRESENT_H_PATH}")"
    9     test ! -f "${QUARTZCORE_H_PATH}"
    10     echo "#define QUARTZCORE_PRESENT $?" > "${QUARTZCOREPRESENT_H_PATH}"
    11 fi
    122
    133# Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4

  • trunk/JavaScriptCore/wtf/Platform.h

    r70126 r70320  
    10681068#define WTF_USE_CORE_TEXT 0
    10691069#endif
     1070#endif
    10701071
    10711072/* Accelerated compositing */
    1072 #if !defined(BUILDING_ON_TIGER)
     1073#if (PLATFORM(MAC) && !defined(BUILDING_ON_TIGER)) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE))
    10731074#define WTF_USE_ACCELERATED_COMPOSITING 1
    1074 #endif
    1075 #endif
    1076 
    1077 #if PLATFORM(IOS)
    1078 #define WTF_USE_ACCELERATED_COMPOSITING 1
    1079 #endif
    1080 
    1081 #if PLATFORM(QT)
    1082 #define WTF_USE_ACCELERATED_COMPOSITING 1
    1083 #endif
    1084 
    1085 /* FIXME: Defining ENABLE_3D_RENDERING here isn't really right, but it's always used with
    1086    with WTF_USE_ACCELERATED_COMPOSITING, and it allows the feature to be turned on and
    1087    off in one place. */
    1088 #if PLATFORM(WIN) && !OS(WINCE)
    1089 #include "QuartzCorePresent.h"
    1090 #if QUARTZCORE_PRESENT
    1091 #define WTF_USE_ACCELERATED_COMPOSITING 1
    1092 #define ENABLE_3D_RENDERING 1
    1093 #endif
    10941075#endif
    10951076

  • trunk/WebKitLibraries/ChangeLog

    r70131 r70320  
     12010-10-22  Adam Roben  <aroben@apple.com>
     2
     3        Turn on ENABLE_3D_RENDERING on all Windows builds
     4
     5        Reviewed by Sam Weinig.
     6
     7        * win/tools/vsprops/FeatureDefines.vsprops:
     8
    192010-10-20  Adam Roben  <aroben@apple.com>
    210

  • trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops

    r67614 r70320  
    1919  <UserMacro
    2020                Name="ENABLE_3D_RENDERING"
    21                 Value=""
     21                Value="ENABLE_3D_RENDERING"
    2222                PerformEnvironmentSet="true"
    2323        />
Note: See TracChangeset for help on using the changeset viewer.