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

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

Issue 2361733003: [css-align] Initial value of align-content should be 'stretch'. (Closed)
Patch Set: Created 4 years, 2 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/css/ComputedStyleCSSValueMapping.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, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 * is preferable to: 465 * is preferable to:
466 * BorderWidths getBorderWidths(); 466 * BorderWidths getBorderWidths();
467 * 467 *
468 * Utility functions should go in a separate section at the end of the 468 * Utility functions should go in a separate section at the end of the
469 * class, and be kept to a minimum. 469 * class, and be kept to a minimum.
470 */ 470 */
471 471
472 // Non-Inherited properties. 472 // Non-Inherited properties.
473 473
474 // Content alignment properties. 474 // Content alignment properties.
475 static StyleContentAlignmentData initialContentAlignment() { return StyleCon tentAlignmentData(RuntimeEnabledFeatures::cssGridLayoutEnabled() ? ContentPositi onNormal : ContentPositionFlexStart, ContentDistributionDefault, OverflowAlignme ntDefault); } 475 static StyleContentAlignmentData initialContentAlignment() { return StyleCon tentAlignmentData(ContentPositionNormal, ContentDistributionDefault, OverflowAli gnmentDefault); }
476 476
477 // align-content (aka -webkit-align-content) 477 // align-content (aka -webkit-align-content)
478 const StyleContentAlignmentData& alignContent() const { return m_rareNonInhe ritedData->m_alignContent; } 478 const StyleContentAlignmentData& alignContent() const { return m_rareNonInhe ritedData->m_alignContent; }
479 void setAlignContent(const StyleContentAlignmentData& data) { SET_VAR(m_rare NonInheritedData, m_alignContent, data); } 479 void setAlignContent(const StyleContentAlignmentData& data) { SET_VAR(m_rare NonInheritedData, m_alignContent, data); }
480 480
481 // justify-content (aka -webkit-justify-content) 481 // justify-content (aka -webkit-justify-content)
482 const StyleContentAlignmentData& justifyContent() const { return m_rareNonIn heritedData->m_justifyContent; } 482 const StyleContentAlignmentData& justifyContent() const { return m_rareNonIn heritedData->m_justifyContent; }
483 void setJustifyContent(const StyleContentAlignmentData& data) { SET_VAR(m_ra reNonInheritedData, m_justifyContent, data); } 483 void setJustifyContent(const StyleContentAlignmentData& data) { SET_VAR(m_ra reNonInheritedData, m_justifyContent, data); }
484 484
485 // Default-Alignment properties. 485 // Default-Alignment properties.
(...skipping 2126 matching lines...) Expand 10 before | Expand all | Expand 10 after
2612 } 2612 }
2613 2613
2614 inline bool ComputedStyle::hasPseudoElementStyle() const 2614 inline bool ComputedStyle::hasPseudoElementStyle() const
2615 { 2615 {
2616 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 2616 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
2617 } 2617 }
2618 2618
2619 } // namespace blink 2619 } // namespace blink
2620 2620
2621 #endif // ComputedStyle_h 2621 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698