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

Side by Side Diff: Source/core/rendering/RenderObject.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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 958
959 virtual bool isCombineText() const { return false; } 959 virtual bool isCombineText() const { return false; }
960 960
961 virtual int caretMinOffset() const; 961 virtual int caretMinOffset() const;
962 virtual int caretMaxOffset() const; 962 virtual int caretMaxOffset() const;
963 963
964 virtual int previousOffset(int current) const; 964 virtual int previousOffset(int current) const;
965 virtual int previousOffsetForBackwardDeletion(int current) const; 965 virtual int previousOffsetForBackwardDeletion(int current) const;
966 virtual int nextOffset(int current) const; 966 virtual int nextOffset(int current) const;
967 967
968 virtual void imageChanged(ImageResource*, const IntRect* = 0) OVERRIDE FINAL ; 968 virtual void imageChanged(ImageResource*, const IntRect* = 0) override final ;
969 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) { } 969 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) { }
970 virtual bool willRenderImage(ImageResource*) OVERRIDE FINAL; 970 virtual bool willRenderImage(ImageResource*) override final;
971 971
972 void selectionStartEnd(int& spos, int& epos) const; 972 void selectionStartEnd(int& spos, int& epos) const;
973 973
974 void remove() { if (parent()) parent()->removeChild(this); } 974 void remove() { if (parent()) parent()->removeChild(this); }
975 975
976 bool isInert() const; 976 bool isInert() const;
977 977
978 bool supportsTouchAction() const; 978 bool supportsTouchAction() const;
979 979
980 bool visibleToHitTestRequest(const HitTestRequest& request) const { return s tyle()->visibility() == VISIBLE && (request.ignorePointerEventsNone() || style() ->pointerEvents() != PE_NONE) && !isInert(); } 980 bool visibleToHitTestRequest(const HitTestRequest& request) const { return s tyle()->visibility() == VISIBLE && (request.ignorePointerEventsNone() || style() ->pointerEvents() != PE_NONE) && !isInert(); }
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
1554 void showTree(const blink::RenderObject*); 1554 void showTree(const blink::RenderObject*);
1555 void showLineTree(const blink::RenderObject*); 1555 void showLineTree(const blink::RenderObject*);
1556 void showRenderTree(const blink::RenderObject* object1); 1556 void showRenderTree(const blink::RenderObject* object1);
1557 // We don't make object2 an optional parameter so that showRenderTree 1557 // We don't make object2 an optional parameter so that showRenderTree
1558 // can be called from gdb easily. 1558 // can be called from gdb easily.
1559 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec t* object2); 1559 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec t* object2);
1560 1560
1561 #endif 1561 #endif
1562 1562
1563 #endif // RenderObject_h 1563 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderMultiColumnSet.h ('k') | Source/core/rendering/RenderPagedFlowThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698