diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 00:20:32 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 00:20:32 +0000 |
| commit | f296ba562c8a5170962d4282e6c782fbedf774be (patch) | |
| tree | 6b5c8d36437f830d0a38a6569bb3891793ab5240 /webkit/build | |
| parent | 05a7ce23a1847f0dc5cc1caa643841ca7eb7f415 (diff) | |
| download | chromium_src-f296ba562c8a5170962d4282e6c782fbedf774be.zip chromium_src-f296ba562c8a5170962d4282e6c782fbedf774be.tar.gz chromium_src-f296ba562c8a5170962d4282e6c782fbedf774be.tar.bz2 | |
WebKit merge 41498:41530.
Review URL: http://codereview.chromium.org/41017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 0bcbf46..abce154 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -684,6 +684,7 @@ input_files = [ '$WEBCORE_DIR/rendering/RenderWidget.cpp', '$WEBCORE_DIR/rendering/RenderWordBreak.cpp', '$WEBCORE_DIR/rendering/RootInlineBox.cpp', + '$WEBCORE_DIR/rendering/ScrollBehavior.cpp', '$WEBCORE_DIR/rendering/SVGCharacterLayoutInfo.cpp', '$WEBCORE_DIR/rendering/SVGInlineFlowBox.cpp', '$WEBCORE_DIR/rendering/SVGInlineTextBox.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 258c468..9f2040b 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -3793,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> |