Chromium Code Reviews| Index: ui/views/view.h |
| diff --git a/ui/views/view.h b/ui/views/view.h |
| index 147785c6a86b255dc5e279a35c33d7bb0b7aa76b..a582255e91744e477ae426bb7f5ade8d2bde6ac7 100644 |
| --- a/ui/views/view.h |
| +++ b/ui/views/view.h |
| @@ -334,10 +334,15 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, |
| // Sets whether this view paints to a layer. A view paints to a layer if |
| // either of the following are true: |
| // . the view has a non-identity transform. |
| - // . SetPaintToLayer(true) has been invoked. |
| + // . SetPaintToLayer(ui::LayerType) has been invoked. |
| // View creates the Layer only when it exists in a Widget with a non-NULL |
| // Compositor. |
| - void SetPaintToLayer(bool paint_to_layer); |
| + void SetPaintToLayer(ui::LayerType layer_type = ui::LAYER_TEXTURED); |
| + |
| + // Destroys the layer associated with this view, and reparents any descendants |
| + // to the destroyed layer's parent. If the view does not currently have a |
| + // layer, this takes no effect. |
|
sky
2017/01/24 17:47:51
takes -> has
|
| + void DestroyLayer(); |
| // Overridden from ui::LayerOwner: |
| std::unique_ptr<ui::Layer> RecreateLayer() override; |
| @@ -1369,7 +1374,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, |
| // Accelerated painting ------------------------------------------------------ |
| // Creates the layer and related fields for this view. |
| - void CreateLayer(); |
| + void CreateLayer(ui::LayerType layer_type); |
| // Recursively calls UpdateParentLayers() on all descendants, stopping at any |
| // Views that have layers. Calls UpdateParentLayer() for any Views that have |
| @@ -1392,10 +1397,6 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, |
| // this subtree. |
| void OrphanLayers(); |
| - // Destroys the layer associated with this view, and reparents any descendants |
| - // to the destroyed layer's parent. |
| - void DestroyLayer(); |
| - |
| // Input --------------------------------------------------------------------- |
| bool ProcessMousePressed(const ui::MouseEvent& event); |