summaryrefslogtreecommitdiffstats
path: root/webkit/build/WebCore
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/build/WebCore')
-rw-r--r--webkit/build/WebCore/SConscript4
-rw-r--r--webkit/build/WebCore/WebCore.vcproj48
2 files changed, 35 insertions, 17 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index abce154..ee72102 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -342,6 +342,8 @@ input_files = [
'$WEBCORE_DIR/loader/CachedScript.cpp',
'$WEBCORE_DIR/loader/CachedXBLDocument.cpp',
'$WEBCORE_DIR/loader/CachedXSLStyleSheet.cpp',
+ '$WEBCORE_DIR/loader/CrossOriginAccessControl.cpp',
+ '$WEBCORE_DIR/loader/CrossOriginPreflightResultCache.cpp',
'$WEBCORE_DIR/loader/DocLoader.cpp',
'$WEBCORE_DIR/loader/DocumentLoader.cpp',
'$WEBCORE_DIR/loader/DocumentThreadableLoader.cpp',
@@ -587,7 +589,6 @@ input_files = [
'$WEBCORE_DIR/platform/text/TextCodecLatin1.cpp',
'$WEBCORE_DIR/platform/text/TextCodecUserDefined.cpp',
'$WEBCORE_DIR/platform/text/TextCodecUTF16.cpp',
- '$WEBCORE_DIR/platform/text/TextDecoder.cpp',
'$WEBCORE_DIR/platform/text/TextEncoding.cpp',
'$WEBCORE_DIR/platform/text/TextEncodingRegistry.cpp',
'$WEBCORE_DIR/platform/text/TextStream.cpp',
@@ -886,6 +887,7 @@ input_files = [
'$WEBCORE_DIR/workers/Worker.cpp',
'$WEBCORE_DIR/workers/WorkerContext.cpp',
+ '$WEBCORE_DIR/workers/WorkerImportScriptsClient.cpp',
'$WEBCORE_DIR/workers/WorkerLocation.cpp',
'$WEBCORE_DIR/workers/WorkerMessagingProxy.cpp',
'$WEBCORE_DIR/workers/WorkerRunLoop.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 9f2040b..9e58f3c 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -673,6 +673,22 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CrossOriginAccessControl.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CrossOriginAccessControl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CrossOriginPreflightResultCache.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CrossOriginPreflightResultCache.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\loader\DocLoader.cpp"
>
</File>
@@ -2112,14 +2128,6 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextDecoder.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextDecoder.h"
- >
- </File>
- <File
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextDirection.h"
>
</File>
@@ -3745,6 +3753,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ScrollBehavior.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ScrollBehavior.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\SVGCharacterLayoutInfo.cpp"
>
</File>
@@ -3793,14 +3809,6 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ScrollBehavior.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ScrollBehavior.h"
- >
- </File>
- <File
RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\TableLayout.h"
>
</File>
@@ -7437,6 +7445,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\workers\WorkerImportScriptsClient.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\workers\WorkerImportScriptsClient.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\workers\WorkerLocation.cpp"
>
</File>