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

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

Issue 116423007: Moving Text Simple/Complex Path prefix from Font.cpp to new File (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixing merge issues Created 6 years, 11 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
« no previous file with comments | « Source/core/rendering/RenderText.h ('k') | Source/core/rendering/svg/SVGTextMetricsBuilder.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 1791 matching lines...) Expand 10 before | Expand all | Expand 10 after
1802 if (result == TextBreakDone) 1802 if (result == TextBreakDone)
1803 result = current + 1; 1803 result = current + 1;
1804 1804
1805 return result; 1805 return result;
1806 } 1806 }
1807 1807
1808 bool RenderText::computeCanUseSimpleFontCodePath() const 1808 bool RenderText::computeCanUseSimpleFontCodePath() const
1809 { 1809 {
1810 if (isAllASCII() || m_text.is8Bit()) 1810 if (isAllASCII() || m_text.is8Bit())
1811 return true; 1811 return true;
1812 return Font::characterRangeCodePath(characters16(), length()) == Font::Simpl e; 1812 return Font::characterRangeCodePath(characters16(), length()) == SimplePath;
1813 } 1813 }
1814 1814
1815 #ifndef NDEBUG 1815 #ifndef NDEBUG
1816 1816
1817 void RenderText::checkConsistency() const 1817 void RenderText::checkConsistency() const
1818 { 1818 {
1819 #ifdef CHECK_CONSISTENCY 1819 #ifdef CHECK_CONSISTENCY
1820 const InlineTextBox* prev = 0; 1820 const InlineTextBox* prev = 0;
1821 for (const InlineTextBox* child = m_firstTextBox; child != 0; child = child- >nextTextBox()) { 1821 for (const InlineTextBox* child = m_firstTextBox; child != 0; child = child- >nextTextBox()) {
1822 ASSERT(child->renderer() == this); 1822 ASSERT(child->renderer() == this);
(...skipping 18 matching lines...) Expand all
1841 } 1841 }
1842 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); 1842 secureTextTimer->restartWithNewText(lastTypedCharacterOffset);
1843 } 1843 }
1844 1844
1845 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() 1845 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox()
1846 { 1846 {
1847 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); 1847 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox);
1848 } 1848 }
1849 1849
1850 } // namespace WebCore 1850 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderText.h ('k') | Source/core/rendering/svg/SVGTextMetricsBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698