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

Side by Side Diff: Source/core/rendering/style/RenderStyle.h

Issue 280503003: Fix incorrect style recalculation of text-decoration properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address review issues. Created 6 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
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 1494 matching lines...) Expand 10 before | Expand all | Expand 10 after
1505 1505
1506 bool isSharable() const; 1506 bool isSharable() const;
1507 1507
1508 bool emptyState() const { return noninherited_flags.emptyState; } 1508 bool emptyState() const { return noninherited_flags.emptyState; }
1509 void setEmptyState(bool b) { setUnique(); noninherited_flags.emptyState = b; } 1509 void setEmptyState(bool b) { setUnique(); noninherited_flags.emptyState = b; }
1510 bool firstChildState() const { return noninherited_flags.firstChildState; } 1510 bool firstChildState() const { return noninherited_flags.firstChildState; }
1511 void setFirstChildState() { setUnique(); noninherited_flags.firstChildState = true; } 1511 void setFirstChildState() { setUnique(); noninherited_flags.firstChildState = true; }
1512 bool lastChildState() const { return noninherited_flags.lastChildState; } 1512 bool lastChildState() const { return noninherited_flags.lastChildState; }
1513 void setLastChildState() { setUnique(); noninherited_flags.lastChildState = true; } 1513 void setLastChildState() { setUnique(); noninherited_flags.lastChildState = true; }
1514 1514
1515 StyleColor visitedDependentDecorationColor() const; 1515 StyleColor visitedDependentDecorationStyleColor() const;
1516 Color visitedDependentDecorationColor() const;
1516 Color visitedDependentColor(int colorProperty) const; 1517 Color visitedDependentColor(int colorProperty) const;
1517 1518
1518 void setHasExplicitlyInheritedProperties() { noninherited_flags.explicitInhe ritance = true; } 1519 void setHasExplicitlyInheritedProperties() { noninherited_flags.explicitInhe ritance = true; }
1519 bool hasExplicitlyInheritedProperties() const { return noninherited_flags.ex plicitInheritance; } 1520 bool hasExplicitlyInheritedProperties() const { return noninherited_flags.ex plicitInheritance; }
1520 1521
1521 void setHasCurrentColor() { noninherited_flags.currentColor = true; } 1522 void setHasCurrentColor() { noninherited_flags.currentColor = true; }
1522 bool hasCurrentColor() const { return noninherited_flags.currentColor; } 1523 bool hasCurrentColor() const { return noninherited_flags.currentColor; }
1523 1524
1524 // Initial values for all the properties 1525 // Initial values for all the properties
1525 static EBorderCollapse initialBorderCollapse() { return BSEPARATE; } 1526 static EBorderCollapse initialBorderCollapse() { return BSEPARATE; }
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
1876 inline bool RenderStyle::hasPseudoElementStyle() const 1877 inline bool RenderStyle::hasPseudoElementStyle() const
1877 { 1878 {
1878 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; 1879 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;
1879 } 1880 }
1880 1881
1881 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1882 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1882 1883
1883 } // namespace WebCore 1884 } // namespace WebCore
1884 1885
1885 #endif // RenderStyle_h 1886 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/AppliedTextDecoration.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698