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

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

Issue 2684833003: Disable display: contents in SVG. (Closed)
Patch Set: Make display: contents act as an inline when it has a layout box, and ignore display: contents in S… Created 3 years, 10 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 3691 matching lines...) Expand 10 before | Expand all | Expand 10 after
3702 } 3702 }
3703 3703
3704 static bool isDisplayReplacedType(EDisplay display) { 3704 static bool isDisplayReplacedType(EDisplay display) {
3705 return display == EDisplay::InlineBlock || 3705 return display == EDisplay::InlineBlock ||
3706 display == EDisplay::WebkitInlineBox || 3706 display == EDisplay::WebkitInlineBox ||
3707 display == EDisplay::InlineFlex || 3707 display == EDisplay::InlineFlex ||
3708 display == EDisplay::InlineTable || display == EDisplay::InlineGrid; 3708 display == EDisplay::InlineTable || display == EDisplay::InlineGrid;
3709 } 3709 }
3710 3710
3711 static bool isDisplayInlineType(EDisplay display) { 3711 static bool isDisplayInlineType(EDisplay display) {
3712 return display == EDisplay::Inline || isDisplayReplacedType(display); 3712 return display == EDisplay::Inline || display == EDisplay::Contents ||
3713 isDisplayReplacedType(display);
rune 2017/02/09 09:41:10 display:contents is neither an inline, nor block t
emilio 2017/02/09 11:49:37 Replaced content was ignored in that CL, but actua
3713 } 3714 }
3714 3715
3715 static bool isDisplayTableType(EDisplay display) { 3716 static bool isDisplayTableType(EDisplay display) {
3716 return display == EDisplay::Table || display == EDisplay::InlineTable || 3717 return display == EDisplay::Table || display == EDisplay::InlineTable ||
3717 display == EDisplay::TableRowGroup || 3718 display == EDisplay::TableRowGroup ||
3718 display == EDisplay::TableHeaderGroup || 3719 display == EDisplay::TableHeaderGroup ||
3719 display == EDisplay::TableFooterGroup || 3720 display == EDisplay::TableFooterGroup ||
3720 display == EDisplay::TableRow || 3721 display == EDisplay::TableRow ||
3721 display == EDisplay::TableColumnGroup || 3722 display == EDisplay::TableColumnGroup ||
3722 display == EDisplay::TableColumn || display == EDisplay::TableCell || 3723 display == EDisplay::TableColumn || display == EDisplay::TableCell ||
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
3916 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 3917 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
3917 } 3918 }
3918 3919
3919 inline bool ComputedStyle::hasPseudoElementStyle() const { 3920 inline bool ComputedStyle::hasPseudoElementStyle() const {
3920 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 3921 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
3921 } 3922 }
3922 3923
3923 } // namespace blink 3924 } // namespace blink
3924 3925
3925 #endif // ComputedStyle_h 3926 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.cpp ('k') | third_party/WebKit/Source/core/svg/SVGElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698