Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

7 files changed, 279 insertions, 302 deletions

diff --git a/Source/WebCore/WebCore.vcproj/QTMovieWin.rc b/Source/WebCore/WebCore.vcproj/QTMovieWin.rc
deleted file mode 100644
index ee374e1..0000000
--- a/Source/WebCore/WebCore.vcproj/QTMovieWin.rc
+++ /dev/null
@@ -1,47 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "autoversion.h"
-#include "winresrc.h"
-
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,__VERSION_BUILD__
- PRODUCTVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,__VERSION_BUILD__
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileDescription", "WebKit QuickTime Movie Dynamic Link Library"
-            VALUE "FileVersion", __VERSION_TEXT__
-            VALUE "CompanyName", "Apple Inc."
-            VALUE "InternalName", "WebKit"
-            VALUE "LegalCopyright", "Copyright Apple Inc. 2007-" __COPYRIGHT_YEAR_END_TEXT__
-            VALUE "OriginalFilename", "QTMovieWin.dll"
-            VALUE "ProductName", "WebKit"
-            VALUE "ProductVersion", __VERSION_TEXT__
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/Source/WebCore/WebCore.vcproj/QTMovieWin.vcproj b/Source/WebCore/WebCore.vcproj/QTMovieWin.vcproj
index 7d85d2f..3c9cc6f 100644
--- a/Source/WebCore/WebCore.vcproj/QTMovieWin.vcproj
+++ b/Source/WebCore/WebCore.vcproj/QTMovieWin.vcproj
@@ -470,16 +470,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\QTMovieWin.rc"
-				>
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/Source/WebCore/WebCore.vcproj/QTMovieWinPostBuild.cmd b/Source/WebCore/WebCore.vcproj/QTMovieWinPostBuild.cmd
index 8063ee0..e88748c 100644
--- a/Source/WebCore/WebCore.vcproj/QTMovieWinPostBuild.cmd
+++ b/Source/WebCore/WebCore.vcproj/QTMovieWinPostBuild.cmd
@@ -1,4 +1,5 @@
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\QTMovieWin"
 xcopy /y /d "%PROJECTDIR%..\platform\graphics\win\QTMovie.h" "%CONFIGURATIONBUILDDIR%\include\QTMovieWin"
+if exist "%WEBKITLIBRARIESDIR%\tools\VersionStamper\VersionStamper.exe" "%WEBKITLIBRARIESDIR%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
 
 if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
diff --git a/Source/WebCore/WebCore.vcproj/QTMovieWinPreBuild.cmd b/Source/WebCore/WebCore.vcproj/QTMovieWinPreBuild.cmd
index 86692d2..bfffcf1 100644
--- a/Source/WebCore/WebCore.vcproj/QTMovieWinPreBuild.cmd
+++ b/Source/WebCore/WebCore.vcproj/QTMovieWinPreBuild.cmd
@@ -5,5 +5,3 @@ cmd /c
 if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
 if errorlevel 1 exit 1
 echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
-
-bash "%WEBKITLIBRARIESDIR%\tools\scripts\auto-version.sh" "%INTDIR%"
diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
index 2a8f340..847c04f 100755
--- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -10234,66 +10234,6 @@
 				>
 			</File>
 			<File
-				RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSIDBErrorEvent.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_Cairo_CFLite|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release_Cairo_CFLite|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_All|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release_LTCG|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSIDBErrorEvent.h"
-				>
-			</File>
-			<File
-				RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSIDBEvent.h"
-				>
-			</File>
-			<File
 				RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSIDBFactory.cpp"
 				>
 				<FileConfiguration
@@ -10682,62 +10622,6 @@
 				>
 			</File>
 			<File
-				RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSIDBSuccessEvent.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_Cairo_CFLite|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release_Cairo_CFLite|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_All|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release_LTCG|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSIDBSuccessEvent.h"
-				>
-			</File>
-			<File
 				RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSIDBTransaction.cpp"
 				>
 				<FileConfiguration
@@ -23154,6 +23038,10 @@
 				>
 			</File>
 			<File
+				RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\XMLViewerXSL.h"
+				>
+			</File>
+			<File
 				RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\XPathGrammar.cpp"
 				>
 				<FileConfiguration
@@ -24572,6 +24460,14 @@
 			<File
 				RelativePath="..\page\Frame.h"
 				>
+			<File
+				RelativePath="..\page\FrameActionScheduler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\page\FrameActionScheduler.h"
+				>
+			</File>
 			</File>
 			<File
 				RelativePath="..\page\FrameLoadRequest.h"
@@ -25562,6 +25458,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\platform\CookiesStrategy.h"
+				>
+			</File>
+			<File
 				RelativePath="..\platform\CrossThreadCopier.cpp"
 				>
 			</File>
