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

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

Issue 2704343003: Catch up the spec update in CSS Rhythmic Sizing (Closed)
Patch Set: Sorted CSSProperties.json5 alphabetically (meade@'s nit) Created 3 years, 9 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, 2011 Apple Inc. All 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.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 1924 matching lines...) Expand 10 before | Expand all | Expand 10 after
1935 } 1935 }
1936 void setOverflowWrap(EOverflowWrap b) { 1936 void setOverflowWrap(EOverflowWrap b) {
1937 SET_VAR(m_rareInheritedData, overflowWrap, b); 1937 SET_VAR(m_rareInheritedData, overflowWrap, b);
1938 } 1938 }
1939 1939
1940 // quotes 1940 // quotes
1941 static QuotesData* initialQuotes() { return 0; } 1941 static QuotesData* initialQuotes() { return 0; }
1942 QuotesData* quotes() const { return m_rareInheritedData->quotes.get(); } 1942 QuotesData* quotes() const { return m_rareInheritedData->quotes.get(); }
1943 void setQuotes(PassRefPtr<QuotesData>); 1943 void setQuotes(PassRefPtr<QuotesData>);
1944 1944
1945 // snap-height 1945 // line-height-step
1946 uint8_t snapHeightPosition() const { 1946 static uint8_t initialLineHeightStep() { return 0; }
1947 return m_rareInheritedData->m_snapHeightPosition; 1947 uint8_t lineHeightStep() const {
1948 return m_rareInheritedData->m_lineHeightStep;
1948 } 1949 }
1949 uint8_t snapHeightUnit() const { 1950 void setLineHeightStep(uint8_t unit) {
1950 return m_rareInheritedData->m_snapHeightUnit; 1951 SET_VAR(m_rareInheritedData, m_lineHeightStep, unit);
1951 }
1952 void setSnapHeightPosition(uint8_t position) {
1953 SET_VAR(m_rareInheritedData, m_snapHeightPosition, position);
1954 }
1955 void setSnapHeightUnit(uint8_t unit) {
1956 SET_VAR(m_rareInheritedData, m_snapHeightUnit, unit);
1957 } 1952 }
1958 1953
1959 // speak 1954 // speak
1960 static ESpeak initialSpeak() { return SpeakNormal; } 1955 static ESpeak initialSpeak() { return SpeakNormal; }
1961 ESpeak speak() const { 1956 ESpeak speak() const {
1962 return static_cast<ESpeak>(m_rareInheritedData->speak); 1957 return static_cast<ESpeak>(m_rareInheritedData->speak);
1963 } 1958 }
1964 void setSpeak(ESpeak s) { SET_VAR(m_rareInheritedData, speak, s); } 1959 void setSpeak(ESpeak s) { SET_VAR(m_rareInheritedData, speak, s); }
1965 1960
1966 // tab-size 1961 // tab-size
(...skipping 1838 matching lines...) Expand 10 before | Expand all | Expand 10 after
3805 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 3800 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
3806 } 3801 }
3807 3802
3808 inline bool ComputedStyle::hasPseudoElementStyle() const { 3803 inline bool ComputedStyle::hasPseudoElementStyle() const {
3809 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 3804 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
3810 } 3805 }
3811 3806
3812 } // namespace blink 3807 } // namespace blink
3813 3808
3814 #endif // ComputedStyle_h 3809 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698