First version of new merge algorithm (not enabled yet)

Source/core/core.gypi

 {
     'includes': [
         'core_generated.gypi',
     ],
     'variables': {
         # Files for which bindings (.cpp and .h files) will be generated
         'core_idl_files': [
             'animation/Animation.idl',
             'animation/AnimationEffect.idl',
             'animation/AnimationNode.idl',
@@ skipping 1675 matching lines @@
             'paint/SVGShapePainter.cpp',
             'paint/SVGShapePainter.h',
             'paint/SVGTextPainter.cpp',
             'paint/SVGTextPainter.h',
             'paint/ScrollableAreaPainter.cpp',
             'paint/ScrollableAreaPainter.h',
             'paint/ScrollbarPainter.cpp',
             'paint/ScrollbarPainter.h',
             'paint/ScrollRecorder.cpp',
             'paint/ScrollRecorder.h',
+            'paint/SubtreeInfoRecorder.cpp',
+            'paint/SubtreeInfoRecorder.h',
             'paint/TableCellPainter.cpp',
             'paint/TableCellPainter.h',
             'paint/TablePainter.cpp',
             'paint/TablePainter.h',
             'paint/TableRowPainter.cpp',
             'paint/TableRowPainter.h',
             'paint/TableSectionPainter.cpp',
             'paint/TableSectionPainter.h',
             'paint/TextPainter.cpp',
             'paint/TextPainter.h',
@@ skipping 2058 matching lines @@
             'rendering/style/RenderStyleTest.cpp',
             'rendering/style/SVGRenderStyleTest.cpp',
             'streams/ReadableStreamTest.cpp',
             'testing/PrivateScriptTestTest.cpp',
             'testing/UnitTestHelpers.cpp',
             'testing/UnitTestHelpers.h',
             'xml/parser/SharedBufferReaderTest.cpp',
         ],
     }
 }