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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyleConstants.h

Issue 2555423002: Move white-space to be generated in ComputedStyleBase. (Closed)
Patch Set: Updated SameSizeAsComputedStyle() to reflect the change in inherited data bitfield size. Created 4 years 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/Source/core/style/ComputedStyle.cpp ('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 * 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 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
6 * reserved. 6 * reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * 10 *
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 Katakana, 321 Katakana,
322 HiraganaIroha, 322 HiraganaIroha,
323 KatakanaIroha, 323 KatakanaIroha,
324 NoneListStyle 324 NoneListStyle
325 }; 325 };
326 326
327 enum QuoteType { OPEN_QUOTE, CLOSE_QUOTE, NO_OPEN_QUOTE, NO_CLOSE_QUOTE }; 327 enum QuoteType { OPEN_QUOTE, CLOSE_QUOTE, NO_OPEN_QUOTE, NO_CLOSE_QUOTE };
328 328
329 enum EAnimPlayState { AnimPlayStatePlaying, AnimPlayStatePaused }; 329 enum EAnimPlayState { AnimPlayStatePlaying, AnimPlayStatePaused };
330 330
331 enum class EWhiteSpace : unsigned {
332 Normal,
333 Pre,
334 PreWrap,
335 PreLine,
336 Nowrap,
337 WebkitNowrap
338 };
339
340 // The order of this enum must match the order of the text align values in 331 // The order of this enum must match the order of the text align values in
341 // CSSValueKeywords.in. 332 // CSSValueKeywords.in.
342 enum class ETextAlign : unsigned { 333 enum class ETextAlign : unsigned {
343 Left, 334 Left,
344 Right, 335 Right,
345 Center, 336 Center,
346 Justify, 337 Justify,
347 WebkitLeft, 338 WebkitLeft,
348 WebkitRight, 339 WebkitRight,
349 WebkitCenter, 340 WebkitCenter,
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 ScrollSnapTypeNone, 698 ScrollSnapTypeNone,
708 ScrollSnapTypeMandatory, 699 ScrollSnapTypeMandatory,
709 ScrollSnapTypeProximity 700 ScrollSnapTypeProximity
710 }; 701 };
711 702
712 enum AutoRepeatType { NoAutoRepeat, AutoFill, AutoFit }; 703 enum AutoRepeatType { NoAutoRepeat, AutoFill, AutoFit };
713 704
714 } // namespace blink 705 } // namespace blink
715 706
716 #endif // ComputedStyleConstants_h 707 #endif // ComputedStyleConstants_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698