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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTextCombine.h

Issue 2770123003: Replace ASSERT with DCHECK in core/layout/ excluding subdirs (Closed)
Patch Set: Split some DCHECKs and add DCHECK_ops wherever possible Created 3 years, 8 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) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 float m_combinedTextWidth; 62 float m_combinedTextWidth;
63 float m_scaleX; 63 float m_scaleX;
64 bool m_isCombined : 1; 64 bool m_isCombined : 1;
65 bool m_needsFontUpdate : 1; 65 bool m_needsFontUpdate : 1;
66 }; 66 };
67 67
68 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTextCombine, isCombineText()); 68 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTextCombine, isCombineText());
69 69
70 inline LayoutUnit LayoutTextCombine::inlineWidthForLayout() const { 70 inline LayoutUnit LayoutTextCombine::inlineWidthForLayout() const {
71 ASSERT(!m_needsFontUpdate); 71 DCHECK(!m_needsFontUpdate);
72 return LayoutUnit::fromFloatCeil(m_combinedTextWidth); 72 return LayoutUnit::fromFloatCeil(m_combinedTextWidth);
73 } 73 }
74 74
75 } // namespace blink 75 } // namespace blink
76 76
77 #endif // LayoutTextCombine_h 77 #endif // LayoutTextCombine_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutText.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTextControl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698