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

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

Issue 1274263003: Revert of Delete AuthorStyleInfo and move its data into ComputedStyle.RareNonInheritedData. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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 | « Source/core/style/AuthorStyleInfo.h ('k') | Source/core/style/StyleRareNonInheritedData.h » ('j') | 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 r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1551 matching lines...) Expand 10 before | Expand all | Expand 10 after
1562 bool hasExplicitlyInheritedProperties() const { return noninherited_flags.ex plicitInheritance; } 1562 bool hasExplicitlyInheritedProperties() const { return noninherited_flags.ex plicitInheritance; }
1563 1563
1564 bool hasChildDependentFlags() const { return emptyState() || hasExplicitlyIn heritedProperties(); } 1564 bool hasChildDependentFlags() const { return emptyState() || hasExplicitlyIn heritedProperties(); }
1565 void copyChildDependentFlagsFrom(const ComputedStyle&); 1565 void copyChildDependentFlagsFrom(const ComputedStyle&);
1566 1566
1567 bool hasBoxDecorations() const { return hasBorderDecoration() || hasBorderRa dius() || hasOutline() || hasAppearance() || boxShadow() || hasFilter() || resiz e() != RESIZE_NONE; } 1567 bool hasBoxDecorations() const { return hasBorderDecoration() || hasBorderRa dius() || hasOutline() || hasAppearance() || boxShadow() || hasFilter() || resiz e() != RESIZE_NONE; }
1568 1568
1569 bool borderObscuresBackground() const; 1569 bool borderObscuresBackground() const;
1570 void getBorderEdgeInfo(BorderEdge edges[], bool includeLogicalLeftEdge = tru e, bool includeLogicalRightEdge = true) const; 1570 void getBorderEdgeInfo(BorderEdge edges[], bool includeLogicalLeftEdge = tru e, bool includeLogicalRightEdge = true) const;
1571 1571
1572 void setHasAuthorBackground(bool authorBackground) { SET_VAR(rareNonInherite dData, m_hasAuthorBackground, authorBackground); }
1573 void setHasAuthorBorder(bool authorBorder) { SET_VAR(rareNonInheritedData, m _hasAuthorBorder, authorBorder); }
1574 bool hasAuthorBackground() const { return rareNonInheritedData->m_hasAuthorB ackground; };
1575 bool hasAuthorBorder() const { return rareNonInheritedData->m_hasAuthorBorde r; };
1576
1577 // Initial values for all the properties 1572 // Initial values for all the properties
1578 static EBorderCollapse initialBorderCollapse() { return BSEPARATE; } 1573 static EBorderCollapse initialBorderCollapse() { return BSEPARATE; }
1579 static EBorderStyle initialBorderStyle() { return BNONE; } 1574 static EBorderStyle initialBorderStyle() { return BNONE; }
1580 static OutlineIsAuto initialOutlineStyleIsAuto() { return AUTO_OFF; } 1575 static OutlineIsAuto initialOutlineStyleIsAuto() { return AUTO_OFF; }
1581 static NinePieceImage initialNinePieceImage() { return NinePieceImage(); } 1576 static NinePieceImage initialNinePieceImage() { return NinePieceImage(); }
1582 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); } 1577 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); }
1583 static ECaptionSide initialCaptionSide() { return CAPTOP; } 1578 static ECaptionSide initialCaptionSide() { return CAPTOP; }
1584 static EClear initialClear() { return CNONE; } 1579 static EClear initialClear() { return CNONE; }
1585 static LengthBox initialClip() { return LengthBox(); } 1580 static LengthBox initialClip() { return LengthBox(); }
1586 static TextDirection initialDirection() { return LTR; } 1581 static TextDirection initialDirection() { return LTR; }
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
1951 } 1946 }
1952 1947
1953 inline bool ComputedStyle::hasPseudoElementStyle() const 1948 inline bool ComputedStyle::hasPseudoElementStyle() const
1954 { 1949 {
1955 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1950 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1956 } 1951 }
1957 1952
1958 } // namespace blink 1953 } // namespace blink
1959 1954
1960 #endif // ComputedStyle_h 1955 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « Source/core/style/AuthorStyleInfo.h ('k') | Source/core/style/StyleRareNonInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698