Revert 171403

cc/layer_impl.h

 // Copyright 2011 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_LAYER_IMPL_H_
 #define CC_LAYER_IMPL_H_
 
 #include <public/WebFilterOperations.h>
 #include <string>
 
@@ skipping 244 matching lines @@
     void resetAllChangeTrackingForSubtree();
 
     virtual bool layerIsAlwaysDamaged() const;
 
     LayerAnimationController* layerAnimationController() { return m_layerAnimationController.get(); }
 
     virtual Region visibleContentOpaqueRegion() const;
 
     virtual void didUpdateTransforms() { }
 
-    // Indicates that the surface previously used to render this layer
+    // Indicates that the context previously used to render this layer
     // was lost and that a new one has been created. Won't be called
-    // until the new surface has been created successfully.
-    virtual void didLoseOutputSurface();
+    // until the new context has been created successfully.
+    virtual void didLoseContext();
 
     ScrollbarAnimationController* scrollbarAnimationController() const { return m_scrollbarAnimationController.get(); }
 
     void setHorizontalScrollbarLayer(ScrollbarLayerImpl*);
     ScrollbarLayerImpl* horizontalScrollbarLayer();
     const ScrollbarLayerImpl* horizontalScrollbarLayer() const;
 
     void setVerticalScrollbarLayer(ScrollbarLayerImpl*);
     ScrollbarLayerImpl* verticalScrollbarLayer();
     const ScrollbarLayerImpl* verticalScrollbarLayer() const;
@@ skipping 118 matching lines @@
     DrawProperties<LayerImpl, RenderSurfaceImpl> m_drawProperties;
 
     DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 void sortLayers(std::vector<LayerImpl*>::iterator first, std::vector<LayerImpl*>::iterator end, LayerSorter*);
 
 }
 
 #endif  // CC_LAYER_IMPL_H_