Merge in WebKit r47029.

14 files changed, 405 insertions, 22 deletions

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 886e6a9..66f1e38 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,315 @@
+2009-08-10  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by George Staikos.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27323
+        Even more line ending-stripping for auto-version.sh, based on output
+        provided by Jessie Berlin.
+
+        * win/tools/scripts/auto-version.sh:
+
+2009-08-10  Brent Fulgham  <bfulgham@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28048.
+        Move various WinCairo build settings into *.vsprops file.
+
+        * win/tools/vsprops/cURL.vsprops: Added.
+
+2009-08-06  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Adam Barth.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27323
+        Strip line endings at all points auto-version.sh reads data, not just
+        the one I happened to run into.
+
+        * win/tools/scripts/auto-version.sh:
+
+2009-07-27  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Adam Roben.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27323
+        Correctly parse command output, even when the line endings are not LF,
+        so that we don't create an autoversion.h that MSVC chokes on.
+
+        * win/tools/scripts/auto-version.sh:
+
+2009-07-13  Brent Fulgham  <bfulgham@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        Add new configuration flag for redistributable Windows build.
+        https://bugs.webkit.org/show_bug.cgi=27087
+        
+        * win/tools/vsprops/WinCairo.vsprops: Added.  Defines the
+          new WIN_CAIRO flag used to drive non-Apple Windows build.
+
+2009-07-10  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Update WebKitSystemInterface for <rdar://problem/7049066>.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-07-06  Eric Carlson  <eric.carlson@apple.com>
+
+        Update WebKitSystemInterface for <rdar://problem/7008093>.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-07-06  Anders Carlsson  <andersca@apple.com>
+
+        Update WebKitSystemInterface.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-07-02  Pierre d'Herbemont  <pdherbemont@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Update WebKitSystemInterface for <rdar://problem/6518119>
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-07-01  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Update WebKitSystemInterface for <rdar://problem/7014990>
+
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-06-29  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Update WebKitSystemInterface for <rdar://problem/7014813>
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-06-25  Simon Fraser  <simon.fraser@apple.com>
+
+        Rubber-stamped by Mark Rowe.
+        
+        <rdar://problem/6999737>
+        
+        Update the media controller images.
+
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-06-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Rubber-stamped by Anders Carlsson.
+
+        Update WebKitSystemInterface for <rdar://problem/6937882>.
+
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-06-02  Anders Carlsson  <andersca@apple.com>
+
+        Rubber-stamped by Mark Rowe.
+
+        Update WebKitSystemInterface.
+
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-05-27  Mark Rowe  <mrowe@apple.com>
+
+        Rubber-stamped by Dan Bernstein.
+
+        Update WebKitSystemInterface.
+
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a: Added.
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-05-26  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        <rdar://problem/6901751> 
+        REGRESSION (r35515): Tiger crash painting the selection on registration page of car2go.com
+
+        Remove WKCGContextIsSafeToClip.
+        
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-05-21  Dan Bernstein  <mitz@apple.com>
+
+        Rubber-stamped by Mark Rowe.
+
+        - correct a copyright header accidently reverted in r43964
+
+        * WebKitSystemInterface.h:
+
+2009-05-21  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        - WebKitSystemInterface part of <rdar://problem/6901751> REGRESSION
+          (r35515): Tiger crash painting the selection on registration page of
+          car2go.com
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-05-07  Simon Fraser  <simon.fraser@apple.com>
+
+        Source changes reviewed by Darin Adler
+        
+        <rdar://problem/6864091> Endcap of media controls slider is fuzzy
+        
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-04-28  Steve Falkenburg  <sfalken@apple.com>
+
+        Fix extraneous warning about AnalyzeWithLargeStack not being defined in Windows builds.
+        Indirected definition through a UserMacro.
+        
+        Reviewed by Mark Rowe.
+
+        * win/tools/vsprops/common.vsprops:
+
+2009-04-28  Steve Falkenburg  <sfalken@apple.com>
+
+        Fix extraneous warning about PRODUCTION not being defined in Windows builds.
+        Indirected definition for __PRODUCTION__ through a UserMacro.
+        
+        Reviewed by Mark Rowe.
+
+        * win/tools/vsprops/common.vsprops:
+
+2009-04-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Source changes reviewed by Darin Adler
+        
+        https://bugs.webkit.org/show_bug.cgi?id=22242
+        
+        Update WebKitSystemInterface for Mac with fixes for video controller drawing.
+
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-04-22  Ada Chan  <adachan@apple.com>
+
+        Update WebKitSystemInterface with new method that maps CFNetwork error code to localized description.
+        
+        Reviewed by Darin Adler.
+
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+        * win/lib/WebKitSystemInterface_debug.lib:
+
+2009-04-20  Steve Falkenburg  <sfalken@apple.com>
+
+        Separate JavaScriptCore.dll from WebKit.dll.
+        Slight performance improvement or no change on benchmarks.
+        
+        Allows us to break a circular dependency between CFNetwork and WebKit on Windows,
+        and simplifies standalone JavaScriptCore builds.
+
+        Reviewed by Oliver Hunt.
+
+        * win/tools/vsprops/common.vsprops: Add BUILDING_{project} preprocessor define.
+
+2009-04-18  Pierre d'Herbemont  <pdherbemont@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        <rdar://problem/6781295> video.buffered and video.seekable are not
+        the same. video.buffered should return only what is buffered and
+        not what is seekable
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-04-18  Pierre d'Herbemont  <pdherbemont@apple.com>
+
+        Reviewed by Adele Peterson.
+        
+        <rdar://problem/6747241> work around QTKit no longer reaching
+        QTMovieLoadStateComplete
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-04-15  Steve Falkenburg  <sfalken@apple.com>
+
+        Updated WebKitSystemInterface for Windows.
+        Changes needed for <rdar://problem/6785760>
+
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+        * win/lib/WebKitSystemInterface_debug.lib:
+
+2009-04-14  Mark Rowe  <mrowe@apple.com>
+
+        Update WebKitSystemInterface so that the Tiger portion supports PowerPC.
+
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-04-13  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Darin Adler.
+        
+        <rdar://problem/6740294> Increase the connection count per host
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-04-10  Eric Carlson  <eric.carlson@apple.com>
+
+        WebKitSystemInterface changes for <rdar://problem/6646998>
+
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2009-04-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix the leopard build by updating WebKitSystemInterface.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+
+2009-03-30  Steve Falkenburg  <sfalken@apple.com>
+
+        Bump version to 530.
+
+        * win/tools/scripts/VERSION:
+
 2009-03-26  Adam Roben  <aroben@apple.com>
 
         Remove SafariThemeConstants.h, which is now provided by
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index 0aca1a7..0efa2f4 100644
--- a/WebKitLibraries/WebKitSystemInterface.h
+++ b/WebKitLibraries/WebKitSystemInterface.h
@@ -1,6 +1,6 @@
 /*      
     WebKitSystemInterface.h
-    Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+    Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
 
     Public header file.
 */
