Use platform/chromium from third_party/WebKit, etc.

R=dglazkov

Review URL: http://codereview.chromium.org/16217

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7405 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 578 insertions, 446 deletions

diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index ab3abce..70b7e73 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -404,7 +404,7 @@ input_files = [
     '$WEBCORE_DIR/platform/DragImage.cpp',
     '$WEBCORE_DIR/platform/FileChooser.cpp',
     '$WEBCORE_DIR/platform/GeolocationService.cpp',
-    '$WEBCORE_DIR/platform/KURL.cpp',
+    '$WEBCORE_DIR/platform/GKURL.cpp',
     '$WEBCORE_DIR/platform/Length.cpp',
     '$WEBCORE_DIR/platform/LinkHash.cpp',
     '$WEBCORE_DIR/platform/Logging.cpp',
@@ -450,6 +450,36 @@ input_files = [
     '$WEBCORE_DIR/platform/graphics/StringTruncator.cpp',
     '$WEBCORE_DIR/platform/graphics/WidthIterator.cpp',
 
+    '$WEBCORE_DIR/platform/chromium/ChromiumDataObject.cpp',
+    '$WEBCORE_DIR/platform/chromium/ClipboardChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/ClipboardUtilitiesChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/ContextMenuChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/ContextMenuItemChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/CursorChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/DragDataChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/DragImageChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/EditorChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/FileChooserChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/FileSystemChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/FramelessScrollView.cpp',
+    '$WEBCORE_DIR/platform/chromium/Language.cpp',
+    '$WEBCORE_DIR/platform/chromium/MimeTypeRegistryChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/PasteboardChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/PlatformKeyboardEventChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/PlatformScreenChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/PopupMenuChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/SearchPopupMenuChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/SharedTimerChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/SSLKeyGeneratorChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/SystemTimeChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/TemporaryLinkStubs.cpp',
+    '$WEBCORE_DIR/platform/chromium/TextBoundariesChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/TextBreakIteratorInternalICUChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/WidgetChromium.cpp',
+    '$WEBCORE_DIR/platform/chromium/ScrollbarThemeChromium.cpp',
+
+    '$WEBCORE_DIR/platform/graphics/chromium/FontCustomPlatformData.cpp',
+
     '$WEBCORE_DIR/platform/graphics/transforms/ScaleTransformOperation.cpp',
     '$WEBCORE_DIR/platform/graphics/transforms/TranslateTransformOperation.cpp',
     '$WEBCORE_DIR/platform/graphics/transforms/RotateTransformOperation.cpp',
@@ -458,6 +488,23 @@ input_files = [
     '$WEBCORE_DIR/platform/graphics/transforms/AffineTransform.cpp',
     '$WEBCORE_DIR/platform/graphics/transforms/SkewTransformOperation.cpp',
 
+    '$WEBCORE_DIR/platform/graphics/skia/AffineTransformSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/ColorSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/FloatPointSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/FloatRectSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/GradientSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/GraphicsContextSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/ImageBufferSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/ImageSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/ImageSourceSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/IntPointSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/IntRectSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/NativeImageSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/PathSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/PatternSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/PlatformContextSkia.cpp',
+    '$WEBCORE_DIR/platform/graphics/skia/SkiaUtils.cpp',
+
     '$WEBCORE_DIR/platform/network/AuthenticationChallengeBase.cpp',
     '$WEBCORE_DIR/platform/network/Credential.cpp',
     '$WEBCORE_DIR/platform/network/FormData.cpp',
@@ -469,6 +516,11 @@ input_files = [
     '$WEBCORE_DIR/platform/network/ResourceRequestBase.cpp',
     '$WEBCORE_DIR/platform/network/ResourceResponseBase.cpp',
 
+    '$WEBCORE_DIR/platform/network/chromium/AuthenticationChallengeChromium.cpp',
+    '$WEBCORE_DIR/platform/network/chromium/CookieJarChromium.cpp',
+    '$WEBCORE_DIR/platform/network/chromium/DNSChromium.cpp',
+    '$WEBCORE_DIR/platform/network/chromium/NetworkStateNotifierChromium.cpp',
+
     '$WEBCORE_DIR/platform/sql/SQLiteAuthorizer.cpp',
     '$WEBCORE_DIR/platform/sql/SQLiteDatabase.cpp',
     '$WEBCORE_DIR/platform/sql/SQLiteStatement.cpp',
@@ -815,6 +867,51 @@ input_files = [
     '$WEBCORE_DIR/xml/XSLTUnicodeSort.cpp',
 ]
 
+if env.Bit('windows'):
+  # Windows specific implementations.
+  input_files.extend([
+    '$WEBCORE_DIR/platform/chromium/ChromiumUtilsWin.cpp',
+    '$WEBCORE_DIR/platform/chromium/FileSystemChromiumWin.cpp',
+    '$WEBCORE_DIR/platform/chromium/ScrollBarThemeChromiumWin.cpp',
+    '$WEBCORE_DIR/platform/chromium/SoundChromiumWin.cpp',
+
+    '$WEBCORE_DIR/platform/graphics/chromium/FontCacheChromiumWin.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/FontUtilsChromiumWin.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/FontChromiumWin.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/IconChromiumWin.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/SimpleFontDataChromiumWin.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/ThemeHelperChromiumWin.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/UniscribeHelper.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/UniscribeHelperTextRun.cpp',
+  ])
+
+if env.Bit('linux'):
+  # Linux specific implementations.
+  input_files.extend([
+    '$WEBCORE_DIR/platform/chromium/FileSystemChromiumLinux.cpp',
+    '$WEBCORE_DIR/platform/chromium/gtk2drawing.c',
+    '$WEBCORE_DIR/platform/chromium/KeyCodeConversionGtk.cpp',
+    '$WEBCORE_DIR/platform/chromium/RenderThemeGtk.cpp',
+    '$WEBCORE_DIR/platform/chromium/ScrollbarThemeChromiumLinux.cpp',
+    '$WEBCORE_DIR/platform/chromium/SoundChromiumPosix.cpp',
+
+    '$WEBCORE_DIR/platform/graphics/chromium/FontCacheLinux.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/FontLinux.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/FontPlatformDataLinux.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/IconChromiumLinux.cpp',
+    '$WEBCORE_DIR/platform/graphics/chromium/SimpleFontDataLinux.cpp',
+
+    '$WEBCORE_DIR/platform/graphics/skia/GdkSkia.cc',
+  ])
+  # Remove from the list files that haven't yet been made portable to Linux.
+  to_be_ported_files = [
+    '$WEBCORE_DIR/platform/graphics/chromium/FontCustomPlatformData.cpp',
+  ]
+  input_files = list(set(input_files) - set(to_be_ported_files))
+
 # These files don't compile yet on linux or mac.
 if env.Bit('mac'):
   remove_files = [
@@ -822,8 +919,7 @@ if env.Bit('mac'):
     '$WEBCORE_DIR/css/CSSFontFaceSource.cpp',
     '$WEBCORE_DIR/loader/CachedFont.cpp',
   ]
-  for remove in remove_files:
-    input_files.remove(remove)
+  input_files = list(set(input_files) - set(remove_files))
 
 # These files don't compile on the mac
 if env.Bit('mac'):
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 7f5732b..d853fc4 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -986,6 +986,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GKURL.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphBuffer.h"
 				>
 			</File>
@@ -998,11 +1002,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\HostWindow.h"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GoogleURLPrivate.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\KURL.cpp"
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\HostWindow.h"
 				>
 			</File>
 			<File
@@ -1480,6 +1484,198 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="chromium"
+					>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\FontCacheChromiumWin.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\FontChromiumWin.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\FontCustomPlatformData.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\FontCustomPlatformData.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\FontPlatformData.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\FontPlatformDataChromiumWin.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\FontPlatformDataChromiumWin.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\FontUtilsChromiumWin.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\FontUtilsChromiumWin.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\GlyphPageTreeNodeChromiumWin.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\IconChromiumWin.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\ImageBufferData.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\MediaPlayerPrivateChromium.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\PlatformIcon.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\SimpleFontDataChromiumWin.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\ThemeHelperChromiumWin.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\ThemeHelperChromiumWin.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\UniscribeHelper.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\UniscribeHelper.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\UniscribeHelperTextRun.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\UniscribeHelperTextRun.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="skia"
+					>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\AffineTransformSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\BitmapImageSingleFrameSkia.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\ColorSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\FloatPointSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\FloatRectSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\GradientSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\GraphicsContextPlatformPrivate.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\GraphicsContextSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\ImageBufferSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\ImageSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\ImageSourceSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\ImageSourceSkia.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\IntPointSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\IntRectSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\NativeImageSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\NativeImageSkia.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\PathSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\PatternSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\PlatformContextSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\PlatformContextSkia.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\PlatformGraphics.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\SkiaFontWin.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\SkiaFontWin.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\SkiaUtils.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\skia\SkiaUtils.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="network"
@@ -1576,6 +1772,46 @@
 					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\ResourceResponseBase.h"
 					>
 				</File>
+				<Filter
+					Name="chromium"
+					>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\chromium\AuthenticationChallenge.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\chromium\AuthenticationChallengeChromium.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\chromium\CookieJarChromium.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\chromium\DNSChromium.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\chromium\NetworkStateNotifierChromium.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\chromium\NetworkStateNotifierPrivate.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\chromium\ResourceError.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\chromium\ResourceRequest.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\platform\network\chromium\ResourceResponse.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="win"
@@ -1865,6 +2101,210 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="chromium"
+				>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ChromiumBridge.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ChromiumDataObject.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ChromiumDataObject.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ChromiumUtilsWin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ChromiumUtilsWin.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ClipboardChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ClipboardChromium.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ClipboardUtilitiesChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ClipboardUtilitiesChromium.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ContextMenuChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ContextMenuItemChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\CursorChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\DragDataChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\DragDataRef.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\DragImageChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\DragImageRef.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\EditorChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\FileChooserChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\FileSystemChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\FileSystemChromiumWin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\FramelessScrollView.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\FramelessScrollView.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\FramelessScrollViewClient.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\KeyboardCodes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\KeyboardCodesWin.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\KeyCodeConversion.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\Language.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\LinkHashChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\MimeTypeRegistryChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\PasteboardChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\PasteboardPrivate.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\PlatformCursor.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\PlatformKeyboardEventChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\PlatformScreenChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\PlatformWidget.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\PopupMenuChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\PopupMenuChromium.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\PopupMenuPrivate.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ScrollbarThemeChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ScrollbarThemeChromium.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\ScrollbarThemeChromiumWin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\SearchPopupMenuChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\SharedTimerChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\SoundChromiumWin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\SSLKeyGeneratorChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\SystemTimeChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\TemporaryLinkStubs.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\TextBoundariesChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\TextBreakIteratorInternalICUChromium.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\chromium\WidgetChromium.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="css"
@@ -6424,42 +6864,6 @@
 			<Filter
 				Name="graphics"
 				>
-				<Filter
-					Name="skia"
-					>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\RenderPathSkia.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SkiaSupport.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SkiaSupport.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGPaintServerGradientSkia.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGPaintServerPatternSkia.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGPaintServerSkia.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGResourceFilterSkia.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGResourceMaskerSkia.cpp"
-						>
-					</File>
-				</Filter>
 				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\SVGImage.cpp"
 					>
@@ -6560,6 +6964,42 @@
 					RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\SVGResourceMasker.h"
 					>
 				</File>
+				<Filter
+					Name="skia"
+					>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\RenderPathSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SkiaSupport.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SkiaSupport.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGPaintServerGradientSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGPaintServerPatternSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGPaintServerSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGResourceFilterSkia.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGResourceMaskerSkia.cpp"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="events"
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index 5319a1e..34f5039 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -824,370 +824,6 @@
 		<Filter
 			Name="platform"
 			>
-			<File
-				RelativePath="..\..\port\platform\GKURL.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\platform\GoogleURLPrivate.h"
-				>
-			</File>
-			<Filter
-				Name="chromium"
-				>
-				<File
-					RelativePath="..\..\port\platform\chromium\ChromiumBridge.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\ChromiumDataObject.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\ChromiumDataObject.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\ChromiumUtilsWin.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\ChromiumUtilsWin.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\ClipboardChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\ClipboardChromium.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\ClipboardUtilitiesChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\ClipboardUtilitiesChromium.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\ContextMenuChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\ContextMenuItemChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\CursorChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\DragDataChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\DragImageChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\EditorChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\FileChooserChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\FileSystemChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\FileSystemChromiumWin.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\FramelessScrollView.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\FramelessScrollView.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\Language.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\LinkHashChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\MimeTypeRegistryChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\PasteboardChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\PlatformKeyboardEventChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\PlatformScreenChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\PopupMenuChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\PopupMenuChromium.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\ScrollbarThemeChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\ScrollbarThemeChromiumWin.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\ScrollbarThemeChromiumWin.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\SearchPopupMenuChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\SharedTimerChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\SoundChromiumWin.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\SSLKeyGeneratorChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\SystemTimeChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\TemporaryLinkStubs.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\TextBoundariesChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\TextBreakIteratorInternalICUChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\WidgetChromium.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\chromium\WidgetClientChromium.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="graphics"
-				>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\AffineTransformSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\BitmapImageSingleFrameSkia.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\ColorSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\FloatPointSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\FloatRectSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\GradientSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\GraphicsContextPlatformPrivate.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\GraphicsContextSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\ImageBufferSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\ImageSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\ImageSourceSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\ImageSourceSkia.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\IntPointSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\IntRectSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\NativeImageSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\NativeImageSkia.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\PathSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\PatternSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\PlatformContextSkia.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\PlatformContextSkia.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\SkiaFontWin.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\SkiaFontWin.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\SkiaUtils.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\port\platform\graphics\skia\SkiaUtils.h"
-					>
-				</File>
-				<Filter
-					Name="chromium"
-					>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\FontCacheChromiumWin.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\FontChromiumWin.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\FontCustomPlatformData.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\FontCustomPlatformData.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\FontPlatformData.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\FontPlatformDataChromiumWin.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\FontPlatformDataChromiumWin.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\FontUtilsChromiumWin.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\FontUtilsChromiumWin.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\GlyphPageTreeNodeChromiumWin.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\IconChromiumWin.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\ImageBufferData.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\MediaPlayerPrivateChromium.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\PlatformIcon.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\SimpleFontDataChromiumWin.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\ThemeHelperChromiumWin.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\ThemeHelperChromiumWin.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\UniscribeHelper.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\UniscribeHelper.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\UniscribeHelperTextRun.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\graphics\chromium\UniscribeHelperTextRun.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
 			<Filter
 				Name="image-decoders"
 				>
@@ -1284,46 +920,6 @@
 					</File>
 				</Filter>
 			</Filter>
-			<Filter
-				Name="network"
-				>
-				<Filter
-					Name="chromium"
-					>
-					<File
-						RelativePath="..\..\port\platform\network\chromium\AuthenticationChallenge.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\network\chromium\AuthenticationChallengeChromium.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\network\chromium\CookieJarChromium.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\network\chromium\DNSChromium.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\network\chromium\NetworkStateNotifierChromium.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\network\chromium\ResourceError.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\network\chromium\ResourceRequest.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\port\platform\network\chromium\ResourceResponse.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="bridge"
diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops
index d5614b2..42b21d1 100644
--- a/webkit/build/webkit_common_includes.vsprops
+++ b/webkit/build/webkit_common_includes.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;..\..\pending\;..\..\pending\kjs;..\..\pending\wtf;..\..\port\bridge;..\..\port\css;..\..\port\dom;..\..\port\history;..\..\port\loader;..\..\port\page;..\..\port\page\chromium;..\..\port\page\win;..\..\port\platform;..\..\port\platform\chromium;..\..\port\platform\win;..\..\port\platform\network\chromium;..\..\port\platform\image-decoders;..\..\port\platform\image-decoders\bmp;..\..\port\platform\image-decoders\gif;..\..\port\platform\image-decoders\ico;..\..\port\platform\image-decoders\jpeg;..\..\port\platform\image-decoders\png;..\..\port\platform\image-decoders\xbm;..\..\port\platform\network;..\..\port\plugins;..\..\port\rendering;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore\;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\platform\animation;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms;..\..\port\platform\graphics;..\..\port\platform\graphics\chromium;..\..\port\platform\graphics\skia;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;..\..\..\third_party\WebKit\WebCore;&quot;..\..\..\third_party\WebKit\WebCore\os-win32&quot;;..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;&quot;..\..\..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins;..\..\..\third_party\WebKit\WebCore\inspector;..\..\..\third_party\sqlite"
+		AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;..\..\pending;..\..\port\bridge;..\..\port\page\chromium;&quot;..\..\port\platform\image-decoders&quot;;&quot;..\..\port\platform\image-decoders\bmp&quot;;&quot;..\..\port\platform\image-decoders\gif&quot;;&quot;..\..\port\platform\image-decoders\ico&quot;;&quot;..\..\port\platform\image-decoders\jpeg&quot;;&quot;..\..\port\platform\image-decoders\png&quot;;&quot;..\..\port\platform\image-decoders\xbm&quot;;..\..\;&quot;$(ProjectDir)&quot;;..\..\..\third_party\WebKit\WebCore;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\platform\animation;..\..\..\third_party\WebKit\WebCore\platform\chromium;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms;..\..\..\third_party\WebKit\WebCore\platform\graphics\skia;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\network\chromium;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;&quot;..\..\..\third_party\WebKit\WebCore\os-win32&quot;;..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;&quot;..\..\..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins;..\..\..\third_party\WebKit\WebCore\inspector;..\..\..\third_party\sqlite"
 	/>
 </VisualStudioPropertySheet>