WebKit Merge 42805:42932, Chromium side....

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_CHANNEL_MESSAGING=1',
       'ENABLE_DATABASE=1',
       'ENABLE_DASHBOARD_SUPPORT=0',
@@ skipping 3105 matching lines @@
         '../third_party/WebKit/WebCore/rendering/HitTestResult.h',
         '../third_party/WebKit/WebCore/rendering/InlineBox.cpp',
         '../third_party/WebKit/WebCore/rendering/InlineBox.h',
         '../third_party/WebKit/WebCore/rendering/InlineFlowBox.cpp',
         '../third_party/WebKit/WebCore/rendering/InlineFlowBox.h',
         '../third_party/WebKit/WebCore/rendering/InlineRunBox.h',
         '../third_party/WebKit/WebCore/rendering/InlineTextBox.cpp',
         '../third_party/WebKit/WebCore/rendering/InlineTextBox.h',
         '../third_party/WebKit/WebCore/rendering/LayoutState.cpp',
         '../third_party/WebKit/WebCore/rendering/LayoutState.h',
-        '../third_party/WebKit/WebCore/rendering/ListMarkerBox.cpp',
-        '../third_party/WebKit/WebCore/rendering/ListMarkerBox.h',
         '../third_party/WebKit/WebCore/rendering/MediaControlElements.cpp',
         '../third_party/WebKit/WebCore/rendering/MediaControlElements.h',
         '../third_party/WebKit/WebCore/rendering/PointerEventsHitRules.cpp',
         '../third_party/WebKit/WebCore/rendering/PointerEventsHitRules.h',
         '../third_party/WebKit/WebCore/rendering/RenderApplet.cpp',
         '../third_party/WebKit/WebCore/rendering/RenderApplet.h',
         '../third_party/WebKit/WebCore/rendering/RenderArena.cpp',
         '../third_party/WebKit/WebCore/rendering/RenderArena.h',
         '../third_party/WebKit/WebCore/rendering/RenderBR.cpp',
         '../third_party/WebKit/WebCore/rendering/RenderBR.h',
@@ skipping 1432 matching lines @@
           'sources!': [
             'glue/plugins/plugin_stubs.cc',
             # Used directly in test_shell* so it can be replaced in chromium.
             'glue/simple_clipboard_impl.cc',
           ],
         }],
       ],
     },
   ],
 }