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

Side by Side Diff: Source/core/layout/LayoutObject.h

Issue 950623002: Store resolved color in AppliedTextDecoration (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: removed inherited_flags.m_textunderline Created 5 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 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
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 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 { 826 {
827 return style()->visitedDependentColor(colorProperty); 827 return style()->visitedDependentColor(colorProperty);
828 } 828 }
829 829
830 // Used only by Element::pseudoStyleCacheIsInvalid to get a first line style based off of a 830 // Used only by Element::pseudoStyleCacheIsInvalid to get a first line style based off of a
831 // given new style, without accessing the cache. 831 // given new style, without accessing the cache.
832 PassRefPtr<ComputedStyle> uncachedFirstLineStyle(ComputedStyle*) const; 832 PassRefPtr<ComputedStyle> uncachedFirstLineStyle(ComputedStyle*) const;
833 833
834 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const; 834 virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const;
835 835
836 struct AppliedTextDecoration {
837 Color color;
838 TextDecorationStyle style;
839 AppliedTextDecoration() : color(Color::transparent), style(TextDecoratio nStyleSolid) { }
840 };
841
842 void getTextDecorations(unsigned decorations, AppliedTextDecoration& underli ne, AppliedTextDecoration& overline, AppliedTextDecoration& linethrough, bool qu irksMode = false, bool firstlineStyle = false); 836 void getTextDecorations(unsigned decorations, AppliedTextDecoration& underli ne, AppliedTextDecoration& overline, AppliedTextDecoration& linethrough, bool qu irksMode = false, bool firstlineStyle = false);
843 837
844 // Return the LayoutBoxModelObject in the container chain which is responsib le for painting this object, or 0 838 // Return the LayoutBoxModelObject in the container chain which is responsib le for painting this object, or 0
845 // if painting is root-relative. This is the container that should be passed to the 'forPaintInvalidation' 839 // if painting is root-relative. This is the container that should be passed to the 'forPaintInvalidation'
846 // methods. 840 // methods.
847 const LayoutBoxModelObject* containerForPaintInvalidation() const; 841 const LayoutBoxModelObject* containerForPaintInvalidation() const;
848 const LayoutBoxModelObject* adjustCompositedContainerForSpecialAncestors(con st LayoutBoxModelObject* paintInvalidationContainer) const; 842 const LayoutBoxModelObject* adjustCompositedContainerForSpecialAncestors(con st LayoutBoxModelObject* paintInvalidationContainer) const;
849 bool isPaintInvalidationContainer() const; 843 bool isPaintInvalidationContainer() const;
850 844
851 LayoutRect computePaintInvalidationRect() 845 LayoutRect computePaintInvalidationRect()
(...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after
1649 void showTree(const blink::LayoutObject*); 1643 void showTree(const blink::LayoutObject*);
1650 void showLineTree(const blink::LayoutObject*); 1644 void showLineTree(const blink::LayoutObject*);
1651 void showLayoutTree(const blink::LayoutObject* object1); 1645 void showLayoutTree(const blink::LayoutObject* object1);
1652 // We don't make object2 an optional parameter so that showLayoutTree 1646 // We don't make object2 an optional parameter so that showLayoutTree
1653 // can be called from gdb easily. 1647 // can be called from gdb easily.
1654 void showLayoutTree(const blink::LayoutObject* object1, const blink::LayoutObjec t* object2); 1648 void showLayoutTree(const blink::LayoutObject* object1, const blink::LayoutObjec t* object2);
1655 1649
1656 #endif 1650 #endif
1657 1651
1658 #endif // LayoutObject_h 1652 #endif // LayoutObject_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698