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

Side by Side Diff: sky/engine/core/rendering/style/RenderStyleConstants.h

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 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 }; 101 };
102 102
103 enum EClear { 103 enum EClear {
104 CNONE = 0, CLEFT = 1, CRIGHT = 2, CBOTH = 3 104 CNONE = 0, CLEFT = 1, CRIGHT = 2, CBOTH = 3
105 }; 105 };
106 106
107 enum ETableLayout { 107 enum ETableLayout {
108 TAUTO, TFIXED 108 TAUTO, TFIXED
109 }; 109 };
110 110
111 enum TextCombine {
112 TextCombineNone, TextCombineHorizontal
113 };
114
115 enum EFillAttachment { 111 enum EFillAttachment {
116 ScrollBackgroundAttachment, LocalBackgroundAttachment, FixedBackgroundAttach ment 112 ScrollBackgroundAttachment, LocalBackgroundAttachment, FixedBackgroundAttach ment
117 }; 113 };
118 114
119 enum EFillBox { 115 enum EFillBox {
120 BorderFillBox, PaddingFillBox, ContentFillBox, TextFillBox 116 BorderFillBox, PaddingFillBox, ContentFillBox, TextFillBox
121 }; 117 };
122 118
123 enum EFillRepeat { 119 enum EFillRepeat {
124 RepeatFill, NoRepeatFill, RoundFill, SpaceFill 120 RepeatFill, NoRepeatFill, RoundFill, SpaceFill
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 static const float maximumAllowedFontSize = 1000000.0f; 499 static const float maximumAllowedFontSize = 1000000.0f;
504 500
505 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine }; 501 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine };
506 enum TextIndentType { TextIndentNormal, TextIndentHanging }; 502 enum TextIndentType { TextIndentNormal, TextIndentHanging };
507 503
508 enum CSSBoxType { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox } ; 504 enum CSSBoxType { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox } ;
509 505
510 } // namespace blink 506 } // namespace blink
511 507
512 #endif // RenderStyleConstants_h 508 #endif // RenderStyleConstants_h
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/RenderStyle.cpp ('k') | sky/engine/core/rendering/style/StyleRareNonInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698