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

Side by Side Diff: Source/core/rendering/style/RenderStyleConstants.h

Issue 16337002: Revert "Revert "Implement CSS3TextDecorations runtime flag in favor of CSS3_TEXT"" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 6 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 * 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 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 TextDecorationUnderline = 0x1, 337 TextDecorationUnderline = 0x1,
338 TextDecorationOverline = 0x2, 338 TextDecorationOverline = 0x2,
339 TextDecorationLineThrough = 0x4, 339 TextDecorationLineThrough = 0x4,
340 TextDecorationBlink = 0x8 340 TextDecorationBlink = 0x8
341 }; 341 };
342 inline TextDecoration operator| (TextDecoration a, TextDecoration b) { return Te xtDecoration(int(a) | int(b)); } 342 inline TextDecoration operator| (TextDecoration a, TextDecoration b) { return Te xtDecoration(int(a) | int(b)); }
343 inline TextDecoration& operator|= (TextDecoration& a, TextDecoration b) { return a = a | b; } 343 inline TextDecoration& operator|= (TextDecoration& a, TextDecoration b) { return a = a | b; }
344 344
345 enum TextDecorationStyle { 345 enum TextDecorationStyle {
346 TextDecorationStyleSolid, 346 TextDecorationStyleSolid,
347 #if ENABLE(CSS3_TEXT)
348 TextDecorationStyleDouble, 347 TextDecorationStyleDouble,
349 TextDecorationStyleDotted, 348 TextDecorationStyleDotted,
350 TextDecorationStyleDashed, 349 TextDecorationStyleDashed,
351 TextDecorationStyleWavy 350 TextDecorationStyleWavy
352 #endif // CSS3_TEXT
353 }; 351 };
354 352
355 #if ENABLE(CSS3_TEXT) 353 #if ENABLE(CSS3_TEXT)
356 enum TextAlignLast { 354 enum TextAlignLast {
357 TextAlignLastAuto, TextAlignLastStart, TextAlignLastEnd, TextAlignLastLeft, TextAlignLastRight, TextAlignLastCenter, TextAlignLastJustify 355 TextAlignLastAuto, TextAlignLastStart, TextAlignLastEnd, TextAlignLastLeft, TextAlignLastRight, TextAlignLastCenter, TextAlignLastJustify
358 }; 356 };
359 357
360 enum TextUnderlinePosition { 358 enum TextUnderlinePosition {
361 // FIXME: Implement support for 'under left' and 'under right' values. 359 // FIXME: Implement support for 'under left' and 'under right' values.
362 TextUnderlinePositionAuto = 0x1, TextUnderlinePositionAlphabetic = 0x2, Text UnderlinePositionUnder = 0x4 360 TextUnderlinePositionAuto = 0x1, TextUnderlinePositionAlphabetic = 0x2, Text UnderlinePositionUnder = 0x4
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 // Reasonable maximum to prevent insane font sizes from causing crashes on some platforms (such as Windows). 498 // Reasonable maximum to prevent insane font sizes from causing crashes on some platforms (such as Windows).
501 static const float maximumAllowedFontSize = 1000000.0f; 499 static const float maximumAllowedFontSize = 1000000.0f;
502 500
503 #if ENABLE(CSS3_TEXT) 501 #if ENABLE(CSS3_TEXT)
504 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine }; 502 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine };
505 #endif 503 #endif
506 504
507 } // namespace WebCore 505 } // namespace WebCore
508 506
509 #endif // RenderStyleConstants_h 507 #endif // RenderStyleConstants_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.cpp ('k') | Source/core/rendering/style/StyleRareNonInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698