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

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

Issue 2567963002: Change ComputedStyle::setWritingMode() to return void instead of bool (Closed)
Patch Set: Rebase 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.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 2262 matching lines...) Expand 10 before | Expand all | Expand 10 after
2273 LineBreak getLineBreak() const { 2273 LineBreak getLineBreak() const {
2274 return static_cast<LineBreak>(m_rareInheritedData->lineBreak); 2274 return static_cast<LineBreak>(m_rareInheritedData->lineBreak);
2275 } 2275 }
2276 void setLineBreak(LineBreak b) { SET_VAR(m_rareInheritedData, lineBreak, b); } 2276 void setLineBreak(LineBreak b) { SET_VAR(m_rareInheritedData, lineBreak, b); }
2277 2277
2278 // writing-mode (aka -webkit-writing-mode, -epub-writing-mode) 2278 // writing-mode (aka -webkit-writing-mode, -epub-writing-mode)
2279 static WritingMode initialWritingMode() { return TopToBottomWritingMode; } 2279 static WritingMode initialWritingMode() { return TopToBottomWritingMode; }
2280 WritingMode getWritingMode() const { 2280 WritingMode getWritingMode() const {
2281 return static_cast<WritingMode>(m_inheritedData.m_writingMode); 2281 return static_cast<WritingMode>(m_inheritedData.m_writingMode);
2282 } 2282 }
2283 bool setWritingMode(WritingMode v) { 2283 void setWritingMode(WritingMode v) { m_inheritedData.m_writingMode = v; }
2284 if (v == getWritingMode())
2285 return false;
2286
2287 m_inheritedData.m_writingMode = v;
2288 return true;
2289 }
2290 2284
2291 // Text emphasis properties. 2285 // Text emphasis properties.
2292 static TextEmphasisFill initialTextEmphasisFill() { 2286 static TextEmphasisFill initialTextEmphasisFill() {
2293 return TextEmphasisFillFilled; 2287 return TextEmphasisFillFilled;
2294 } 2288 }
2295 static TextEmphasisMark initialTextEmphasisMark() { 2289 static TextEmphasisMark initialTextEmphasisMark() {
2296 return TextEmphasisMarkNone; 2290 return TextEmphasisMarkNone;
2297 } 2291 }
2298 static const AtomicString& initialTextEmphasisCustomMark() { 2292 static const AtomicString& initialTextEmphasisCustomMark() {
2299 return nullAtom; 2293 return nullAtom;
(...skipping 1767 matching lines...) Expand 10 before | Expand all | Expand 10 after
4067 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 4061 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
4068 } 4062 }
4069 4063
4070 inline bool ComputedStyle::hasPseudoElementStyle() const { 4064 inline bool ComputedStyle::hasPseudoElementStyle() const {
4071 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 4065 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
4072 } 4066 }
4073 4067
4074 } // namespace blink 4068 } // namespace blink
4075 4069
4076 #endif // ComputedStyle_h 4070 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698