Roll Chrome into Mojo.

cc/blink/web_content_layer_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_content_layer_impl.h"
 
 #include "cc/blink/web_display_item_list_impl.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/picture_layer.h"
 #include "third_party/WebKit/public/platform/WebContentLayerClient.h"
@@ skipping 54 matching lines @@
 }
 
 scoped_refptr<cc::DisplayItemList>
 WebContentLayerImpl::PaintContentsToDisplayList(
     const gfx::Rect& clip,
     ContentLayerClient::GraphicsContextStatus graphics_context_status) {
   if (!client_)
     return cc::DisplayItemList::Create();
 
   WebDisplayItemListImpl list;
-#if WEB_DISPLAY_ITEM_LIST_IS_DEFINED
   bool can_use_lcd_text = true;
   client_->paintContents(
       &list, clip, can_use_lcd_text,
       graphics_context_status == ContentLayerClient::GRAPHICS_CONTEXT_ENABLED
           ? blink::WebContentLayerClient::GraphicsContextEnabled
           : blink::WebContentLayerClient::GraphicsContextDisabled);
-#endif
   return list.ToDisplayItemList();
 }
 
 bool WebContentLayerImpl::FillsBoundsCompletely() const {
   return false;
 }
 
 }  // namespace cc_blink