Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/blink/web_display_item_list_impl.h

 // 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.
 
 #ifndef CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_
 #define CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "cc/blink/cc_blink_export.h"
 #include "cc/resources/display_item_list.h"
@@ skipping 15 matching lines @@
 
 class WebDisplayItemListImpl : public blink::WebDisplayItemList {
  public:
   CC_BLINK_EXPORT WebDisplayItemListImpl();
   virtual ~WebDisplayItemListImpl();
 
   scoped_refptr<cc::DisplayItemList> ToDisplayItemList();
 
   // blink::WebDisplayItemList implementation.
   virtual void appendDrawingItem(const SkPicture*);
+  virtual void appendDrawingItem(SkPicture*,
+                                 const blink::WebFloatPoint& location);
   virtual void appendClipItem(
       const blink::WebRect& clip_rect,
       const blink::WebVector<SkRRect>& rounded_clip_rects);
   virtual void appendEndClipItem();
   virtual void appendClipPathItem(const SkPath& clip_path,
                                   SkRegion::Op clip_op,
                                   bool antialias);
   virtual void appendEndClipPathItem();
   virtual void appendFloatClipItem(const blink::WebFloatRect& clip_rect);
   virtual void appendEndFloatClipItem();
   virtual void appendTransformItem(const SkMatrix44& matrix);
   virtual void appendEndTransformItem();
   virtual void appendTransparencyItem(float opacity,
                                       blink::WebBlendMode blend_mode);
   virtual void appendEndTransparencyItem();
+#if FILTER_DISPLAY_ITEM_USES_FILTER_OPERATIONS
   virtual void appendFilterItem(const blink::WebFilterOperations& filters,
                                 const blink::WebFloatRect& bounds);
+#else
+  virtual void appendFilterItem(SkImageFilter* filter,
+                                const blink::WebFloatRect& bounds);
+#endif
   virtual void appendEndFilterItem();
-  virtual void appendScrollItem(const blink::WebSize& scrollOffset,
-                                ScrollContainerId);
-  virtual void appendEndScrollItem();
 
  private:
   scoped_refptr<cc::DisplayItemList> display_item_list_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDisplayItemListImpl);
 };
 
 }  // namespace cc_blink
 
 #endif  // CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_