@@ -25578,18 +25478,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\platform\DeprecatedPtrList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\platform\DeprecatedPtrListImpl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\platform\DeprecatedPtrListImpl.h"
-				>
-			</File>
-			<File
 				RelativePath="..\platform\DragData.cpp"
 				>
 			</File>
@@ -30369,6 +30257,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\platform\text\TextCodecASCIIFastPath.h"
+					>
+				</File>
+				<File
 					RelativePath="..\platform\text\TextCodecICU.cpp"
 					>
 					<FileConfiguration
@@ -30457,6 +30349,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\platform\text\TextCheckerClient.h"
+					>
+				</File>
+				<File
 					RelativePath="..\platform\text\TextDirection.h"
 					>
 				</File>
@@ -31598,6 +31494,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\css\CSSPrimitiveValueCache.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\css\CSSPrimitiveValueCache.h"
+				>
+			</File>
+			<File
 				RelativePath="..\css\CSSProperty.cpp"
 				>
 			</File>
@@ -35142,6 +35046,62 @@
 				>
 			</File>
 			<File
+				RelativePath="..\rendering\RenderQuote.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_Cairo_CFLite|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release_Cairo_CFLite|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_All|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release_LTCG|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\rendering\RenderQuote.h"
+				>
+			</File>
+			<File
 				RelativePath="..\rendering\RenderReplaced.cpp"
 				>
 				<FileConfiguration
@@ -38596,62 +38556,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\rendering\TextControlInnerElements.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_Cairo_CFLite|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release_Cairo_CFLite|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_All|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release_LTCG|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\rendering\TextControlInnerElements.h"
-				>
-			</File>
-			<File
 				RelativePath="..\rendering\TrailingFloatsRootInlineBox.h"
 				>
 			</File>
@@ -39111,6 +39015,62 @@
 					>
 				</File>
 				<File
+					RelativePath="..\rendering\style\QuotesData.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug_Cairo_CFLite|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release_Cairo_CFLite|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug_All|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release_LTCG|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\rendering\style\QuotesData.h"
+					>
+				</File>
+				<File
 					RelativePath="..\rendering\style\RenderStyle.cpp"
 					>
 					<FileConfiguration
@@ -41104,6 +41064,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\xml\XMLTreeViewer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\xml\XMLTreeViewer.h"
+				>
+			</File>
+			<File
 				RelativePath="..\xml\XMLSerializer.cpp"
 				>
 			</File>
@@ -54778,6 +54746,62 @@
 				>
 			</File>
 			<File
+				RelativePath="..\html\HTMLSummaryElement.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_Cairo_CFLite|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release_Cairo_CFLite|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_All|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release_LTCG|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\html\HTMLSummaryElement.h"
+				>
+			</File>
+			<File
 				RelativePath="..\html\HTMLTableCaptionElement.cpp"
 				>
 				<FileConfiguration
@@ -55856,6 +55880,14 @@
 					RelativePath="..\html\shadow\SliderThumbElement.h"
 					>
 				</File>
+                <File
+                    RelativePath="..\html\shadow\TextControlInnerElements.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\html\shadow\TextControlInnerElements.h"
+                    >
+                </File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -57529,7 +57561,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\bindings\js\JSDebugWrapperSet.cpp"
+					RelativePath="..\bindings\js\JSDedicatedWorkerContextCustom.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -57581,11 +57613,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\bindings\js\JSDebugWrapperSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\bindings\js\JSDedicatedWorkerContextCustom.cpp"
+					RelativePath="..\bindings\js\JSDesktopNotificationsCustom.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -57637,7 +57665,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\bindings\js\JSDesktopNotificationsCustom.cpp"
+					RelativePath="..\bindings\js\JSDeviceMotionEventCustom.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -57689,7 +57717,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\bindings\js\JSDeviceMotionEventCustom.cpp"
+					RelativePath="..\bindings\js\JSDeviceOrientationEventCustom.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -57741,7 +57769,15 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\bindings\js\JSDeviceOrientationEventCustom.cpp"
+					RelativePath="..\bindings\js\JSDirectoryEntryCustom.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\bindings\js\JSDirectoryEntrySyncCustom.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\bindings\js\JSDocumentCustom.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -57793,15 +57829,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\bindings\js\JSDirectoryEntryCustom.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\bindings\js\JSDirectoryEntrySyncCustom.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\bindings\js\JSDocumentCustom.cpp"
+					RelativePath="..\bindings\js\JSDOMApplicationCacheCustom.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -57853,7 +57881,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\bindings\js\JSDOMApplicationCacheCustom.cpp"
+					RelativePath="..\bindings\js\JSDOMBinding.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -57905,7 +57933,11 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\bindings\js\JSDOMBinding.cpp"
+					RelativePath="..\bindings\js\JSDOMBinding.h"
+					>
+				</File>
+				<File
+					RelativePath="..\bindings\js\JSDOMFormDataCustom.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -57957,11 +57989,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\bindings\js\JSDOMBinding.h"
-					>
-				</File>
-				<File
-					RelativePath="..\bindings\js\JSDOMFormDataCustom.cpp"
+					RelativePath="..\bindings\js\JSDOMGlobalObject.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -58013,11 +58041,15 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\bindings\js\JSDOMGlobalObject.cpp"
+					RelativePath="..\bindings\js\JSDOMGlobalObject.h"
+					>
+				</File>
+				<File
+					RelativePath="..\bindings\js\JSDOMImplementationCustom.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
-						ExcludedFromBuild="true"
+					ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -58065,10 +58097,6 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\bindings\js\JSDOMGlobalObject.h"
-					>
-				</File>
-				<File
 					RelativePath="..\bindings\js\JSDOMMimeTypeArrayCustom.cpp"
 					>
 					<FileConfiguration