@@ -179,25 +179,39 @@ void WKGetWheelEventDeltas(NSEvent *, float *deltaX, float *deltaY, BOOL *contin
 
 BOOL WKAppVersionCheckLessThan(NSString *, int, double);
 
+typedef enum {
+    WKMovieTypeUnknown,
+    WKMovieTypeDownload,
+    WKMovieTypeStoredStream,
+    WKMovieTypeLiveStream
+} WKMovieType;
+
+int WKQTMovieGetType(QTMovie* movie);
+
+unsigned WKQTIncludeOnlyModernMediaFileTypes(void);
 int WKQTMovieDataRate(QTMovie* movie);
 float WKQTMovieMaxTimeLoaded(QTMovie* movie);
+float WKQTMovieMaxTimeSeekable(QTMovie* movie);
+NSString *WKQTMovieMaxTimeLoadedChangeNotification(void);
 void WKQTMovieViewSetDrawSynchronously(QTMovieView* view, BOOL sync);
 
 CFStringRef WKCopyFoundationCacheDirectory(void);
 
 typedef enum {
     WKMediaUIPartFullscreenButton   = 0,
-    WKMediaUIPartMuteButton         = 1,
-    WKMediaUIPartPlayButton         = 2,
-    WKMediaUIPartSeekBackButton     = 3,
-    WKMediaUIPartSeekForwardButton  = 4,
-    WKMediaUIPartSlider             = 5,
-    WKMediaUIPartSliderThumb        = 6,
-    WKMediaUIPartUnMuteButton       = 7,
-    WKMediaUIPartPauseButton        = 8,
-    WKMediaUIPartTimelineContainer  = 9,
-    WKMediaUIPartCurrentTimeDisplay = 10,
-    WKMediaUIPartTimeRemainingDisplay= 11
+    WKMediaUIPartMuteButton,
+    WKMediaUIPartPlayButton,
+    WKMediaUIPartSeekBackButton,
+    WKMediaUIPartSeekForwardButton,
+    WKMediaUIPartSlider,
+    WKMediaUIPartSliderThumb,
+    WKMediaUIPartRewindButton,
+    WKMediaUIPartSeekToRealtimeButton,
+    WKMediaUIPartUnMuteButton,
+    WKMediaUIPartPauseButton,
+    WKMediaUIPartBackground,
+    WKMediaUIPartCurrentTimeDisplay,
+    WKMediaUIPartTimeRemainingDisplay
 } WKMediaUIPart;
 
 typedef enum {
@@ -205,10 +219,16 @@ typedef enum {
     WKMediaControllerThemeQT        = 2
 } WKMediaControllerThemeStyle;
 
+typedef enum {
+    WKMediaControllerFlagDisabled = 1 << 0,
+    WKMediaControllerFlagPressed = 1 << 1,
+    WKMediaControllerFlagDrawEndCaps = 1 << 3,
+} WKMediaControllerThemeState;
+
 BOOL WKHitTestMediaUIPart(int part, int themeStyle, CGRect bounds, CGPoint point);
 void WKMeasureMediaUIPart(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize);
-void WKDrawMediaUIPart(int part, int themeStyle, CGContextRef context, CGRect rect, BOOL active);
-void WKDrawMediaSliderTrack(int themeStyle, CGContextRef context, CGRect rect, float timeLoaded, float currentTime, float duration);
+void WKDrawMediaUIPart(int part, int themeStyle, CGContextRef context, CGRect rect, unsigned state);
+void WKDrawMediaSliderTrack(int themeStyle, CGContextRef context, CGRect rect, float timeLoaded, float currentTime, float duration, unsigned state);
 
 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && defined(__x86_64__)
 mach_port_t WKInitializeRenderServer(void);
@@ -227,11 +247,19 @@ void WKSoftwareCARendererRender(WKSoftwareCARendererRef, CGContextRef, CGRect);
 
 CFRunLoopSourceRef WKCreateMIGServerSource(mig_subsystem_t subsystem, mach_port_t serverPort);
 
+NSUInteger WKGetInputPanelWindowStyle(void);
+ 
+UInt8 WKGetNSEventKeyChar(NSEvent *);
+    
 #endif
 
 @class CAPropertyAnimation;
 void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function);
 
+unsigned WKInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount);
+
+BOOL WKIsLatchingWheelEvent(NSEvent *);
+    
 #ifdef __cplusplus
 }
 #endif
diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
index 539905d..1e9e637 100644
--- a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
+++ b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
new file mode 100644
index 0000000..61daf46
--- /dev/null
+++ b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a
index d556a39..83fa4dc 100644
--- a/WebKitLibraries/libWebKitSystemInterfaceTiger.a
+++ b/WebKitLibraries/libWebKitSystemInterfaceTiger.a
diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index 1d7adb4..d2183d4 100644
--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
@@ -74,4 +74,8 @@ void wkSetClientCertificateInSSLProperties(CFMutableDictionaryRef, CFDataRef);
 CFArrayRef wkCFURLRequestCopyHTTPRequestBodyParts(CFURLRequestRef);
 void wkCFURLRequestSetHTTPRequestBodyParts(CFMutableURLRequestRef, CFArrayRef bodyParts);
 
+unsigned wkInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount);
+
+CFStringRef wkCFNetworkErrorGetLocalizedDescription(CFIndex errorCode);
+
 #endif // WebKitSystemInterface_h
diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
index 2145701..718f791 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 dda46d8..02b431a 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 5186d07..aa31e71 100644
--- a/WebKitLibraries/win/tools/scripts/PRODUCTVERSION
+++ b/WebKitLibraries/win/tools/scripts/PRODUCTVERSION
@@ -1 +1 @@
-4.0
+4.0.3
\ No newline at end of file
diff --git a/WebKitLibraries/win/tools/scripts/VERSION b/WebKitLibraries/win/tools/scripts/VERSION
index 9dbddfa..625c09b 100644
--- a/WebKitLibraries/win/tools/scripts/VERSION
+++ b/WebKitLibraries/win/tools/scripts/VERSION
@@ -1 +1 @@
-528
+532
diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh
index 1d35903..06f7667 100755
--- a/WebKitLibraries/win/tools/scripts/auto-version.sh
+++ b/WebKitLibraries/win/tools/scripts/auto-version.sh
@@ -29,7 +29,7 @@ VERSIONPATH=$VERSIONPATH/include
 VERSIONFILE=$VERSIONPATH/autoversion.h
 mkdir -p "$VERSIONPATH"
 
