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

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

Issue 2667543002: Moved nonproperty 'unique' to be generated in ComputedStyleBase. (Closed)
Patch Set: Rebase onto master 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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 unsigned m_breakBefore : 4; // EBreak 266 unsigned m_breakBefore : 4; // EBreak
267 unsigned m_breakAfter : 4; // EBreak 267 unsigned m_breakAfter : 4; // EBreak
268 unsigned m_breakInside : 2; // EBreak 268 unsigned m_breakInside : 2; // EBreak
269 269
270 unsigned m_styleType : 6; // PseudoId 270 unsigned m_styleType : 6; // PseudoId
271 unsigned m_pseudoBits : 8; 271 unsigned m_pseudoBits : 8;
272 unsigned m_explicitInheritance : 1; // Explicitly inherits a non-inherited 272 unsigned m_explicitInheritance : 1; // Explicitly inherits a non-inherited
273 // property 273 // property
274 unsigned m_variableReference : 1; // A non-inherited property references a 274 unsigned m_variableReference : 1; // A non-inherited property references a
275 // variable or @apply is used. 275 // variable or @apply is used.
276 unsigned m_unique : 1; // Style can not be shared.
277 276
278 unsigned m_emptyState : 1; 277 unsigned m_emptyState : 1;
279 278
280 unsigned m_affectedByFocus : 1; 279 unsigned m_affectedByFocus : 1;
281 unsigned m_affectedByHover : 1; 280 unsigned m_affectedByHover : 1;
282 unsigned m_affectedByActive : 1; 281 unsigned m_affectedByActive : 1;
283 unsigned m_affectedByDrag : 1; 282 unsigned m_affectedByDrag : 1;
284 283
285 // 64 bits 284 // 64 bits
286 285
(...skipping 24 matching lines...) Expand all
311 m_nonInheritedData.m_position = initialPosition(); 310 m_nonInheritedData.m_position = initialPosition();
312 m_nonInheritedData.m_tableLayout = 311 m_nonInheritedData.m_tableLayout =
313 static_cast<unsigned>(initialTableLayout()); 312 static_cast<unsigned>(initialTableLayout());
314 m_nonInheritedData.m_breakBefore = initialBreakBefore(); 313 m_nonInheritedData.m_breakBefore = initialBreakBefore();
315 m_nonInheritedData.m_breakAfter = initialBreakAfter(); 314 m_nonInheritedData.m_breakAfter = initialBreakAfter();
316 m_nonInheritedData.m_breakInside = initialBreakInside(); 315 m_nonInheritedData.m_breakInside = initialBreakInside();
317 m_nonInheritedData.m_styleType = PseudoIdNone; 316 m_nonInheritedData.m_styleType = PseudoIdNone;
318 m_nonInheritedData.m_pseudoBits = 0; 317 m_nonInheritedData.m_pseudoBits = 0;
319 m_nonInheritedData.m_explicitInheritance = false; 318 m_nonInheritedData.m_explicitInheritance = false;
320 m_nonInheritedData.m_variableReference = false; 319 m_nonInheritedData.m_variableReference = false;
321 m_nonInheritedData.m_unique = false;
322 m_nonInheritedData.m_emptyState = false; 320 m_nonInheritedData.m_emptyState = false;
323 m_nonInheritedData.m_hasViewportUnits = false; 321 m_nonInheritedData.m_hasViewportUnits = false;
324 m_nonInheritedData.m_affectedByFocus = false; 322 m_nonInheritedData.m_affectedByFocus = false;
325 m_nonInheritedData.m_affectedByHover = false; 323 m_nonInheritedData.m_affectedByHover = false;
326 m_nonInheritedData.m_affectedByActive = false; 324 m_nonInheritedData.m_affectedByActive = false;
327 m_nonInheritedData.m_affectedByDrag = false; 325 m_nonInheritedData.m_affectedByDrag = false;
328 m_nonInheritedData.m_isLink = false; 326 m_nonInheritedData.m_isLink = false;
329 m_nonInheritedData.m_hasRemUnits = false; 327 m_nonInheritedData.m_hasRemUnits = false;
330 } 328 }
331 329
(...skipping 2279 matching lines...) Expand 10 before | Expand all | Expand 10 after
2611 // contexts below are painted. 2609 // contexts below are painted.
2612 // See CSS 2.1, Appendix E (https://www.w3.org/TR/CSS21/zindex.html) for more 2610 // See CSS 2.1, Appendix E (https://www.w3.org/TR/CSS21/zindex.html) for more
2613 // details. 2611 // details.
2614 bool isStackingContext() const { 2612 bool isStackingContext() const {
2615 return m_rareNonInheritedData->m_isStackingContext; 2613 return m_rareNonInheritedData->m_isStackingContext;
2616 } 2614 }
2617 void setIsStackingContext(bool b) { 2615 void setIsStackingContext(bool b) {
2618 SET_VAR(m_rareNonInheritedData, m_isStackingContext, b); 2616 SET_VAR(m_rareNonInheritedData, m_isStackingContext, b);
2619 } 2617 }
2620 2618
2621 // A unique style is one that has matches something that makes it impossible
2622 // to share.
2623 bool unique() const { return m_nonInheritedData.m_unique; }
2624 void setUnique() { m_nonInheritedData.m_unique = true; }
sashab 2017/02/03 04:53:06 Maybe just do one prework patch to change setUniqu
shend 2017/02/03 05:11:33 See the other comment :)
2625
2626 float textAutosizingMultiplier() const { 2619 float textAutosizingMultiplier() const {
2627 return m_styleInheritedData->textAutosizingMultiplier; 2620 return m_styleInheritedData->textAutosizingMultiplier;
2628 } 2621 }
2629 void setTextAutosizingMultiplier(float); 2622 void setTextAutosizingMultiplier(float);
2630 2623
2631 bool selfOrAncestorHasDirAutoAttribute() const { 2624 bool selfOrAncestorHasDirAutoAttribute() const {
2632 return m_rareInheritedData->m_selfOrAncestorHasDirAutoAttribute; 2625 return m_rareInheritedData->m_selfOrAncestorHasDirAutoAttribute;
2633 } 2626 }
2634 void setSelfOrAncestorHasDirAutoAttribute(bool v) { 2627 void setSelfOrAncestorHasDirAutoAttribute(bool v) {
2635 SET_VAR(m_rareInheritedData, m_selfOrAncestorHasDirAutoAttribute, v); 2628 SET_VAR(m_rareInheritedData, m_selfOrAncestorHasDirAutoAttribute, v);
(...skipping 1289 matching lines...) Expand 10 before | Expand all | Expand 10 after
3925 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 3918 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
3926 } 3919 }
3927 3920
3928 inline bool ComputedStyle::hasPseudoElementStyle() const { 3921 inline bool ComputedStyle::hasPseudoElementStyle() const {
3929 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 3922 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
3930 } 3923 }
3931 3924
3932 } // namespace blink 3925 } // namespace blink
3933 3926
3934 #endif // ComputedStyle_h 3927 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698