@@ -64781,6 +64809,18 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="collector"
+				>
+				<Filter
+					Name="handles"
+					>
+					<File
+						RelativePath="..\ForwardingHeaders\collector\handles\Global.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="history"
@@ -64986,22 +65026,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\storage\IDBErrorEvent.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\storage\IDBErrorEvent.h"
-				>
-			</File>
-			<File
-				RelativePath="..\storage\IDBEvent.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\storage\IDBEvent.h"
-				>
-			</File>
-			<File
 				RelativePath="..\storage\IDBFactory.cpp"
 				>
 			</File>
@@ -65090,14 +65114,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\storage\IDBSuccessEvent.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\storage\IDBSuccessEvent.h"
-				>
-			</File>
-			<File
 				RelativePath="..\storage\IDBTransaction.cpp"
 				>
 			</File>
@@ -65686,6 +65702,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\inspector\InstrumentingAgents.h"
+				>
+			</File>
+			<File
 				RelativePath="..\inspector\ScriptArguments.cpp"
 				>
 			</File>
@@ -65849,6 +65869,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\inspector\front-end\DebuggerPresentationModel.js"
+					>
+				</File>
+				<File
+					RelativePath="..\inspector\front-end\DetailedHeapshotGridNodes.js"
+					>
+				</File>
+				<File
 					RelativePath="..\inspector\front-end\DetailedHeapshotView.js"
 					>
 				</File>
@@ -66105,6 +66133,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\inspector\front-end\SearchController.js"
+					>
+				</File>
+				<File
 					RelativePath="..\inspector\front-end\Section.js"
 					>
 				</File>
@@ -66209,6 +66241,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\inspector\front-end\Toolbar.js"
+					>
+				</File>
+				<File
 					RelativePath="..\inspector\front-end\TopDownProfileDataGridTree.js"
 					>
 				</File>
diff --git a/Source/WebCore/WebCore.vcproj/WebCoreMediaQT.vsprops b/Source/WebCore/WebCore.vcproj/WebCoreMediaQT.vsprops
index 91c20c5..da0f5a2 100644
--- a/Source/WebCore/WebCore.vcproj/WebCoreMediaQT.vsprops
+++ b/Source/WebCore/WebCore.vcproj/WebCoreMediaQT.vsprops
@@ -4,8 +4,4 @@
 	Version="8.00"
 	Name="WebCoreMediaQT"
 	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="$(ConfigurationBuildDir)\include\QTMovieWin"
-	/>
 </VisualStudioPropertySheet>
diff --git a/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd b/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd
index 3351e60..c6c74df 100755
--- a/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd
+++ b/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd
@@ -8,6 +8,8 @@ mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\parser"
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\runtime"
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\masm"
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\profiler"
+mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\collector"
+mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\collector\handles"
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\wtf"
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\wtf\text"
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\wtf\unicode"
@@ -75,6 +77,7 @@ xcopy /y /d "%ProjectDir%..\ForwardingHeaders\parser\*.h" "%CONFIGURATIONBUILDDI
 xcopy /y /d "%ProjectDir%..\ForwardingHeaders\runtime\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\runtime"
 xcopy /y /d "%ProjectDir%..\ForwardingHeaders\masm\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\masm"
 xcopy /y /d "%ProjectDir%..\ForwardingHeaders\profiler\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\profiler"
+xcopy /y /d "%ProjectDir%..\ForwardingHeaders\collector\handles\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\collector\handles"
 xcopy /y /d "%ProjectDir%..\ForwardingHeaders\wtf\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\wtf"
 xcopy /y /d "%ProjectDir%..\ForwardingHeaders\wtf\text\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\wtf\text"
 xcopy /y /d "%ProjectDir%..\ForwardingHeaders\wtf\unicode\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\wtf\unicode"