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

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

Issue 2880573002: Store border-*-style on SurroundData in ComputedStyle (Closed)
Patch Set: Merge branch 'enumClass' into borderStyle 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 8 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
9 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 9 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
10 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 10 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 StyleResolverState& state, 295 StyleResolverState& state,
296 const CSSValue& value) { 296 const CSSValue& value) {
297 state.Style()->SetListStyleImage( 297 state.Style()->SetListStyleImage(
298 state.GetStyleImage(CSSPropertyListStyleImage, value)); 298 state.GetStyleImage(CSSPropertyListStyleImage, value));
299 } 299 }
300 300
301 void StyleBuilderFunctions::applyInitialCSSPropertyOutlineStyle( 301 void StyleBuilderFunctions::applyInitialCSSPropertyOutlineStyle(
302 StyleResolverState& state) { 302 StyleResolverState& state) {
303 state.Style()->SetOutlineStyleIsAuto( 303 state.Style()->SetOutlineStyleIsAuto(
304 ComputedStyle::InitialOutlineStyleIsAuto()); 304 ComputedStyle::InitialOutlineStyleIsAuto());
305 state.Style()->SetOutlineStyle(ComputedStyle::InitialBorderStyle()); 305 state.Style()->SetOutlineStyle(EBorderStyle::kNone);
306 } 306 }
307 307
308 void StyleBuilderFunctions::applyInheritCSSPropertyOutlineStyle( 308 void StyleBuilderFunctions::applyInheritCSSPropertyOutlineStyle(
309 StyleResolverState& state) { 309 StyleResolverState& state) {
310 state.Style()->SetOutlineStyleIsAuto( 310 state.Style()->SetOutlineStyleIsAuto(
311 state.ParentStyle()->OutlineStyleIsAuto()); 311 state.ParentStyle()->OutlineStyleIsAuto());
312 state.Style()->SetOutlineStyle(state.ParentStyle()->OutlineStyle()); 312 state.Style()->SetOutlineStyle(state.ParentStyle()->OutlineStyle());
313 } 313 }
314 314
315 void StyleBuilderFunctions::applyValueCSSPropertyOutlineStyle( 315 void StyleBuilderFunctions::applyValueCSSPropertyOutlineStyle(
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
987 state.Style()->SetCaretColor( 987 state.Style()->SetCaretColor(
988 StyleBuilderConverter::ConvertStyleAutoColor(state, value)); 988 StyleBuilderConverter::ConvertStyleAutoColor(state, value));
989 } 989 }
990 if (state.ApplyPropertyToVisitedLinkStyle()) { 990 if (state.ApplyPropertyToVisitedLinkStyle()) {
991 state.Style()->SetVisitedLinkCaretColor( 991 state.Style()->SetVisitedLinkCaretColor(
992 StyleBuilderConverter::ConvertStyleAutoColor(state, value, true)); 992 StyleBuilderConverter::ConvertStyleAutoColor(state, value, true));
993 } 993 }
994 } 994 }
995 995
996 } // namespace blink 996 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSProperties.json5 ('k') | third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698