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

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

Issue 2524903003: EDisplay enum class: Rename [Inline]Box to Webkit[Inline]Box. (Closed)
Patch Set: 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
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 3882 matching lines...) Expand 10 before | Expand all | Expand 10 after
3893 3893
3894 static bool isDisplayFlexibleBox(EDisplay display) { 3894 static bool isDisplayFlexibleBox(EDisplay display) {
3895 return display == EDisplay::Flex || display == EDisplay::InlineFlex; 3895 return display == EDisplay::Flex || display == EDisplay::InlineFlex;
3896 } 3896 }
3897 3897
3898 static bool isDisplayGridBox(EDisplay display) { 3898 static bool isDisplayGridBox(EDisplay display) {
3899 return display == EDisplay::Grid || display == EDisplay::InlineGrid; 3899 return display == EDisplay::Grid || display == EDisplay::InlineGrid;
3900 } 3900 }
3901 3901
3902 static bool isDisplayReplacedType(EDisplay display) { 3902 static bool isDisplayReplacedType(EDisplay display) {
3903 return display == EDisplay::InlineBlock || display == EDisplay::InlineBox || 3903 return display == EDisplay::InlineBlock ||
3904 display == EDisplay::WebkitInlineBox ||
3904 display == EDisplay::InlineFlex || 3905 display == EDisplay::InlineFlex ||
3905 display == EDisplay::InlineTable || display == EDisplay::InlineGrid; 3906 display == EDisplay::InlineTable || display == EDisplay::InlineGrid;
3906 } 3907 }
3907 3908
3908 static bool isDisplayInlineType(EDisplay display) { 3909 static bool isDisplayInlineType(EDisplay display) {
3909 return display == EDisplay::Inline || isDisplayReplacedType(display); 3910 return display == EDisplay::Inline || isDisplayReplacedType(display);
3910 } 3911 }
3911 3912
3912 static bool isDisplayTableType(EDisplay display) { 3913 static bool isDisplayTableType(EDisplay display) {
3913 return display == EDisplay::Table || display == EDisplay::InlineTable || 3914 return display == EDisplay::Table || display == EDisplay::InlineTable ||
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
4107 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 4108 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
4108 } 4109 }
4109 4110
4110 inline bool ComputedStyle::hasPseudoElementStyle() const { 4111 inline bool ComputedStyle::hasPseudoElementStyle() const {
4111 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 4112 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
4112 } 4113 }
4113 4114
4114 } // namespace blink 4115 } // namespace blink
4115 4116
4116 #endif // ComputedStyle_h 4117 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698