Update from https://crrev.com/315085

cc/blink/web_layer_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_LAYER_IMPL_H_
 #define CC_BLINK_WEB_LAYER_IMPL_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 13 matching lines @@
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
 
 namespace blink {
 class WebFilterOperations;
 class WebLayerClient;
 struct WebFloatRect;
 }
 
 namespace base {
-namespace debug {
+namespace trace_event {
 class ConvertableToTraceFormat;
 }
+
+// TODO(ssid): remove these aliases after the tracing clients are moved to the
+// new trace_event namespace. See crbug.com/451032. ETA: March 2015.
+namespace debug {
+using ::base::trace_event::ConvertableToTraceFormat;
 }
+}  // namespace base
 
 namespace cc {
 class Layer;
 }
 
 namespace cc_blink {
 
 class WebToCCAnimationDelegateAdapter;
 
 class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
@@ skipping 68 matching lines @@
   virtual void setHaveScrollEventHandlers(bool have_scroll_event_handlers);
   virtual bool haveScrollEventHandlers() const;
   virtual void setShouldScrollOnMainThread(bool scroll_on_main);
   virtual bool shouldScrollOnMainThread() const;
   virtual void setNonFastScrollableRegion(
       const blink::WebVector<blink::WebRect>& region);
   virtual blink::WebVector<blink::WebRect> nonFastScrollableRegion() const;
   virtual void setTouchEventHandlerRegion(
       const blink::WebVector<blink::WebRect>& region);
   virtual blink::WebVector<blink::WebRect> touchEventHandlerRegion() const;
+  virtual void setScrollBlocksOn(blink::WebScrollBlocksOn);
+  virtual blink::WebScrollBlocksOn scrollBlocksOn() const;
   virtual void setIsContainerForFixedPositionLayers(bool is_container);
   virtual bool isContainerForFixedPositionLayers() const;
   virtual void setPositionConstraint(
       const blink::WebLayerPositionConstraint& constraint);
   virtual blink::WebLayerPositionConstraint positionConstraint() const;
   virtual void setScrollClient(blink::WebLayerScrollClient* client);
   virtual bool isOrphan() const;
   virtual void setWebLayerClient(blink::WebLayerClient* client);
 
   // LayerClient implementation.
   scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo() override;
 
   virtual void setScrollParent(blink::WebLayer* parent);
   virtual void setClipParent(blink::WebLayer* parent);
 
  protected:
   scoped_refptr<cc::Layer> layer_;
   blink::WebLayerClient* web_layer_client_;
 
  private:
   scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_;
 
   DISALLOW_COPY_AND_ASSIGN(WebLayerImpl);
 };
 
 }  // namespace cc_blink
 
 #endif  // CC_BLINK_WEB_LAYER_IMPL_H_