Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(968)

Side by Side Diff: Source/core/rendering/RenderLayerModelObject.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2006, 2007, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007, 2009 Apple Inc. All rights reserved.
5 * Copyright (C) 2010, 2012 Google Inc. All rights reserved. 5 * Copyright (C) 2010, 2012 Google Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 explicit RenderLayerModelObject(ContainerNode*); 44 explicit RenderLayerModelObject(ContainerNode*);
45 virtual ~RenderLayerModelObject(); 45 virtual ~RenderLayerModelObject();
46 46
47 // This is the only way layers should ever be destroyed. 47 // This is the only way layers should ever be destroyed.
48 void destroyLayer(); 48 void destroyLayer();
49 49
50 bool hasSelfPaintingLayer() const; 50 bool hasSelfPaintingLayer() const;
51 RenderLayer* layer() const { return m_layer.get(); } 51 RenderLayer* layer() const { return m_layer.get(); }
52 ScrollableArea* scrollableArea() const; 52 ScrollableArea* scrollableArea() const;
53 53
54 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) O VERRIDE; 54 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) o verride;
55 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE; 55 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride;
56 virtual void updateFromStyle() { } 56 virtual void updateFromStyle() { }
57 57
58 virtual LayerType layerTypeRequired() const = 0; 58 virtual LayerType layerTypeRequired() const = 0;
59 59
60 // Returns true if the background is painted opaque in the given rect. 60 // Returns true if the background is painted opaque in the given rect.
61 // The query rect is given in local coordinate system. 61 // The query rect is given in local coordinate system.
62 virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const { re turn false; } 62 virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const { re turn false; }
63 63
64 // This is null for anonymous renderers. 64 // This is null for anonymous renderers.
65 ContainerNode* node() const { return toContainerNode(RenderObject::node()); } 65 ContainerNode* node() const { return toContainerNode(RenderObject::node()); }
66 66
67 virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) OVERRIDE; 67 virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) override;
68 68
69 // Indicate that the contents of this renderer need to be repainted. Only ha s an effect if compositing is being used, 69 // Indicate that the contents of this renderer need to be repainted. Only ha s an effect if compositing is being used,
70 void setBackingNeedsPaintInvalidationInRect(const LayoutRect&, InvalidationR eason) const; // r is in the coordinate space of this render object 70 void setBackingNeedsPaintInvalidationInRect(const LayoutRect&, InvalidationR eason) const; // r is in the coordinate space of this render object
71 71
72 protected: 72 protected:
73 void createLayer(LayerType); 73 void createLayer(LayerType);
74 74
75 virtual void willBeDestroyed() OVERRIDE; 75 virtual void willBeDestroyed() override;
76 76
77 virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer*, co nst LayoutPoint&, const LayoutRect&) const OVERRIDE; 77 virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer*, co nst LayoutPoint&, const LayoutRect&) const override;
78 78
79 private: 79 private:
80 virtual bool isLayerModelObject() const OVERRIDE FINAL { return true; } 80 virtual bool isLayerModelObject() const override final { return true; }
81 81
82 OwnPtr<RenderLayer> m_layer; 82 OwnPtr<RenderLayer> m_layer;
83 83
84 // Used to store state between styleWillChange and styleDidChange 84 // Used to store state between styleWillChange and styleDidChange
85 static bool s_wasFloating; 85 static bool s_wasFloating;
86 }; 86 };
87 87
88 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderLayerModelObject, isLayerModelObject()); 88 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderLayerModelObject, isLayerModelObject());
89 89
90 } // namespace blink 90 } // namespace blink
91 91
92 #endif // RenderLayerModelObject_h 92 #endif // RenderLayerModelObject_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayerFilterInfo.h ('k') | Source/core/rendering/RenderLayerScrollableArea.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698