Roll Chrome into Mojo.

cc/blink/web_compositor_support_impl.cc

 // Copyright 2014 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.
 
 #include "cc/blink/web_compositor_support_impl.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "cc/animation/transform_operations.h"
 #include "cc/blink/web_animation_impl.h"
@@ skipping 10 matching lines @@
 #include "cc/blink/web_scrollbar_layer_impl.h"
 #include "cc/blink/web_transform_animation_curve_impl.h"
 #include "cc/blink/web_transform_operations_impl.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/software_output_device.h"
 
 using blink::WebCompositorAnimation;
 using blink::WebCompositorAnimationCurve;
 using blink::WebContentLayer;
 using blink::WebContentLayerClient;
-#if WEB_DISPLAY_ITEM_LIST_IS_DEFINED
 using blink::WebDisplayItemList;
-#endif
 using blink::WebExternalTextureLayer;
 using blink::WebExternalTextureLayerClient;
 using blink::WebFilterAnimationCurve;
 using blink::WebFilterOperations;
 using blink::WebFloatAnimationCurve;
 using blink::WebImageLayer;
 using blink::WebNinePatchLayer;
 using blink::WebLayer;
 using blink::WebScrollbar;
 using blink::WebScrollbarLayer;
@@ skipping 44 matching lines @@
     WebScrollbar::Orientation orientation,
     int thumb_thickness,
     int track_start,
     bool is_left_side_vertical_scrollbar) {
   return new WebScrollbarLayerImpl(orientation,
                                    thumb_thickness,
                                    track_start,
                                    is_left_side_vertical_scrollbar);
 }
 
-#if WEB_DISPLAY_ITEM_LIST_IS_DEFINED
 WebDisplayItemList* WebCompositorSupportImpl::createDisplayItemList() {
   return new WebDisplayItemListImpl();
 }
-#endif
 
 WebCompositorAnimation* WebCompositorSupportImpl::createAnimation(
     const blink::WebCompositorAnimationCurve& curve,
     blink::WebCompositorAnimation::TargetProperty target,
 #ifdef WEB_COMPOSITOR_SUPPORT_CREATE_ANIMATION_SUPPORTS_GROUP
     int group_id,
 #endif
     int animation_id) {
 #ifdef WEB_COMPOSITOR_SUPPORT_CREATE_ANIMATION_SUPPORTS_GROUP
   return new WebCompositorAnimationImpl(curve, target, animation_id, group_id);
@@ skipping 25 matching lines @@
 
 WebTransformOperations* WebCompositorSupportImpl::createTransformOperations() {
   return new WebTransformOperationsImpl();
 }
 
 WebFilterOperations* WebCompositorSupportImpl::createFilterOperations() {
   return new WebFilterOperationsImpl();
 }
 
 }  // namespace cc_blink