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

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

Issue 2520873002: [css-ui] Add support for caret-color property (Closed)
Patch Set: Patch for landing applying suggested changes Created 4 years 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 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
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 2472 matching lines...) Expand 10 before | Expand all | Expand 10 after
2483 2483
2484 // -webkit-user-select 2484 // -webkit-user-select
2485 static EUserSelect initialUserSelect() { return SELECT_TEXT; } 2485 static EUserSelect initialUserSelect() { return SELECT_TEXT; }
2486 EUserSelect userSelect() const { 2486 EUserSelect userSelect() const {
2487 return static_cast<EUserSelect>(m_rareInheritedData->userSelect); 2487 return static_cast<EUserSelect>(m_rareInheritedData->userSelect);
2488 } 2488 }
2489 void setUserSelect(EUserSelect s) { 2489 void setUserSelect(EUserSelect s) {
2490 SET_VAR(m_rareInheritedData, userSelect, s); 2490 SET_VAR(m_rareInheritedData, userSelect, s);
2491 } 2491 }
2492 2492
2493 // caret-color
2494 void setCaretColor(const StyleAutoColor& c) {
2495 SET_VAR_WITH_SETTER(m_rareInheritedData, caretColor, setCaretColor, c);
2496 }
2497
2493 // Font properties. 2498 // Font properties.
2494 const Font& font() const; 2499 const Font& font() const;
2495 void setFont(const Font&); 2500 void setFont(const Font&);
2496 const FontDescription& getFontDescription() const; 2501 const FontDescription& getFontDescription() const;
2497 bool setFontDescription(const FontDescription&); 2502 bool setFontDescription(const FontDescription&);
2498 bool hasIdenticalAscentDescentAndLineGap(const ComputedStyle& other) const; 2503 bool hasIdenticalAscentDescentAndLineGap(const ComputedStyle& other) const;
2499 2504
2500 // font-size 2505 // font-size
2501 int fontSize() const; 2506 int fontSize() const;
2502 float specifiedFontSize() const; 2507 float specifiedFontSize() const;
(...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after
3865 setVisitedLinkTextEmphasisColor, v); 3870 setVisitedLinkTextEmphasisColor, v);
3866 } 3871 }
3867 void setVisitedLinkTextFillColor(const StyleColor& v) { 3872 void setVisitedLinkTextFillColor(const StyleColor& v) {
3868 SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkTextFillColor, 3873 SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkTextFillColor,
3869 setVisitedLinkTextFillColor, v); 3874 setVisitedLinkTextFillColor, v);
3870 } 3875 }
3871 void setVisitedLinkTextStrokeColor(const StyleColor& v) { 3876 void setVisitedLinkTextStrokeColor(const StyleColor& v) {
3872 SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkTextStrokeColor, 3877 SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkTextStrokeColor,
3873 setVisitedLinkTextStrokeColor, v); 3878 setVisitedLinkTextStrokeColor, v);
3874 } 3879 }
3880 void setVisitedLinkCaretColor(const StyleAutoColor& v) {
3881 SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkCaretColor,
3882 setVisitedLinkCaretColor, v);
3883 }
3875 3884
3876 void inheritUnicodeBidiFrom(const ComputedStyle& parent) { 3885 void inheritUnicodeBidiFrom(const ComputedStyle& parent) {
3877 m_nonInheritedData.m_unicodeBidi = parent.m_nonInheritedData.m_unicodeBidi; 3886 m_nonInheritedData.m_unicodeBidi = parent.m_nonInheritedData.m_unicodeBidi;
3878 } 3887 }
3879 3888
3880 static bool isDisplayFlexibleBox(EDisplay display) { 3889 static bool isDisplayFlexibleBox(EDisplay display) {
3881 return display == EDisplay::Flex || display == EDisplay::InlineFlex; 3890 return display == EDisplay::Flex || display == EDisplay::InlineFlex;
3882 } 3891 }
3883 3892
3884 static bool isDisplayGridBox(EDisplay display) { 3893 static bool isDisplayGridBox(EDisplay display) {
(...skipping 28 matching lines...) Expand all
3913 return m_surround->border.left().color(); 3922 return m_surround->border.left().color();
3914 } 3923 }
3915 StyleColor borderRightColor() const { 3924 StyleColor borderRightColor() const {
3916 return m_surround->border.right().color(); 3925 return m_surround->border.right().color();
3917 } 3926 }
3918 StyleColor borderTopColor() const { return m_surround->border.top().color(); } 3927 StyleColor borderTopColor() const { return m_surround->border.top().color(); }
3919 StyleColor borderBottomColor() const { 3928 StyleColor borderBottomColor() const {
3920 return m_surround->border.bottom().color(); 3929 return m_surround->border.bottom().color();
3921 } 3930 }
3922 StyleColor backgroundColor() const { return m_background->color(); } 3931 StyleColor backgroundColor() const { return m_background->color(); }
3932 StyleAutoColor caretColor() const {
3933 return m_rareInheritedData->caretColor();
3934 }
3923 Color color() const; 3935 Color color() const;
3924 StyleColor columnRuleColor() const { 3936 StyleColor columnRuleColor() const {
3925 return m_rareNonInheritedData->m_multiCol->m_rule.color(); 3937 return m_rareNonInheritedData->m_multiCol->m_rule.color();
3926 } 3938 }
3927 StyleColor outlineColor() const { 3939 StyleColor outlineColor() const {
3928 return m_rareNonInheritedData->m_outline.color(); 3940 return m_rareNonInheritedData->m_outline.color();
3929 } 3941 }
3930 StyleColor textEmphasisColor() const { 3942 StyleColor textEmphasisColor() const {
3931 return m_rareInheritedData->textEmphasisColor(); 3943 return m_rareInheritedData->textEmphasisColor();
3932 } 3944 }
3933 StyleColor textFillColor() const { 3945 StyleColor textFillColor() const {
3934 return m_rareInheritedData->textFillColor(); 3946 return m_rareInheritedData->textFillColor();
3935 } 3947 }
3936 StyleColor textStrokeColor() const { 3948 StyleColor textStrokeColor() const {
3937 return m_rareInheritedData->textStrokeColor(); 3949 return m_rareInheritedData->textStrokeColor();
3938 } 3950 }
3951 StyleAutoColor visitedLinkCaretColor() const {
3952 return m_rareInheritedData->visitedLinkCaretColor();
3953 }
3939 Color visitedLinkColor() const; 3954 Color visitedLinkColor() const;
3940 StyleColor visitedLinkBackgroundColor() const { 3955 StyleColor visitedLinkBackgroundColor() const {
3941 return m_rareNonInheritedData->m_visitedLinkBackgroundColor; 3956 return m_rareNonInheritedData->m_visitedLinkBackgroundColor;
3942 } 3957 }
3943 StyleColor visitedLinkBorderLeftColor() const { 3958 StyleColor visitedLinkBorderLeftColor() const {
3944 return m_rareNonInheritedData->m_visitedLinkBorderLeftColor; 3959 return m_rareNonInheritedData->m_visitedLinkBorderLeftColor;
3945 } 3960 }
3946 StyleColor visitedLinkBorderRightColor() const { 3961 StyleColor visitedLinkBorderRightColor() const {
3947 return m_rareNonInheritedData->m_visitedLinkBorderRightColor; 3962 return m_rareNonInheritedData->m_visitedLinkBorderRightColor;
3948 } 3963 }
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
4094 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 4109 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
4095 } 4110 }
4096 4111
4097 inline bool ComputedStyle::hasPseudoElementStyle() const { 4112 inline bool ComputedStyle::hasPseudoElementStyle() const {
4098 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 4113 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
4099 } 4114 }
4100 4115
4101 } // namespace blink 4116 } // namespace blink
4102 4117
4103 #endif // ComputedStyle_h 4118 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/UseCounter.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