diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-03 18:28:41 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-03 18:28:41 -0800 |
commit | 648161bb0edfc3d43db63caed5cc5213bc6cb78f (patch) | |
tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /WebKitLibraries/win | |
parent | a65af38181ac7d34544586bdb5cd004de93897ad (diff) | |
download | external_webkit-648161bb0edfc3d43db63caed5cc5213bc6cb78f.zip external_webkit-648161bb0edfc3d43db63caed5cc5213bc6cb78f.tar.gz external_webkit-648161bb0edfc3d43db63caed5cc5213bc6cb78f.tar.bz2 |
auto import from //depot/cupcake/@135843
Diffstat (limited to 'WebKitLibraries/win')
-rw-r--r-- | WebKitLibraries/win/include/SafariTheme/SafariThemeConstants.h | 1 | ||||
-rw-r--r-- | WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h | 75 | ||||
-rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface.lib | bin | 124648 -> 0 bytes | |||
-rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib | bin | 65018 -> 0 bytes | |||
-rwxr-xr-x | WebKitLibraries/win/tools/WinTools.make | 3 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/scripts/PRODUCTVERSION | 1 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/scripts/VERSION | 1 | ||||
-rwxr-xr-x | WebKitLibraries/win/tools/scripts/auto-version.sh | 75 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/common.vsprops | 47 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/debug.vsprops | 35 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/debug_internal.vsprops | 26 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/release.vsprops | 43 |
12 files changed, 0 insertions, 307 deletions
diff --git a/WebKitLibraries/win/include/SafariTheme/SafariThemeConstants.h b/WebKitLibraries/win/include/SafariTheme/SafariThemeConstants.h deleted file mode 100644 index e21d6ae..0000000 --- a/WebKitLibraries/win/include/SafariTheme/SafariThemeConstants.h +++ /dev/null @@ -1 +0,0 @@ -// This is a placeholder header used in WebCore/rendering/RenderThemeSafari.h until a version of WebKitSupportLibrary containing this header is released diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h deleted file mode 100644 index 9d3c969..0000000 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2007 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef WebKitSystemInterface_h -#define WebKitSystemInterface_h - -struct CGAffineTransform; -struct CGPoint; -struct CGSize; - -typedef const struct __CFData* CFDataRef; -typedef const struct __CFString* CFStringRef; -typedef struct CGColor* CGColorRef; -typedef struct CGContext* CGContextRef; -typedef unsigned short CGFontIndex; -typedef struct CGFont* CGFontRef; -typedef CGFontIndex CGGlyph; -typedef wchar_t UChar; -typedef struct _CFURLResponse* CFURLResponseRef; -typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef; -typedef struct _CFURLRequest* CFMutableURLRequestRef; -typedef const struct _CFURLRequest* CFURLRequestRef; - -void wkSetFontSmoothingLevel(int type); -int wkGetFontSmoothingLevel(); -uint32_t wkSetFontSmoothingStyle(CGContextRef cg, bool fontAllowsSmoothing); -void wkRestoreFontSmoothingStyle(CGContextRef cg, uint32_t oldStyle); -void wkSetCGContextFontRenderingStyle(CGContextRef, bool isSystemFont, bool isPrinterFont); -void wkGetGlyphAdvances(CGFontRef, const CGAffineTransform&, bool isSystemFont, bool isPrinterFont, CGGlyph, CGSize& advance); -void wkGetGlyphs(CGFontRef, const UChar[], CGGlyph[], size_t count); -void wkSetUpFontCache(size_t s); -void wkAddFontsInDirectory(CFStringRef); -void wkAddFontsAtPath(CFStringRef); -void wkAddFontsFromPlistRepresentation(CFDataRef); -CFDataRef wkCreateFontsPlistRepresentation(); - -void wkSetPatternBaseCTM(CGContextRef, CGAffineTransform); -void wkSetPatternPhaseInUserSpace(CGContextRef, CGPoint phasePoint); - -void wkDrawFocusRing(CGContextRef, CGColorRef, float radius); - -CFDictionaryRef wkGetSSLCertificateInfo(CFURLResponseRef); -void* wkGetSSLPeerCertificateData(CFDictionaryRef); -CFHTTPCookieStorageRef wkGetDefaultHTTPCookieStorage(); -void wkSetCFURLRequestShouldContentSniff(CFMutableURLRequestRef, bool); -CFStringRef wkCopyFoundationCacheDirectory(); -void wkSetClientCertificateInSSLProperties(CFMutableDictionaryRef, CFDataRef); - -bool wkCanAccessCFURLRequestHTTPBodyParts(); -CFArrayRef wkCFURLRequestCopyHTTPRequestBodyParts(CFURLRequestRef); -void wkCFURLRequestSetHTTPRequestBodyParts(CFMutableURLRequestRef, CFArrayRef bodyParts); - -#endif // WebKitSystemInterface_h diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib Binary files differdeleted file mode 100644 index 2d8df77..0000000 --- a/WebKitLibraries/win/lib/WebKitSystemInterface.lib +++ /dev/null diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib Binary files differdeleted file mode 100644 index 9bc4e47..0000000 --- a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib +++ /dev/null diff --git a/WebKitLibraries/win/tools/WinTools.make b/WebKitLibraries/win/tools/WinTools.make deleted file mode 100755 index c487e01..0000000 --- a/WebKitLibraries/win/tools/WinTools.make +++ /dev/null @@ -1,3 +0,0 @@ -install: - xcopy "$(SRCROOT)\vsprops\*.vsprops" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y - xcopy "$(SRCROOT)\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y diff --git a/WebKitLibraries/win/tools/scripts/PRODUCTVERSION b/WebKitLibraries/win/tools/scripts/PRODUCTVERSION deleted file mode 100644 index 5186d07..0000000 --- a/WebKitLibraries/win/tools/scripts/PRODUCTVERSION +++ /dev/null @@ -1 +0,0 @@ -4.0 diff --git a/WebKitLibraries/win/tools/scripts/VERSION b/WebKitLibraries/win/tools/scripts/VERSION deleted file mode 100644 index 9dbddfa..0000000 --- a/WebKitLibraries/win/tools/scripts/VERSION +++ /dev/null @@ -1 +0,0 @@ -528 diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh deleted file mode 100755 index c7f064c..0000000 --- a/WebKitLibraries/win/tools/scripts/auto-version.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/bash - -# Copyright (C) 2007 Apple Inc. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -SRCPATH=`cygpath -u "$WEBKITLIBRARIESDIR\Tools\Scripts"` -VERSIONPATH=`cygpath -u "$1"` -VERSIONPATH=$VERSIONPATH/include -VERSIONFILE=$VERSIONPATH/autoversion.h -mkdir -p "$VERSIONPATH" - -PRODUCTVERSION=`cat "$SRCPATH/PRODUCTVERSION"` -MAJORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/'` -MINORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/'` -TINYVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/'` -if [ "$TINYVERSION" == "" ]; then - TINYVERSION=0 -fi - -if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then - PROPOSEDVERSION=$(cat "$SRCPATH/VERSION") -else - PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION" -fi - -BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'` -BLDMINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'` -BLDVARIANTVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/'` -if [ "$BLDMINORVERSION" == "" ]; then - BLDMINORVERSION=0 -fi -if [ "$BLDVARIANTVERSION" == "" ]; then - BLDVARIANTVERSION=0 -fi -SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed 's/^Revision: \(.*\)/\1/'` - -BLDNMBR="$PROPOSEDVERSION" -BLDNMBRSHORT="$BLDNMBR" - -if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then - BLDNMBRSHORT="$BLDNMBRSHORT+" - BLDNMBR="$BLDNMBRSHORT $(whoami) - $(date) - r$SVNOPENSOURCEREVISION" -fi - -cat > "$VERSIONFILE" <<EOF -#define __VERSION_TEXT__ "$PRODUCTVERSION ($BLDNMBR)" -#define __BUILD_NUMBER_SHORT__ "$BLDNMBRSHORT" -#define __VERSION_MAJOR__ $MAJORVERSION -#define __VERSION_MINOR__ $MINORVERSION -#define __VERSION_TINY__ $TINYVERSION -#define __BUILD_NUMBER_MAJOR__ $BLDMAJORVERSION -#define __BUILD_NUMBER_MINOR__ $BLDMINORVERSION -#define __BUILD_NUMBER_VARIANT__ $BLDVARIANTVERSION -#define __SVN_REVISION__ $SVNREVISION -EOF diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops deleted file mode 100644 index c44099f..0000000 --- a/WebKitLibraries/win/tools/vsprops/common.vsprops +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="common" - OutputDirectory="$(WebKitOutputDir)\bin" - IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/GS" - PreprocessorDefinitions="WIN32;_WINDOWS;_WIN32_WINNT=0x500;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;__PRODUCTION__=0$(PRODUCTION);_HAS_EXCEPTIONS=0" - ExceptionHandling="0" - RuntimeTypeInfo="false" - WarningLevel="4" - WarnAsError="true" - DebugInformationFormat="3" - DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4189;4244;4275;4291;4305;4344;4355;4389;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387" - /> - <Tool - Name="VCLibrarianTool" - AdditionalOptions="/ignore:4221" - OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib" - /> - <Tool - Name="VCLinkerTool" - LinkLibraryDependencies="false" - AdditionalOptions="/SAFESEH /FIXED:NO /dynamicbase /ignore:4221" - OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe" - AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib"" - GenerateDebugInformation="true" - SubSystem="2" - ImportLibrary="$(WebKitOutputDir)\lib\$(TargetName).lib" - TargetMachine="1" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="__PRODUCTION__=0$(PRODUCTION)" - WarnAsError="true" - HeaderFileName="$(OutDir)\$(InputName).h" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1033" - AdditionalIncludeDirectories=""$(IntDir)\include"" - /> -</VisualStudioPropertySheet> diff --git a/WebKitLibraries/win/tools/vsprops/debug.vsprops b/WebKitLibraries/win/tools/vsprops/debug.vsprops deleted file mode 100644 index 9ab8f20..0000000 --- a/WebKitLibraries/win/tools/vsprops/debug.vsprops +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="debug" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="2" - /> - <Tool - Name="VCLinkerTool" - LinkIncremental="2" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <UserMacro - Name="WebKitConfigSuffix" - Value="_debug" - PerformEnvironmentSet="true" - /> - <UserMacro - Name="LibraryConfigSuffix" - Value="" - PerformEnvironmentSet="true" - /> - <UserMacro - Name="WebKitDLLConfigSuffix" - Value="" - /> -</VisualStudioPropertySheet> diff --git a/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops b/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops deleted file mode 100644 index ef7674a..0000000 --- a/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="debug_internal" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="USE_DEBUG_SAFARI_THEME;DEBUG_INTERNAL" - RuntimeLibrary="3" - /> - <UserMacro - Name="WebKitConfigSuffix" - Value="_debug" - PerformEnvironmentSet="true" - /> - <UserMacro - Name="LibraryConfigSuffix" - Value="_debug" - PerformEnvironmentSet="true" - /> - <UserMacro - Name="WebKitDLLConfigSuffix" - Value="_debug" - /> -</VisualStudioPropertySheet> diff --git a/WebKitLibraries/win/tools/vsprops/release.vsprops b/WebKitLibraries/win/tools/vsprops/release.vsprops deleted file mode 100644 index 109176d..0000000 --- a/WebKitLibraries/win/tools/vsprops/release.vsprops +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="release" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="NDEBUG" - RuntimeLibrary="2" - /> - <Tool - Name="VCLinkerTool" - LinkIncremental="1" - StripPrivateSymbols="$(WebKitOutputDir)\public\sym\$(TargetName).pdb" - OptimizeReferences="2" - EnableCOMDATFolding="2" - OptimizeForWindows98="1" - /> - <Tool - Name="VCPreLinkEventTool" - CommandLine="if not exist "$(WebKitOutputDir)\public\sym" mkdir "$(WebKitOutputDir)\public\sym"" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - /> - <UserMacro - Name="WebKitConfigSuffix" - Value="" - PerformEnvironmentSet="true" - /> - <UserMacro - Name="LibraryConfigSuffix" - Value="" - PerformEnvironmentSet="true" - /> - <UserMacro - Name="WebKitDLLConfigSuffix" - Value="" - /> -</VisualStudioPropertySheet> |