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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

Issue 2850173003: Move LengthSizes border-*-radius out of BorderData (Closed)
Patch Set: Created 3 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 1938 matching lines...) Expand 10 before | Expand all | Expand 10 after
1949 new_fill.SetRepeatX(kNoRepeatFill); 1949 new_fill.SetRepeatX(kNoRepeatFill);
1950 new_fill.SetRepeatY(kNoRepeatFill); 1950 new_fill.SetRepeatY(kNoRepeatFill);
1951 1951
1952 return (old_fill != new_fill || cached_ua_style->background_color != 1952 return (old_fill != new_fill || cached_ua_style->background_color !=
1953 state.Style()->BackgroundColor()); 1953 state.Style()->BackgroundColor());
1954 } 1954 }
1955 1955
1956 bool StyleResolver::HasAuthorBorder(const StyleResolverState& state) { 1956 bool StyleResolver::HasAuthorBorder(const StyleResolverState& state) {
1957 const CachedUAStyle* cached_ua_style = state.GetCachedUAStyle(); 1957 const CachedUAStyle* cached_ua_style = state.GetCachedUAStyle();
1958 return cached_ua_style && 1958 return cached_ua_style &&
1959 (cached_ua_style->border != state.Style()->Border()); 1959 (cached_ua_style->border != state.Style()->Border() &&
1960 !(cached_ua_style->top_left_ ==
shend 2017/05/02 00:01:45 Hmm, should this be !(top_left == TopLeft && top_r
nainar 2017/05/02 00:42:33 The != operator doesnt exist could make one but ..
nainar 2017/05/02 00:49:52 wait you were right. Done.
1961 state.Style()->BorderTopLeftRadius() ||
1962 cached_ua_style->top_right_ ==
1963 state.Style()->BorderTopRightRadius() ||
1964 cached_ua_style->bottom_left_ ==
1965 state.Style()->BorderBottomLeftRadius() ||
1966 cached_ua_style->bottom_right_ ==
1967 state.Style()->BorderBottomRightRadius()));
1960 } 1968 }
1961 1969
1962 void StyleResolver::ApplyCallbackSelectors(StyleResolverState& state) { 1970 void StyleResolver::ApplyCallbackSelectors(StyleResolverState& state) {
1963 RuleSet* watched_selectors_rule_set = 1971 RuleSet* watched_selectors_rule_set =
1964 GetDocument().GetStyleEngine().WatchedSelectorsRuleSet(); 1972 GetDocument().GetStyleEngine().WatchedSelectorsRuleSet();
1965 if (!watched_selectors_rule_set) 1973 if (!watched_selectors_rule_set)
1966 return; 1974 return;
1967 1975
1968 ElementRuleCollector collector(state.ElementContext(), selector_filter_, 1976 ElementRuleCollector collector(state.ElementContext(), selector_filter_,
1969 state.Style()); 1977 state.Style());
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
2017 2025
2018 DEFINE_TRACE(StyleResolver) { 2026 DEFINE_TRACE(StyleResolver) {
2019 visitor->Trace(matched_properties_cache_); 2027 visitor->Trace(matched_properties_cache_);
2020 visitor->Trace(selector_filter_); 2028 visitor->Trace(selector_filter_);
2021 visitor->Trace(style_sharing_lists_); 2029 visitor->Trace(style_sharing_lists_);
2022 visitor->Trace(document_); 2030 visitor->Trace(document_);
2023 visitor->Trace(tracker_); 2031 visitor->Trace(tracker_);
2024 } 2032 }
2025 2033
2026 } // namespace blink 2034 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSProperties.json5 ('k') | third_party/WebKit/Source/core/layout/LayoutBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698