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

Side by Side Diff: Source/core/rendering/RenderWidget.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
« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | Source/core/rendering/RenderWordBreak.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2009, 2010 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 23 matching lines...) Expand all
34 Widget* widget() const; 34 Widget* widget() const;
35 35
36 void updateOnWidgetChange(); 36 void updateOnWidgetChange();
37 void updateWidgetPosition(); 37 void updateWidgetPosition();
38 void widgetPositionsUpdated(); 38 void widgetPositionsUpdated();
39 39
40 #if !ENABLE(OILPAN) 40 #if !ENABLE(OILPAN)
41 void ref() { ++m_refCount; } 41 void ref() { ++m_refCount; }
42 void deref(); 42 void deref();
43 #endif 43 #endif
44 virtual bool isWidget() const OVERRIDE FINAL { return true; } 44 virtual bool isWidget() const override final { return true; }
45 bool updateWidgetGeometry(); 45 bool updateWidgetGeometry();
46 46
47 protected: 47 protected:
48 explicit RenderWidget(Element*); 48 explicit RenderWidget(Element*);
49 49
50 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE FINAL; 50 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride final;
51 virtual void layout() OVERRIDE; 51 virtual void layout() override;
52 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 52 virtual void paint(PaintInfo&, const LayoutPoint&) override;
53 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const OVERRID E FINAL; 53 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const overrid e final;
54 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE; 54 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) override;
55 55
56 virtual void paintContents(PaintInfo&, const LayoutPoint&); 56 virtual void paintContents(PaintInfo&, const LayoutPoint&);
57 57
58 private: 58 private:
59 virtual void willBeDestroyed() OVERRIDE FINAL; 59 virtual void willBeDestroyed() override final;
60 virtual void destroy() OVERRIDE FINAL; 60 virtual void destroy() override final;
61 61
62 bool setWidgetGeometry(const LayoutRect&); 62 bool setWidgetGeometry(const LayoutRect&);
63 #if !ENABLE(OILPAN) 63 #if !ENABLE(OILPAN)
64 int m_refCount; 64 int m_refCount;
65 #endif 65 #endif
66 }; 66 };
67 67
68 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderWidget, isWidget()); 68 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderWidget, isWidget());
69 69
70 } // namespace blink 70 } // namespace blink
71 71
72 #endif // RenderWidget_h 72 #endif // RenderWidget_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | Source/core/rendering/RenderWordBreak.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698