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

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

Issue 826893002: [CSS Grid Layout] Remove stack from grid-auto-flow syntax (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased patch Created 5 years, 11 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 | « Source/core/rendering/style/RenderStyle.h ('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 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 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 enum ImageResolutionSnap { ImageResolutionNoSnap = 0, ImageResolutionSnapPixels }; 460 enum ImageResolutionSnap { ImageResolutionNoSnap = 0, ImageResolutionSnapPixels };
461 461
462 enum Order { LogicalOrder = 0, VisualOrder }; 462 enum Order { LogicalOrder = 0, VisualOrder };
463 463
464 enum WrapFlow { WrapFlowAuto, WrapFlowBoth, WrapFlowStart, WrapFlowEnd, WrapFlow Maximum, WrapFlowClear }; 464 enum WrapFlow { WrapFlowAuto, WrapFlowBoth, WrapFlowStart, WrapFlowEnd, WrapFlow Maximum, WrapFlowClear };
465 465
466 enum WrapThrough { WrapThroughWrap, WrapThroughNone }; 466 enum WrapThrough { WrapThroughWrap, WrapThroughNone };
467 467
468 enum RubyPosition { RubyPositionBefore, RubyPositionAfter }; 468 enum RubyPosition { RubyPositionBefore, RubyPositionAfter };
469 469
470 static const size_t GridAutoFlowBits = 5; 470 static const size_t GridAutoFlowBits = 4;
471 enum InternalGridAutoFlowAlgorithm { 471 enum InternalGridAutoFlowAlgorithm {
472 InternalAutoFlowAlgorithmSparse = 0x1, 472 InternalAutoFlowAlgorithmSparse = 0x1,
473 InternalAutoFlowAlgorithmDense = 0x2, 473 InternalAutoFlowAlgorithmDense = 0x2
474 InternalAutoFlowAlgorithmStack = 0x4
475 }; 474 };
476 475
477 enum InternalGridAutoFlowDirection { 476 enum InternalGridAutoFlowDirection {
478 InternalAutoFlowDirectionRow = 0x8, 477 InternalAutoFlowDirectionRow = 0x4,
479 InternalAutoFlowDirectionColumn = 0x10 478 InternalAutoFlowDirectionColumn = 0x8
480 }; 479 };
481 480
482 enum GridAutoFlow { 481 enum GridAutoFlow {
483 AutoFlowRow = InternalAutoFlowAlgorithmSparse | InternalAutoFlowDirectionRow , 482 AutoFlowRow = InternalAutoFlowAlgorithmSparse | InternalAutoFlowDirectionRow ,
484 AutoFlowColumn = InternalAutoFlowAlgorithmSparse | InternalAutoFlowDirection Column, 483 AutoFlowColumn = InternalAutoFlowAlgorithmSparse | InternalAutoFlowDirection Column,
485 AutoFlowRowDense = InternalAutoFlowAlgorithmDense | InternalAutoFlowDirectio nRow, 484 AutoFlowRowDense = InternalAutoFlowAlgorithmDense | InternalAutoFlowDirectio nRow,
486 AutoFlowColumnDense = InternalAutoFlowAlgorithmDense | InternalAutoFlowDirec tionColumn, 485 AutoFlowColumnDense = InternalAutoFlowAlgorithmDense | InternalAutoFlowDirec tionColumn
487 AutoFlowStackRow = InternalAutoFlowAlgorithmStack | InternalAutoFlowDirectio nRow,
488 AutoFlowStackColumn = InternalAutoFlowAlgorithmStack | InternalAutoFlowDirec tionColumn
489 }; 486 };
490 487
491 enum DraggableRegionMode { DraggableRegionNone, DraggableRegionDrag, DraggableRe gionNoDrag }; 488 enum DraggableRegionMode { DraggableRegionNone, DraggableRegionDrag, DraggableRe gionNoDrag };
492 489
493 static const size_t TouchActionBits = 4; 490 static const size_t TouchActionBits = 4;
494 enum TouchAction { 491 enum TouchAction {
495 TouchActionAuto = 0x0, 492 TouchActionAuto = 0x0,
496 TouchActionNone = 0x1, 493 TouchActionNone = 0x1,
497 TouchActionPanX = 0x2, 494 TouchActionPanX = 0x2,
498 TouchActionPanY = 0x4, 495 TouchActionPanY = 0x4,
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 static const float maximumAllowedFontSize = 1000000.0f; 565 static const float maximumAllowedFontSize = 1000000.0f;
569 566
570 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine }; 567 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine };
571 enum TextIndentType { TextIndentNormal, TextIndentHanging }; 568 enum TextIndentType { TextIndentNormal, TextIndentHanging };
572 569
573 enum CSSBoxType { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox } ; 570 enum CSSBoxType { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox } ;
574 571
575 } // namespace blink 572 } // namespace blink
576 573
577 #endif // RenderStyleConstants_h 574 #endif // RenderStyleConstants_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698