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

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

Issue 1394003004: Add flag to force complex text for tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 23 matching lines...) Expand all
34 #include "core/html/parser/TextResourceDecoder.h" 34 #include "core/html/parser/TextResourceDecoder.h"
35 #include "core/layout/LayoutBlock.h" 35 #include "core/layout/LayoutBlock.h"
36 #include "core/layout/LayoutTextCombine.h" 36 #include "core/layout/LayoutTextCombine.h"
37 #include "core/layout/LayoutView.h" 37 #include "core/layout/LayoutView.h"
38 #include "core/layout/api/LineLayoutBox.h" 38 #include "core/layout/api/LineLayoutBox.h"
39 #include "core/layout/line/AbstractInlineTextBox.h" 39 #include "core/layout/line/AbstractInlineTextBox.h"
40 #include "core/layout/line/EllipsisBox.h" 40 #include "core/layout/line/EllipsisBox.h"
41 #include "core/layout/line/GlyphOverflow.h" 41 #include "core/layout/line/GlyphOverflow.h"
42 #include "core/layout/line/InlineTextBox.h" 42 #include "core/layout/line/InlineTextBox.h"
43 #include "core/paint/PaintLayer.h" 43 #include "core/paint/PaintLayer.h"
44 #include "platform/LayoutTestSupport.h"
44 #include "platform/fonts/Character.h" 45 #include "platform/fonts/Character.h"
45 #include "platform/fonts/FontCache.h" 46 #include "platform/fonts/FontCache.h"
46 #include "platform/geometry/FloatQuad.h" 47 #include "platform/geometry/FloatQuad.h"
47 #include "platform/text/BidiResolver.h" 48 #include "platform/text/BidiResolver.h"
48 #include "platform/text/TextBreakIterator.h" 49 #include "platform/text/TextBreakIterator.h"
49 #include "platform/text/TextRunIterator.h" 50 #include "platform/text/TextRunIterator.h"
50 #include "wtf/text/CharacterNames.h" 51 #include "wtf/text/CharacterNames.h"
51 #include "wtf/text/StringBuffer.h" 52 #include "wtf/text/StringBuffer.h"
52 #include "wtf/text/StringBuilder.h" 53 #include "wtf/text/StringBuilder.h"
53 54
(...skipping 1771 matching lines...) Expand 10 before | Expand all | Expand 10 after
1825 1826
1826 long result = iterator->following(current); 1827 long result = iterator->following(current);
1827 if (result == TextBreakDone) 1828 if (result == TextBreakDone)
1828 result = current + 1; 1829 result = current + 1;
1829 1830
1830 return result; 1831 return result;
1831 } 1832 }
1832 1833
1833 bool LayoutText::computeCanUseSimpleFontCodePath() const 1834 bool LayoutText::computeCanUseSimpleFontCodePath() const
1834 { 1835 {
1835 if (RuntimeEnabledFeatures::alwaysUseComplexTextEnabled()) 1836 if (RuntimeEnabledFeatures::alwaysUseComplexTextEnabled()
1837 || LayoutTestSupport::alwaysUseComplexTextForTest()) {
1836 return false; 1838 return false;
1839 }
1837 if (m_text.is8Bit()) 1840 if (m_text.is8Bit())
1838 return true; 1841 return true;
1839 return Character::characterRangeCodePath(characters16(), length()) == Simple Path; 1842 return Character::characterRangeCodePath(characters16(), length()) == Simple Path;
1840 } 1843 }
1841 1844
1842 #if ENABLE(ASSERT) 1845 #if ENABLE(ASSERT)
1843 1846
1844 void LayoutText::checkConsistency() const 1847 void LayoutText::checkConsistency() const
1845 { 1848 {
1846 #ifdef CHECK_CONSISTENCY 1849 #ifdef CHECK_CONSISTENCY
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
1882 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) { 1885 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
1883 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason, emptyInvalidationRect, emptyInvalidationRect); 1886 paintInvalidationContainer.invalidateDisplayItemClientOnBacking(*box, in validationReason, emptyInvalidationRect, emptyInvalidationRect);
1884 if (box->truncation() != cNoTruncation) { 1887 if (box->truncation() != cNoTruncation) {
1885 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox()) 1888 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox())
1886 paintInvalidationContainer.invalidateDisplayItemClientOnBacking( *ellipsisBox, invalidationReason, emptyInvalidationRect, emptyInvalidationRect); 1889 paintInvalidationContainer.invalidateDisplayItemClientOnBacking( *ellipsisBox, invalidationReason, emptyInvalidationRect, emptyInvalidationRect);
1887 } 1890 }
1888 } 1891 }
1889 } 1892 }
1890 1893
1891 } // namespace blink 1894 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698