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

Side by Side Diff: Source/core/layout/LayoutText.cpp

Issue 1231363003: Fix virtual/override/final usage in Source/core/layout/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutText.h ('k') | Source/core/layout/LayoutTextCombine.h » ('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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 void restartWithNewText(unsigned lastTypedCharacterOffset) 79 void restartWithNewText(unsigned lastTypedCharacterOffset)
80 { 80 {
81 m_lastTypedCharacterOffset = lastTypedCharacterOffset; 81 m_lastTypedCharacterOffset = lastTypedCharacterOffset;
82 if (Settings* settings = m_layoutText->document().settings()) 82 if (Settings* settings = m_layoutText->document().settings())
83 startOneShot(settings->passwordEchoDurationInSeconds(), FROM_HERE); 83 startOneShot(settings->passwordEchoDurationInSeconds(), FROM_HERE);
84 } 84 }
85 void invalidate() { m_lastTypedCharacterOffset = -1; } 85 void invalidate() { m_lastTypedCharacterOffset = -1; }
86 unsigned lastTypedCharacterOffset() { return m_lastTypedCharacterOffset; } 86 unsigned lastTypedCharacterOffset() { return m_lastTypedCharacterOffset; }
87 87
88 private: 88 private:
89 virtual void fired() override 89 void fired() override
90 { 90 {
91 ASSERT(gSecureTextTimers->contains(m_layoutText)); 91 ASSERT(gSecureTextTimers->contains(m_layoutText));
92 m_layoutText->setText(m_layoutText->text().impl(), true /* forcing setti ng text as it may be masked later */); 92 m_layoutText->setText(m_layoutText->text().impl(), true /* forcing setti ng text as it may be masked later */);
93 } 93 }
94 94
95 LayoutText* m_layoutText; 95 LayoutText* m_layoutText;
96 int m_lastTypedCharacterOffset; 96 int m_lastTypedCharacterOffset;
97 }; 97 };
98 98
99 static void makeCapitalized(String* string, UChar previous) 99 static void makeCapitalized(String* string, UChar previous)
(...skipping 1760 matching lines...) Expand 10 before | Expand all | Expand 10 after
1860 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) { 1860 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
1861 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box); 1861 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box);
1862 if (box->truncation() != cNoTruncation) { 1862 if (box->truncation() != cNoTruncation) {
1863 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox()) 1863 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox())
1864 paintInvalidationContainer.invalidateDisplayItemClientOnBacking( *ellipsisBox); 1864 paintInvalidationContainer.invalidateDisplayItemClientOnBacking( *ellipsisBox);
1865 } 1865 }
1866 } 1866 }
1867 } 1867 }
1868 1868
1869 } // namespace blink 1869 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutText.h ('k') | Source/core/layout/LayoutTextCombine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698