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

Side by Side Diff: sky/engine/core/rendering/line/LineBreaker.cpp

Issue 677843004: Remove text-combine. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved.
4 * Copyright (C) 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2010 Google 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 20 matching lines...) Expand all
31 FloatingObject* lastFloatFromPreviousLine, LineWidth& width) 31 FloatingObject* lastFloatFromPreviousLine, LineWidth& width)
32 { 32 {
33 while (!resolver.position().atEnd() && !requiresLineBox(resolver.position(), lineInfo, LeadingWhitespace)) { 33 while (!resolver.position().atEnd() && !requiresLineBox(resolver.position(), lineInfo, LeadingWhitespace)) {
34 RenderObject* object = resolver.position().object(); 34 RenderObject* object = resolver.position().object();
35 if (object->isOutOfFlowPositioned()) { 35 if (object->isOutOfFlowPositioned()) {
36 setStaticPositions(m_block, toRenderBox(object)); 36 setStaticPositions(m_block, toRenderBox(object));
37 if (object->style()->isOriginalDisplayInlineType()) { 37 if (object->style()->isOriginalDisplayInlineType()) {
38 resolver.runs().addRun(createRun(0, 1, object, resolver)); 38 resolver.runs().addRun(createRun(0, 1, object, resolver));
39 lineInfo.incrementRunsFromLeadingWhitespace(); 39 lineInfo.incrementRunsFromLeadingWhitespace();
40 } 40 }
41 } else if (object->isText() && object->style()->hasTextCombine() && obje ct->isCombineText() && !toRenderCombineText(object)->isCombined()) {
42 toRenderCombineText(object)->combineText();
43 if (toRenderCombineText(object)->isCombined())
44 continue;
45 } 41 }
46 resolver.position().increment(&resolver); 42 resolver.position().increment(&resolver);
47 } 43 }
48 resolver.commitExplicitEmbedding(resolver.runs()); 44 resolver.commitExplicitEmbedding(resolver.runs());
49 } 45 }
50 46
51 void LineBreaker::reset() 47 void LineBreaker::reset()
52 { 48 {
53 m_positionedObjects.clear(); 49 m_positionedObjects.clear();
54 m_hyphenated = false; 50 m_hyphenated = false;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 97
102 context.increment(); 98 context.increment();
103 } 99 }
104 100
105 context.clearLineBreakIfFitsOnLine(); 101 context.clearLineBreakIfFitsOnLine();
106 102
107 return context.handleEndOfLine(); 103 return context.handleEndOfLine();
108 } 104 }
109 105
110 } 106 }
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/line/BreakingContextInlineHeaders.h ('k') | sky/engine/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698