Code drop from //branches/cupcake/...@124589

7 files changed, 30 insertions, 56 deletions

diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index cb41ffd..9d3c969 100644
--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
@@ -45,8 +45,9 @@ typedef const struct _CFURLRequest* CFURLRequestRef;
 
 void wkSetFontSmoothingLevel(int type);
 int wkGetFontSmoothingLevel();
-uint32_t wkSetFontSmoothingStyle(CGContextRef cg);
+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);
diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
index 116018e..2d8df77 100644
--- a/WebKitLibraries/win/lib/WebKitSystemInterface.lib
+++ b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
index 162d92d..9bc4e47 100644
--- a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
+++ b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
diff --git a/WebKitLibraries/win/tools/scripts/PRODUCTVERSION b/WebKitLibraries/win/tools/scripts/PRODUCTVERSION
index 06a4457..5186d07 100644
--- a/WebKitLibraries/win/tools/scripts/PRODUCTVERSION
+++ b/WebKitLibraries/win/tools/scripts/PRODUCTVERSION
@@ -1 +1 @@
-3.1
\ No newline at end of file
+4.0
diff --git a/WebKitLibraries/win/tools/scripts/VERSION b/WebKitLibraries/win/tools/scripts/VERSION
index 642ea6f..9dbddfa 100644
--- a/WebKitLibraries/win/tools/scripts/VERSION
+++ b/WebKitLibraries/win/tools/scripts/VERSION
@@ -1 +1 @@
-525
+528
diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh
index a93f4af..c7f064c 100755
--- a/WebKitLibraries/win/tools/scripts/auto-version.sh
+++ b/WebKitLibraries/win/tools/scripts/auto-version.sh
@@ -30,29 +30,22 @@ VERSIONFILE=$VERSIONPATH/autoversion.h
 mkdir -p "$VERSIONPATH"
 
 PRODUCTVERSION=`cat "$SRCPATH/PRODUCTVERSION"`
-MAJORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/' "$SRCPATH/PRODUCTVERSION"`
-MINORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/' "$SRCPATH/PRODUCTVERSION"`
-TINYVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/' "$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
-    echo -n `cat "$SRCPATH/VERSION"` > "$VERSIONFILE"
+    PROPOSEDVERSION=$(cat "$SRCPATH/VERSION")
 else
-    echo -n $RC_PROJECTSOURCEVERSION > "$VERSIONFILE"
+    PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION"
 fi
 
-if [ `grep -c -E "4\.|4$" "$VERSIONFILE"` -ne 0 ]; then
-    echo "Can't set WebKit's version to something that ends in a 4!"
-    echo "If we do, someone's going to think it's Netscape 4."
-    echo "Radar bug 3787996 has some details."
-    exit 1
-fi
-
-BLDMAJORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/' "$VERSIONFILE"`
-BLDMINORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/' "$VERSIONFILE"`
-BLDVARIANTVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/' "$VERSIONFILE"`
+BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'`
+BLDMINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'`
+BLDVARIANTVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/'`
 if [ "$BLDMINORVERSION" == "" ]; then
     BLDMINORVERSION=0
 fi
@@ -61,43 +54,22 @@ if [ "$BLDVARIANTVERSION" == "" ]; then
 fi
 SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed 's/^Revision: \(.*\)/\1/'`
 
-BLDNMBR=`cat "$VERSIONFILE"`
-BLDNMBRSHORT=`cat "$VERSIONFILE"`
-BUILDER=""
+BLDNMBR="$PROPOSEDVERSION"
+BLDNMBRSHORT="$BLDNMBR"
 
 if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
-    echo -n "+" >> "$VERSIONFILE"
-    BLDNMBRSHORT=`cat "$VERSIONFILE"`
-    echo -n " " >> "$VERSIONFILE"
-    echo -n `whoami` >> "$VERSIONFILE"
-    echo -n " - " >> "$VERSIONFILE"
-    echo -n `date` >> "$VERSIONFILE"
-    echo -n " - r$SVNOPENSOURCEREVISION" >> "$VERSIONFILE"
-    BLDNMBR=`cat "$VERSIONFILE"`
+    BLDNMBRSHORT="$BLDNMBRSHORT+"
+    BLDNMBR="$BLDNMBRSHORT $(whoami) - $(date) - r$SVNOPENSOURCEREVISION"
 fi
 
-echo -n '#define __VERSION_TEXT__ "' > "$VERSIONFILE"
-echo -n $PRODUCTVERSION >> "$VERSIONFILE"
-echo -n " (" >> "$VERSIONFILE"
-echo -n $BLDNMBR >> "$VERSIONFILE"
-echo ')"' >> "$VERSIONFILE"
-echo -n '#define __BUILD_NUMBER_SHORT__ "' >> "$VERSIONFILE"
-echo -n $BLDNMBRSHORT >> "$VERSIONFILE"
-echo '"' >> "$VERSIONFILE"
-
-echo -n '#define __VERSION_MAJOR__ ' >> "$VERSIONFILE"
-echo $MAJORVERSION >> "$VERSIONFILE"
-echo -n '#define __VERSION_MINOR__ ' >> "$VERSIONFILE"
-echo $MINORVERSION >> "$VERSIONFILE"
-echo -n '#define __VERSION_TINY__ ' >> "$VERSIONFILE"
-echo $TINYVERSION >> "$VERSIONFILE"
-
-echo -n '#define __BUILD_NUMBER_MAJOR__ ' >> "$VERSIONFILE"
-echo $BLDMAJORVERSION >> "$VERSIONFILE"
-echo -n '#define __BUILD_NUMBER_MINOR__ ' >> "$VERSIONFILE"
-echo $BLDMINORVERSION >> "$VERSIONFILE"
-echo -n '#define __BUILD_NUMBER_VARIANT__ ' >> "$VERSIONFILE"
-echo $BLDVARIANTVERSION >> "$VERSIONFILE"
-
-echo -n '#define __SVN_REVISION__ ' >> "$VERSIONFILE"
-echo $SVNREVISION >> "$VERSIONFILE"
+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
index 2f247f9..c44099f 100644
--- a/WebKitLibraries/win/tools/vsprops/common.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/common.vsprops
@@ -15,16 +15,17 @@
 		WarningLevel="4"
 		WarnAsError="true"
 		DebugInformationFormat="3"
-		DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4189;4244;4275;4291;4355;4389;4510;4512;4610;4706;4800;4996;6011;6031;6211;6246;6255;6387"
+		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"
+                AdditionalOptions="/SAFESEH /FIXED:NO /dynamicbase /ignore:4221"
 		OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
 		AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;"
 		GenerateDebugInformation="true"