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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSToLengthConversionData.h

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 27 matching lines...) Expand all
38 #include "wtf/MathExtras.h" 38 #include "wtf/MathExtras.h"
39 #include <limits> 39 #include <limits>
40 40
41 namespace blink { 41 namespace blink {
42 42
43 class ComputedStyle; 43 class ComputedStyle;
44 class LayoutView; 44 class LayoutView;
45 class Font; 45 class Font;
46 46
47 class CORE_EXPORT CSSToLengthConversionData { 47 class CORE_EXPORT CSSToLengthConversionData {
48 DISALLOW_ALLOCATION(); 48 DISALLOW_NEW();
49 public: 49 public:
50 50
51 class FontSizes { 51 class FontSizes {
52 DISALLOW_ALLOCATION(); 52 DISALLOW_NEW();
53 public: 53 public:
54 FontSizes() : m_em(0), m_rem(0), m_font(nullptr) { } 54 FontSizes() : m_em(0), m_rem(0), m_font(nullptr) { }
55 FontSizes(float em, float rem, const Font*); 55 FontSizes(float em, float rem, const Font*);
56 FontSizes(const ComputedStyle*, const ComputedStyle* rootStyle); 56 FontSizes(const ComputedStyle*, const ComputedStyle* rootStyle);
57 57
58 float em() const { return m_em; } 58 float em() const { return m_em; }
59 float rem() const { return m_rem; } 59 float rem() const { return m_rem; }
60 float ex() const; 60 float ex() const;
61 float ch() const; 61 float ch() const;
62 private: 62 private:
63 float m_em; 63 float m_em;
64 float m_rem; 64 float m_rem;
65 const Font* m_font; 65 const Font* m_font;
66 }; 66 };
67 67
68 class ViewportSize { 68 class ViewportSize {
69 DISALLOW_ALLOCATION(); 69 DISALLOW_NEW();
70 public: 70 public:
71 ViewportSize() : m_width(0), m_height(0) { } 71 ViewportSize() : m_width(0), m_height(0) { }
72 ViewportSize(double width, double height) : m_width(width), m_height(hei ght) { } 72 ViewportSize(double width, double height) : m_width(width), m_height(hei ght) { }
73 explicit ViewportSize(const LayoutView*); 73 explicit ViewportSize(const LayoutView*);
74 74
75 double width() const { return m_width; } 75 double width() const { return m_width; }
76 double height() const { return m_height; } 76 double height() const { return m_height; }
77 private: 77 private:
78 double m_width; 78 double m_width;
79 double m_height; 79 double m_height;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 private: 113 private:
114 const ComputedStyle* m_style; 114 const ComputedStyle* m_style;
115 FontSizes m_fontSizes; 115 FontSizes m_fontSizes;
116 ViewportSize m_viewportSize; 116 ViewportSize m_viewportSize;
117 float m_zoom; 117 float m_zoom;
118 }; 118 };
119 119
120 } // namespace blink 120 } // namespace blink
121 121
122 #endif 122 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSPropertySourceData.h ('k') | third_party/WebKit/Source/core/css/ElementRuleCollector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698