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

Side by Side Diff: Source/core/rendering/RenderText.cpp

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/RenderTableSection.cpp ('k') | Source/core/rendering/RootInlineBox.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 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 namespace blink { 57 namespace blink {
58 58
59 struct SameSizeAsRenderText : public RenderObject { 59 struct SameSizeAsRenderText : public RenderObject {
60 uint32_t bitfields : 16; 60 uint32_t bitfields : 16;
61 float widths[4]; 61 float widths[4];
62 String text; 62 String text;
63 void* pointers[2]; 63 void* pointers[2];
64 }; 64 };
65 65
66 COMPILE_ASSERT(sizeof(RenderText) == sizeof(SameSizeAsRenderText), RenderText_sh ould_stay_small); 66 static_assert(sizeof(RenderText) == sizeof(SameSizeAsRenderText), "RenderText sh ould stay small");
67 67
68 class SecureTextTimer; 68 class SecureTextTimer;
69 typedef HashMap<RenderText*, SecureTextTimer*> SecureTextTimerMap; 69 typedef HashMap<RenderText*, SecureTextTimer*> SecureTextTimerMap;
70 static SecureTextTimerMap* gSecureTextTimers = 0; 70 static SecureTextTimerMap* gSecureTextTimers = 0;
71 71
72 class SecureTextTimer final : public TimerBase { 72 class SecureTextTimer final : public TimerBase {
73 public: 73 public:
74 SecureTextTimer(RenderText* renderText) 74 SecureTextTimer(RenderText* renderText)
75 : m_renderText(renderText) 75 : m_renderText(renderText)
76 , m_lastTypedCharacterOffset(-1) 76 , m_lastTypedCharacterOffset(-1)
(...skipping 1795 matching lines...) Expand 10 before | Expand all | Expand 10 after
1872 } 1872 }
1873 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); 1873 secureTextTimer->restartWithNewText(lastTypedCharacterOffset);
1874 } 1874 }
1875 1875
1876 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() 1876 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox()
1877 { 1877 {
1878 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); 1878 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox);
1879 } 1879 }
1880 1880
1881 } // namespace blink 1881 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTableSection.cpp ('k') | Source/core/rendering/RootInlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698