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

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

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
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 2191 matching lines...) Expand 10 before | Expand all | Expand 10 after
2202 2202
2203 // Cursor utility functions. 2203 // Cursor utility functions.
2204 CursorList* cursors() const { return m_rareInheritedData->cursorData.get(); } 2204 CursorList* cursors() const { return m_rareInheritedData->cursorData.get(); }
2205 void addCursor(StyleImage*, bool hotSpotSpecified, const IntPoint& hotSpot = IntPoint()); 2205 void addCursor(StyleImage*, bool hotSpotSpecified, const IntPoint& hotSpot = IntPoint());
2206 void setCursorList(CursorList*); 2206 void setCursorList(CursorList*);
2207 void clearCursorList(); 2207 void clearCursorList();
2208 2208
2209 // Text decoration utility functions. 2209 // Text decoration utility functions.
2210 void applyTextDecorations(); 2210 void applyTextDecorations();
2211 void clearAppliedTextDecorations(); 2211 void clearAppliedTextDecorations();
2212 void restoreParentTextDecorations(const ComputedStyle& parentStyle);
2212 const Vector<AppliedTextDecoration>& appliedTextDecorations() const; 2213 const Vector<AppliedTextDecoration>& appliedTextDecorations() const;
2213 TextDecoration textDecorationsInEffect() const; 2214 TextDecoration textDecorationsInEffect() const;
2214 2215
2215 // Overflow utility functions. 2216 // Overflow utility functions.
2216 2217
2217 // It's sufficient to just check one direction, since it's illegal to have v isible on only one overflow value. 2218 // It's sufficient to just check one direction, since it's illegal to have v isible on only one overflow value.
2218 bool isOverflowVisible() const { DCHECK(overflowX() != OverflowVisible || ov erflowX() == overflowY()); return overflowX() == OverflowVisible; } 2219 bool isOverflowVisible() const { DCHECK(overflowX() != OverflowVisible || ov erflowX() == overflowY()); return overflowX() == OverflowVisible; }
2219 bool isOverflowPaged() const { return overflowY() == OverflowPagedX || overf lowY() == OverflowPagedY; } 2220 bool isOverflowPaged() const { return overflowY() == OverflowPagedX || overf lowY() == OverflowPagedY; }
2220 2221
2221 // Animation utility functions. 2222 // Animation utility functions.
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
2602 } 2603 }
2603 2604
2604 inline bool ComputedStyle::hasPseudoElementStyle() const 2605 inline bool ComputedStyle::hasPseudoElementStyle() const
2605 { 2606 {
2606 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 2607 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
2607 } 2608 }
2608 2609
2609 } // namespace blink 2610 } // namespace blink
2610 2611
2611 #endif // ComputedStyle_h 2612 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698