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

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

Issue 2227003002: CSS: animated text-decoration-line overrides inline style (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: StyleAdjuster uses parent appliedTextDecorations Created 4 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 | « third_party/WebKit/Source/core/style/ComputedStyle.h ('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) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 1550 matching lines...) Expand 10 before | Expand all | Expand 10 after
1561 } 1561 }
1562 1562
1563 void ComputedStyle::clearAppliedTextDecorations() 1563 void ComputedStyle::clearAppliedTextDecorations()
1564 { 1564 {
1565 m_inheritedData.m_textUnderline = false; 1565 m_inheritedData.m_textUnderline = false;
1566 1566
1567 if (m_rareInheritedData->appliedTextDecorations) 1567 if (m_rareInheritedData->appliedTextDecorations)
1568 m_rareInheritedData.access()->appliedTextDecorations = nullptr; 1568 m_rareInheritedData.access()->appliedTextDecorations = nullptr;
1569 } 1569 }
1570 1570
1571 void ComputedStyle::restoreParentTextDecorations(const ComputedStyle& parentStyl e)
1572 {
1573 m_inheritedData.m_textUnderline = parentStyle.m_inheritedData.m_textUnderlin e;
1574 if (m_rareInheritedData->appliedTextDecorations != parentStyle.m_rareInherit edData->appliedTextDecorations)
1575 m_rareInheritedData.access()->appliedTextDecorations = parentStyle.m_rar eInheritedData->appliedTextDecorations;
1576 }
1577
1571 void ComputedStyle::clearMultiCol() 1578 void ComputedStyle::clearMultiCol()
1572 { 1579 {
1573 m_rareNonInheritedData.access()->m_multiCol = nullptr; 1580 m_rareNonInheritedData.access()->m_multiCol = nullptr;
1574 m_rareNonInheritedData.access()->m_multiCol.init(); 1581 m_rareNonInheritedData.access()->m_multiCol.init();
1575 } 1582 }
1576 1583
1577 StyleColor ComputedStyle::decorationColorIncludingFallback(bool visitedLink) con st 1584 StyleColor ComputedStyle::decorationColorIncludingFallback(bool visitedLink) con st
1578 { 1585 {
1579 StyleColor styleColor = visitedLink ? visitedLinkTextDecorationColor() : tex tDecorationColor(); 1586 StyleColor styleColor = visitedLink ? visitedLinkTextDecorationColor() : tex tDecorationColor();
1580 1587
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
1992 if (value < 0) 1999 if (value < 0)
1993 fvalue -= 0.5f; 2000 fvalue -= 0.5f;
1994 else 2001 else
1995 fvalue += 0.5f; 2002 fvalue += 0.5f;
1996 } 2003 }
1997 2004
1998 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2005 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
1999 } 2006 }
2000 2007
2001 } // namespace blink 2008 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698