WebKit merge 41498:41530.

webkit/webkit.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'feature_defines': [
       'ENABLE_DATABASE=1',
       'ENABLE_DASHBOARD_SUPPORT=0',
       'ENABLE_JAVASCRIPT_DEBUGGER=0',
@@ skipping 3189 matching lines @@
         '../third_party/WebKit/WebCore/rendering/RenderVideo.cpp',
         '../third_party/WebKit/WebCore/rendering/RenderVideo.h',
         '../third_party/WebKit/WebCore/rendering/RenderView.cpp',
         '../third_party/WebKit/WebCore/rendering/RenderView.h',
         '../third_party/WebKit/WebCore/rendering/RenderWidget.cpp',
         '../third_party/WebKit/WebCore/rendering/RenderWidget.h',
         '../third_party/WebKit/WebCore/rendering/RenderWordBreak.cpp',
         '../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',
         '../third_party/WebKit/WebCore/rendering/SVGInlineFlowBox.h',
         '../third_party/WebKit/WebCore/rendering/SVGInlineTextBox.cpp',
         '../third_party/WebKit/WebCore/rendering/SVGInlineTextBox.h',
         '../third_party/WebKit/WebCore/rendering/SVGRenderSupport.cpp',
         '../third_party/WebKit/WebCore/rendering/SVGRenderSupport.h',
         '../third_party/WebKit/WebCore/rendering/SVGRenderTreeAsText.cpp',
         '../third_party/WebKit/WebCore/rendering/SVGRenderTreeAsText.h',
@@ skipping 1171 matching lines @@
             'default_plugin/default_plugin.gyp:default_plugin',
           ],
           'sources!': [
             'glue/plugins/plugin_stubs.cc',
           ],
         }],
       ],
     },
   ],
 }