diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 18:18:57 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 18:18:57 +0000 |
| commit | 12117f3379caccd1e75cbee72f94667073b14d18 (patch) | |
| tree | 14147964470bdecf2c9e6a7db723979367efdcb1 /webkit/build | |
| parent | 8433ee6f49957eb6fc171a6f8a4277b8b801cef8 (diff) | |
| download | chromium_src-12117f3379caccd1e75cbee72f94667073b14d18.zip chromium_src-12117f3379caccd1e75cbee72f94667073b14d18.tar.gz chromium_src-12117f3379caccd1e75cbee72f94667073b14d18.tar.bz2 | |
Re-apply the webkit merge. This is a revert of 11454 and 11455.
TBR=jar
Review URL: http://codereview.chromium.org/42080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/WTF.vcproj | 4 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 4 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 48 |
4 files changed, 39 insertions, 18 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index b8c612c..08c577c 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -149,7 +149,6 @@ wtf_inputs = [ '$WTF_DIR/ByteArray.cpp', '$WTF_DIR/Assertions.cpp', '$WTF_DIR/chromium/MainThreadChromium.cpp', - '$WTF_DIR/CurrentTime.cpp', '$WTF_DIR/dtoa.cpp', '$WTF_DIR/FastMalloc.cpp', '$WTF_DIR/HashTable.cpp', diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj index 502ca67..77bc8ef 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -170,6 +170,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CrossThreadRefCounted.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CurrentTime.h" > </File> 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> |