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

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

Issue 2672693002: Moved display property to be generated in ComputedStyleBase. (Closed)
Patch Set: Rebase Created 3 years, 8 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
« 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 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 TextAlignLastCenter, 288 TextAlignLastCenter,
289 TextAlignLastJustify 289 TextAlignLastJustify
290 }; 290 };
291 291
292 enum TextUnderlinePosition { 292 enum TextUnderlinePosition {
293 // FIXME: Implement support for 'under left' and 'under right' values. 293 // FIXME: Implement support for 'under left' and 'under right' values.
294 TextUnderlinePositionAuto, 294 TextUnderlinePositionAuto,
295 TextUnderlinePositionUnder 295 TextUnderlinePositionUnder
296 }; 296 };
297 297
298 enum class EDisplay : unsigned {
299 kInline,
300 kBlock,
301 kListItem,
302 kInlineBlock,
303 kTable,
304 kInlineTable,
305 kTableRowGroup,
306 kTableHeaderGroup,
307 kTableFooterGroup,
308 kTableRow,
309 kTableColumnGroup,
310 kTableColumn,
311 kTableCell,
312 kTableCaption,
313 kWebkitBox,
314 kWebkitInlineBox,
315 kFlex,
316 kInlineFlex,
317 kGrid,
318 kInlineGrid,
319 kContents,
320 kFlowRoot,
321 kNone
322 };
323
324 enum ETransformStyle3D { TransformStyle3DFlat, TransformStyle3DPreserve3D }; 298 enum ETransformStyle3D { TransformStyle3DFlat, TransformStyle3DPreserve3D };
325 299
326 enum OffsetRotationType { OffsetRotationAuto, OffsetRotationFixed }; 300 enum OffsetRotationType { OffsetRotationAuto, OffsetRotationFixed };
327 301
328 enum EBackfaceVisibility { 302 enum EBackfaceVisibility {
329 BackfaceVisibilityVisible, 303 BackfaceVisibilityVisible,
330 BackfaceVisibilityHidden 304 BackfaceVisibilityHidden
331 }; 305 };
332 306
333 enum ELineClampType { LineClampLineCount, LineClampPercentage }; 307 enum ELineClampType { LineClampLineCount, LineClampPercentage };
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 ScrollSnapTypeNone, 494 ScrollSnapTypeNone,
521 ScrollSnapTypeMandatory, 495 ScrollSnapTypeMandatory,
522 ScrollSnapTypeProximity 496 ScrollSnapTypeProximity
523 }; 497 };
524 498
525 enum AutoRepeatType { NoAutoRepeat, AutoFill, AutoFit }; 499 enum AutoRepeatType { NoAutoRepeat, AutoFill, AutoFit };
526 500
527 } // namespace blink 501 } // namespace blink
528 502
529 #endif // ComputedStyleConstants_h 503 #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