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

Side by Side Diff: Source/core/editing/EditingStyle.h

Issue 616603006: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/editing (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/editing/EditCommand.h ('k') | Source/core/editing/EditingStyle.cpp » ('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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 class Element; 53 class Element;
54 class HTMLElement; 54 class HTMLElement;
55 class MutableStylePropertySet; 55 class MutableStylePropertySet;
56 class Node; 56 class Node;
57 class Position; 57 class Position;
58 class QualifiedName; 58 class QualifiedName;
59 class RenderStyle; 59 class RenderStyle;
60 class StylePropertySet; 60 class StylePropertySet;
61 class VisibleSelection; 61 class VisibleSelection;
62 62
63 class EditingStyle FINAL : public RefCountedWillBeGarbageCollectedFinalized<Edit ingStyle> { 63 class EditingStyle final : public RefCountedWillBeGarbageCollectedFinalized<Edit ingStyle> {
64 public: 64 public:
65 65
66 enum PropertiesToInclude { AllProperties, OnlyEditingInheritableProperties, EditingPropertiesInEffect }; 66 enum PropertiesToInclude { AllProperties, OnlyEditingInheritableProperties, EditingPropertiesInEffect };
67 enum ShouldPreserveWritingDirection { PreserveWritingDirection, DoNotPreserv eWritingDirection }; 67 enum ShouldPreserveWritingDirection { PreserveWritingDirection, DoNotPreserv eWritingDirection };
68 enum ShouldExtractMatchingStyle { ExtractMatchingStyle, DoNotExtractMatching Style }; 68 enum ShouldExtractMatchingStyle { ExtractMatchingStyle, DoNotExtractMatching Style };
69 static float NoFontDelta; 69 static float NoFontDelta;
70 70
71 static PassRefPtrWillBeRawPtr<EditingStyle> create() 71 static PassRefPtrWillBeRawPtr<EditingStyle> create()
72 { 72 {
73 return adoptRefWillBeNoop(new EditingStyle()); 73 return adoptRefWillBeNoop(new EditingStyle());
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 String m_applyFontSize; 228 String m_applyFontSize;
229 }; 229 };
230 230
231 // FIXME: Remove these functions or make them non-global to discourage using CSS StyleDeclaration directly. 231 // FIXME: Remove these functions or make them non-global to discourage using CSS StyleDeclaration directly.
232 CSSValueID getIdentifierValue(CSSStyleDeclaration*, CSSPropertyID); 232 CSSValueID getIdentifierValue(CSSStyleDeclaration*, CSSPropertyID);
233 CSSValueID getIdentifierValue(StylePropertySet*, CSSPropertyID); 233 CSSValueID getIdentifierValue(StylePropertySet*, CSSPropertyID);
234 234
235 } // namespace blink 235 } // namespace blink
236 236
237 #endif // EditingStyle_h 237 #endif // EditingStyle_h
OLDNEW
« no previous file with comments | « Source/core/editing/EditCommand.h ('k') | Source/core/editing/EditingStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698