| Index: cc/layer_impl.h
 | 
| diff --git a/cc/layer_impl.h b/cc/layer_impl.h
 | 
| index f773c138e462196cc0b56acb725c3407317a57c2..4ad427e9b19d89811c15f151b1169e8cf20c6c9f 100644
 | 
| --- a/cc/layer_impl.h
 | 
| +++ b/cc/layer_impl.h
 | 
| @@ -145,17 +145,12 @@ public:
 | 
|      void setSublayerTransform(const WebKit::WebTransformationMatrix&);
 | 
|      const WebKit::WebTransformationMatrix& sublayerTransform() const { return m_sublayerTransform; }
 | 
|  
 | 
| -    // Debug layer border - visual effect only, do not change geometry/clipping/etc.
 | 
| -    void setDebugBorderColor(SkColor);
 | 
| -    SkColor debugBorderColor() const { return m_debugBorderColor; }
 | 
| -    void setDebugBorderWidth(float);
 | 
| -    float debugBorderWidth() const { return m_debugBorderWidth; }
 | 
| -    bool hasDebugBorders() const;
 | 
| -
 | 
|      // Debug layer name.
 | 
|      void setDebugName(const std::string& debugName) { m_debugName = debugName; }
 | 
|      std::string debugName() const { return m_debugName; }
 | 
|  
 | 
| +    bool showDebugBorders() const;
 | 
| +
 | 
|      RenderSurfaceImpl* renderSurface() const { return m_renderSurface.get(); }
 | 
|      void createRenderSurface();
 | 
|      void clearRenderSurface() { m_renderSurface.reset(); }
 | 
| @@ -280,6 +275,9 @@ public:
 | 
|  protected:
 | 
|      explicit LayerImpl(int);
 | 
|  
 | 
| +    // Get the color and size of the layer's debug border.
 | 
| +    virtual void getDebugBorderProperties(SkColor*, float* width) const;
 | 
| +
 | 
|      void appendDebugBorderQuad(QuadSink&, const SharedQuadState*, AppendQuadsData&) const;
 | 
|  
 | 
|      virtual void dumpLayerProperties(std::string*, int indent) const;
 | 
| @@ -374,10 +372,6 @@ private:
 | 
|      float m_drawOpacity;
 | 
|      bool m_drawOpacityIsAnimating;
 | 
|  
 | 
| -    // Debug borders.
 | 
| -    SkColor m_debugBorderColor;
 | 
| -    float m_debugBorderWidth;
 | 
| -
 | 
|      // Debug layer name.
 | 
|      std::string m_debugName;
 | 
|  
 | 
| 
 |