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

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

Issue 1420503004: Restore optimization in LayoutBlockFlowLine width computation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: w/TestExpectations Created 5 years, 2 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 | « third_party/WebKit/LayoutTests/TestExpectations ('k') | no next file » | 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 1815 matching lines...) Expand 10 before | Expand all | Expand 10 after
1826 1826
1827 long result = iterator->following(current); 1827 long result = iterator->following(current);
1828 if (result == TextBreakDone) 1828 if (result == TextBreakDone)
1829 result = current + 1; 1829 result = current + 1;
1830 1830
1831 return result; 1831 return result;
1832 } 1832 }
1833 1833
1834 bool LayoutText::computeCanUseSimpleFontCodePath() const 1834 bool LayoutText::computeCanUseSimpleFontCodePath() const
1835 { 1835 {
1836 if (RuntimeEnabledFeatures::alwaysUseComplexTextEnabled()
1837 || LayoutTestSupport::alwaysUseComplexTextForTest()) {
1838 return false;
1839 }
1840 if (m_text.is8Bit()) 1836 if (m_text.is8Bit())
1841 return true; 1837 return true;
1842 return Character::characterRangeCodePath(characters16(), length()) == Simple Path; 1838 return Character::characterRangeCodePath(characters16(), length()) == Simple Path;
1843 } 1839 }
1844 1840
1845 #if ENABLE(ASSERT) 1841 #if ENABLE(ASSERT)
1846 1842
1847 void LayoutText::checkConsistency() const 1843 void LayoutText::checkConsistency() const
1848 { 1844 {
1849 #ifdef CHECK_CONSISTENCY 1845 #ifdef CHECK_CONSISTENCY
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
1885 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) { 1881 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
1886 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason, emptyInvalidationRect, emptyInvalidationRect); 1882 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason, emptyInvalidationRect, emptyInvalidationRect);
1887 if (box->truncation() != cNoTruncation) { 1883 if (box->truncation() != cNoTruncation) {
1888 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox()) 1884 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox())
1889 paintInvalidationContainer.invalidateDisplayItemClientOnBacking( *ellipsisBox, invalidationReason, emptyInvalidationRect, emptyInvalidationRect); 1885 paintInvalidationContainer.invalidateDisplayItemClientOnBacking( *ellipsisBox, invalidationReason, emptyInvalidationRect, emptyInvalidationRect);
1890 } 1886 }
1891 } 1887 }
1892 } 1888 }
1893 1889
1894 } // namespace blink 1890 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698