summaryrefslogtreecommitdiffstats
path: root/webkit/webkit.gyp
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 00:20:32 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 00:20:32 +0000
commitf296ba562c8a5170962d4282e6c782fbedf774be (patch)
tree6b5c8d36437f830d0a38a6569bb3891793ab5240 /webkit/webkit.gyp
parent05a7ce23a1847f0dc5cc1caa643841ca7eb7f415 (diff)
downloadchromium_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/webkit.gyp')
-rw-r--r--webkit/webkit.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index de36f17..7f215d0 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -3207,6 +3207,8 @@
'../third_party/WebKit/WebCore/rendering/RenderWordBreak.h',
'../third_party/WebKit/WebCore/rendering/RootInlineBox.cpp',
'../third_party/WebKit/WebCore/rendering/RootInlineBox.h',
+ '../third_party/WebKit/WebCore/rendering/ScrollBehavior.cpp',
+ '../third_party/WebKit/WebCore/rendering/ScrollBehavior.h',
'../third_party/WebKit/WebCore/rendering/SVGCharacterLayoutInfo.cpp',
'../third_party/WebKit/WebCore/rendering/SVGCharacterLayoutInfo.h',
'../third_party/WebKit/WebCore/rendering/SVGInlineFlowBox.cpp',