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

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

Issue 811843003: replace COMPILE_ASSERT with static_assert in core/rendering/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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/RootInlineBox.cpp ('k') | Source/core/rendering/break_lines.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) 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 } 193 }
194 194
195 unsigned m_parentHash; 195 unsigned m_parentHash;
196 unsigned m_qualifiedNameHash; 196 unsigned m_qualifiedNameHash;
197 // Style specific selection of signals 197 // Style specific selection of signals
198 unsigned m_packedStyleProperties; 198 unsigned m_packedStyleProperties;
199 unsigned m_column; 199 unsigned m_column;
200 float m_width; 200 float m_width;
201 }; 201 };
202 // Ensures efficient hashing using StringHasher. 202 // Ensures efficient hashing using StringHasher.
203 COMPILE_ASSERT(!(sizeof(FingerprintSourceData) % sizeof(UChar)), 203 static_assert(!(sizeof(FingerprintSourceData) % sizeof(UChar)),
204 Sizeof_FingerprintSourceData_must_be_multiple_of_UChar); 204 "sizeof(FingerprintSourceData) must be a multiple of UChar");
205 205
206 typedef unsigned Fingerprint; 206 typedef unsigned Fingerprint;
207 typedef HashMap<Fingerprint, OwnPtr<Supercluster> > SuperclusterMap; 207 typedef HashMap<Fingerprint, OwnPtr<Supercluster> > SuperclusterMap;
208 typedef Vector<OwnPtr<Cluster> > ClusterStack; 208 typedef Vector<OwnPtr<Cluster> > ClusterStack;
209 209
210 // Fingerprints are computed during style recalc, for (some subset of) 210 // Fingerprints are computed during style recalc, for (some subset of)
211 // blocks that will become cluster roots. 211 // blocks that will become cluster roots.
212 class FingerprintMapper { 212 class FingerprintMapper {
213 public: 213 public:
214 void add(const RenderObject*, Fingerprint); 214 void add(const RenderObject*, Fingerprint);
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 FingerprintMapper m_fingerprintMapper; 306 FingerprintMapper m_fingerprintMapper;
307 Vector<RefPtr<RenderStyle> > m_stylesRetainedDuringLayout; 307 Vector<RefPtr<RenderStyle> > m_stylesRetainedDuringLayout;
308 // FIXME: All frames should share the same m_pageInfo instance. 308 // FIXME: All frames should share the same m_pageInfo instance.
309 PageInfo m_pageInfo; 309 PageInfo m_pageInfo;
310 bool m_updatePageInfoDeferred; 310 bool m_updatePageInfoDeferred;
311 }; 311 };
312 312
313 } // namespace blink 313 } // namespace blink
314 314
315 #endif // TextAutosizer_h 315 #endif // TextAutosizer_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RootInlineBox.cpp ('k') | Source/core/rendering/break_lines.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698