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

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

Issue 2861773004: Move border-*-width out of BorderValue and store on SurroundData in ComputedStyle instead (Closed)
Patch Set: Change border-*-width from a float to unsigned 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 1946 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_ == 1960 !(cached_ua_style->top_left_ ==
1961 state.Style()->BorderTopLeftRadius() && 1961 state.Style()->BorderTopLeftRadius() &&
1962 cached_ua_style->top_right_ == 1962 cached_ua_style->top_right_ ==
1963 state.Style()->BorderTopRightRadius() && 1963 state.Style()->BorderTopRightRadius() &&
1964 cached_ua_style->bottom_left_ == 1964 cached_ua_style->bottom_left_ ==
1965 state.Style()->BorderBottomLeftRadius() && 1965 state.Style()->BorderBottomLeftRadius() &&
1966 cached_ua_style->bottom_right_ == 1966 cached_ua_style->bottom_right_ ==
1967 state.Style()->BorderBottomRightRadius())); 1967 state.Style()->BorderBottomRightRadius()) ||
1968 (cached_ua_style->border_left_width !=
shend 2017/05/07 23:08:30 nit: I would move this up to just after line 1959,
nainar 2017/05/08 00:59:57 Done.
1969 state.Style()->BorderLeftWidth() ||
1970 cached_ua_style->border_right_width !=
1971 state.Style()->BorderRightWidth() ||
1972 cached_ua_style->border_top_width !=
1973 state.Style()->BorderTopWidth() ||
1974 cached_ua_style->border_bottom_width !=
1975 state.Style()->BorderBottomWidth()));
1968 } 1976 }
1969 1977
1970 void StyleResolver::ApplyCallbackSelectors(StyleResolverState& state) { 1978 void StyleResolver::ApplyCallbackSelectors(StyleResolverState& state) {
1971 RuleSet* watched_selectors_rule_set = 1979 RuleSet* watched_selectors_rule_set =
1972 GetDocument().GetStyleEngine().WatchedSelectorsRuleSet(); 1980 GetDocument().GetStyleEngine().WatchedSelectorsRuleSet();
1973 if (!watched_selectors_rule_set) 1981 if (!watched_selectors_rule_set)
1974 return; 1982 return;
1975 1983
1976 ElementRuleCollector collector(state.ElementContext(), selector_filter_, 1984 ElementRuleCollector collector(state.ElementContext(), selector_filter_,
1977 state.Style()); 1985 state.Style());
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
2025 2033
2026 DEFINE_TRACE(StyleResolver) { 2034 DEFINE_TRACE(StyleResolver) {
2027 visitor->Trace(matched_properties_cache_); 2035 visitor->Trace(matched_properties_cache_);
2028 visitor->Trace(selector_filter_); 2036 visitor->Trace(selector_filter_);
2029 visitor->Trace(style_sharing_lists_); 2037 visitor->Trace(style_sharing_lists_);
2030 visitor->Trace(document_); 2038 visitor->Trace(document_);
2031 visitor->Trace(tracker_); 2039 visitor->Trace(tracker_);
2032 } 2040 }
2033 2041
2034 } // namespace blink 2042 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698