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

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

Issue 2458003002: Remove ASSERT_WITH_SECURITY_IMPLICATION. (Closed)
Patch Set: Minor formatting fix Created 4 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 * (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-2009, 2013 Apple Inc. All rights reserved. 4 * Copyright (C) 2004-2009, 2013 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 306
307 String m_text; 307 String m_text;
308 308
309 // The line boxes associated with this object. 309 // The line boxes associated with this object.
310 // Read the LINE BOXES OWNERSHIP section in the class header comment. 310 // Read the LINE BOXES OWNERSHIP section in the class header comment.
311 InlineTextBox* m_firstTextBox; 311 InlineTextBox* m_firstTextBox;
312 InlineTextBox* m_lastTextBox; 312 InlineTextBox* m_lastTextBox;
313 }; 313 };
314 314
315 inline UChar LayoutText::uncheckedCharacterAt(unsigned i) const { 315 inline UChar LayoutText::uncheckedCharacterAt(unsigned i) const {
316 ASSERT_WITH_SECURITY_IMPLICATION(i < textLength()); 316 SECURITY_DCHECK(i < textLength());
317 return is8Bit() ? characters8()[i] : characters16()[i]; 317 return is8Bit() ? characters8()[i] : characters16()[i];
318 } 318 }
319 319
320 inline UChar LayoutText::characterAt(unsigned i) const { 320 inline UChar LayoutText::characterAt(unsigned i) const {
321 if (i >= textLength()) 321 if (i >= textLength())
322 return 0; 322 return 0;
323 323
324 return uncheckedCharacterAt(i); 324 return uncheckedCharacterAt(i);
325 } 325 }
326 326
(...skipping 21 matching lines...) Expand all
348 348
349 inline LayoutText* Text::layoutObject() const { 349 inline LayoutText* Text::layoutObject() const {
350 return toLayoutText(CharacterData::layoutObject()); 350 return toLayoutText(CharacterData::layoutObject());
351 } 351 }
352 352
353 void applyTextTransform(const ComputedStyle*, String&, UChar); 353 void applyTextTransform(const ComputedStyle*, String&, UChar);
354 354
355 } // namespace blink 355 } // namespace blink
356 356
357 #endif // LayoutText_h 357 #endif // LayoutText_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.h ('k') | third_party/WebKit/Source/core/layout/TextAutosizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698