diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 17:42:32 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 17:42:32 +0000 |
| commit | 58eb89ca5da6dcacb8e2e31ce90a7a1daa654947 (patch) | |
| tree | 0437dedfc089f72cd2a248060fd81555eed95ad0 /webkit/build | |
| parent | 67adc80656447c9ff324cd01749fa5e9496b47f2 (diff) | |
| download | chromium_src-58eb89ca5da6dcacb8e2e31ce90a7a1daa654947.zip chromium_src-58eb89ca5da6dcacb8e2e31ce90a7a1daa654947.tar.gz chromium_src-58eb89ca5da6dcacb8e2e31ce90a7a1daa654947.tar.bz2 | |
Revert merge (revision 11400) to test impact on page cycler perf.
TBR=jar
Review URL: http://codereview.chromium.org/43085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11454 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, 18 insertions, 39 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 08c577c..b8c612c 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -149,6 +149,7 @@ 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 77bc8ef..502ca67 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -170,10 +170,6 @@ > </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 ee72102..abce154 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -342,8 +342,6 @@ 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', @@ -589,6 +587,7 @@ 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', @@ -887,7 +886,6 @@ 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 9e58f3c..9f2040b 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -673,22 +673,6 @@ > </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> @@ -2128,6 +2112,14 @@ > </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> @@ -3753,14 +3745,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\SVGCharacterLayoutInfo.cpp" > </File> @@ -3809,6 +3793,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\TableLayout.h" > </File> @@ -7445,14 +7437,6 @@ > </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> |