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

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

Issue 2896783002: Remove dependency on order of enum EBorderStyle (Closed)
Patch Set: Merge branch and make it dependent on https://codereview.chromium.org/2895933004 Created 3 years, 7 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/layout/LayoutTableSection.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 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 3321 matching lines...) Expand 10 before | Expand all | Expand 10 after
3332 3332
3333 bool AutoWrap() const { return AutoWrap(WhiteSpace()); } 3333 bool AutoWrap() const { return AutoWrap(WhiteSpace()); }
3334 3334
3335 static bool PreserveNewline(EWhiteSpace ws) { 3335 static bool PreserveNewline(EWhiteSpace ws) {
3336 // Normal and nowrap do not preserve newlines. 3336 // Normal and nowrap do not preserve newlines.
3337 return ws != EWhiteSpace::kNormal && ws != EWhiteSpace::kNowrap; 3337 return ws != EWhiteSpace::kNormal && ws != EWhiteSpace::kNowrap;
3338 } 3338 }
3339 3339
3340 bool PreserveNewline() const { return PreserveNewline(WhiteSpace()); } 3340 bool PreserveNewline() const { return PreserveNewline(WhiteSpace()); }
3341 3341
3342 static bool BorderStyleIsVisible(EBorderStyle style) {
3343 return style != EBorderStyle::kNone && style != EBorderStyle::kHidden;
3344 }
3345
3342 static bool CollapseWhiteSpace(EWhiteSpace ws) { 3346 static bool CollapseWhiteSpace(EWhiteSpace ws) {
3343 // Pre and prewrap do not collapse whitespace. 3347 // Pre and prewrap do not collapse whitespace.
3344 return ws != EWhiteSpace::kPre && ws != EWhiteSpace::kPreWrap; 3348 return ws != EWhiteSpace::kPre && ws != EWhiteSpace::kPreWrap;
3345 } 3349 }
3346 3350
3347 bool CollapseWhiteSpace() const { return CollapseWhiteSpace(WhiteSpace()); } 3351 bool CollapseWhiteSpace() const { return CollapseWhiteSpace(WhiteSpace()); }
3348 3352
3349 bool IsCollapsibleWhiteSpace(UChar c) const { 3353 bool IsCollapsibleWhiteSpace(UChar c) const {
3350 switch (c) { 3354 switch (c) {
3351 case ' ': 3355 case ' ':
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
3774 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3778 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3775 } 3779 }
3776 3780
3777 inline bool ComputedStyle::HasPseudoElementStyle() const { 3781 inline bool ComputedStyle::HasPseudoElementStyle() const {
3778 return PseudoBitsInternal() & kElementPseudoIdMask; 3782 return PseudoBitsInternal() & kElementPseudoIdMask;
3779 } 3783 }
3780 3784
3781 } // namespace blink 3785 } // namespace blink
3782 3786
3783 #endif // ComputedStyle_h 3787 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTableSection.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698