-PRODUCTVERSION=`cat "$SRCPATH/PRODUCTVERSION"`
+PRODUCTVERSION=`cat $SRCPATH/PRODUCTVERSION | sed -r 's/(.*\S+)\s*$/\1/'`
 MAJORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/'`
 MINORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/'`
 TINYVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/'`
@@ -38,10 +38,11 @@ if [ "$TINYVERSION" == "" ]; then
 fi
 
 if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
-    PROPOSEDVERSION=$(cat "$SRCPATH/VERSION")
+    PROPOSEDVERSION=`cat $SRCPATH/VERSION`
 else
     PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION"
 fi
+PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(.*\S+)\s*$/\1/'`
 
 BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'`
 BLDMINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'`
@@ -52,14 +53,16 @@ fi
 if [ "$BLDVARIANTVERSION" == "" ]; then
     BLDVARIANTVERSION=0
 fi
-SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed 's/^Revision: \(.*\)/\1/'`
+SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed -r 's/^Revision: (.*\S+)\s*$/\1/'`
 
 BLDNMBR="$PROPOSEDVERSION"
 BLDNMBRSHORT="$BLDNMBR"
 
 if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
     BLDNMBRSHORT="$BLDNMBRSHORT+"
-    BLDNMBR="$BLDNMBRSHORT $(whoami) - $(date) - r$SVNOPENSOURCEREVISION"
+    BLDUSERNAME=`echo "$(whoami)" | sed -r 's/(.*\S+)\s*$/\1/'`
+    BLDDATE=`echo "$(date)" | sed -r 's/(.*\S+)\s*$/\1/'`
+    BLDNMBR="$BLDNMBRSHORT $BLDUSERNAME - $BLDDATE - r$SVNOPENSOURCEREVISION"
 fi
 
 cat > "$VERSIONFILE" <<EOF
diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
new file mode 100644
index 0000000..f42c8ec
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="WinCairo"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		PreprocessorDefinitions="WIN_CAIRO=1"

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		AdditionalDependencies="cairo.lib jpeg.lib libpng.lib"

+	/>

+</VisualStudioPropertySheet>

diff --git a/WebKitLibraries/win/tools/vsprops/cURL.vsprops b/WebKitLibraries/win/tools/vsprops/cURL.vsprops
new file mode 100644
index 0000000..3f06aa6
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/cURL.vsprops
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="cURL"

+	>

+	<Tool

+		Name="VCLinkerTool"

+		AdditionalDependencies="ws2_32.lib wininet.lib Wldap32.lib libeay32.lib ssleay32.lib libcurl_imp.lib"

+		IgnoreAllDefaultLibraries="false"

+		IgnoreDefaultLibraryNames=""

+	/>

+</VisualStudioPropertySheet>

diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops
index 96aad07..4c7c9df 100644
--- a/WebKitLibraries/win/tools/vsprops/common.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/common.vsprops
@@ -9,7 +9,7 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		AdditionalOptions="/GS"
-		PreprocessorDefinitions="WIN32;_WINDOWS;WINVER=0x501;_WIN32_WINNT=0x501;_WIN32_IE=0x600;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;__PRODUCTION__=0$(PRODUCTION);_HAS_EXCEPTIONS=0"
+		PreprocessorDefinitions="WIN32;_WINDOWS;WINVER=0x501;_WIN32_WINNT=0x501;_WIN32_IE=0x600;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;__PRODUCTION__=0$(ProductionBuild);_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName)"
 		ExceptionHandling="0"
 		RuntimeTypeInfo="false"
 		WarningLevel="4"
@@ -35,7 +35,7 @@
 	/>
 	<Tool
 		Name="VCMIDLTool"
-		PreprocessorDefinitions="__PRODUCTION__=0$(PRODUCTION)"
+		PreprocessorDefinitions="__PRODUCTION__=0$(ProductionBuild)"
 		WarnAsError="true"
 		HeaderFileName="$(OutDir)\$(InputName).h"
 	/>
@@ -44,4 +44,12 @@
 		Culture="1033"
 		AdditionalIncludeDirectories="&quot;$(IntDir)\include&quot;"
 	/>
+	<UserMacro
+		Name="ProductionBuild"
+		Value="$(PRODUCTION)"
+	/>
+	<UserMacro
+		Name="AnalyzeWithLargeStack"
+		Value=""
+	/>
 </VisualStudioPropertySheet>