diff options
| author | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-31 01:39:43 +0000 |
|---|---|---|
| committer | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-31 01:39:43 +0000 |
| commit | ca6f57e7137d93fb328857b16e4129288053e061 (patch) | |
| tree | 79be0a828bbacf1d2b87928716df0c3bcf786de2 /webkit/build | |
| parent | 41b2780f0135d23196958816d3adcfd606b80f1e (diff) | |
| download | chromium_src-ca6f57e7137d93fb328857b16e4129288053e061.zip chromium_src-ca6f57e7137d93fb328857b16e4129288053e061.tar.gz chromium_src-ca6f57e7137d93fb328857b16e4129288053e061.tar.bz2 | |
WebKit merge 40364:40409, Chromium part
Review URL: http://codereview.chromium.org/19736
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/JavaScriptCore/WTF.vcproj | 4 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 20 |
3 files changed, 17 insertions, 9 deletions
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj index 5467e42..b669304 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -346,6 +346,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\TypeTraits.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\ThreadSpecificWin.cpp" > </File> diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 9ab98a3..78e8a0d 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -441,6 +441,7 @@ input_files = [ '$WEBCORE_DIR/platform/ScrollView.cpp', '$WEBCORE_DIR/platform/SharedBuffer.cpp', '$WEBCORE_DIR/platform/ThreadGlobalData.cpp', + '$WEBCORE_DIR/platform/ThreadTimers.cpp', '$WEBCORE_DIR/platform/Timer.cpp', '$WEBCORE_DIR/platform/Widget.cpp', @@ -621,7 +622,6 @@ input_files = [ '$WEBCORE_DIR/rendering/RenderFieldset.cpp', '$WEBCORE_DIR/rendering/RenderFileUploadControl.cpp', '$WEBCORE_DIR/rendering/RenderFlexibleBox.cpp', - '$WEBCORE_DIR/rendering/RenderFlow.cpp', '$WEBCORE_DIR/rendering/RenderForeignObject.cpp', '$WEBCORE_DIR/rendering/RenderFrame.cpp', '$WEBCORE_DIR/rendering/RenderFrameSet.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index d41b34d..70f42d3 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -1259,6 +1259,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ThreadTimers.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ThreadTimers.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Timer.cpp" > </File> @@ -3239,14 +3247,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderFlow.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderFlow.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderForeignObject.cpp" > </File> @@ -3383,6 +3383,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderObjectChildList.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderPart.cpp" > </File> |