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

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

Issue 2578403002: Changed EVerticalAlign to an enum class and renamed its members (Closed)
Patch Set: 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) 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 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 527
528 state.style()->setTextIndent(lengthOrPercentageValue); 528 state.style()->setTextIndent(lengthOrPercentageValue);
529 state.style()->setTextIndentLine(textIndentLineValue); 529 state.style()->setTextIndentLine(textIndentLineValue);
530 state.style()->setTextIndentType(textIndentTypeValue); 530 state.style()->setTextIndentType(textIndentTypeValue);
531 } 531 }
532 532
533 void StyleBuilderFunctions::applyInheritCSSPropertyVerticalAlign( 533 void StyleBuilderFunctions::applyInheritCSSPropertyVerticalAlign(
534 StyleResolverState& state) { 534 StyleResolverState& state) {
535 EVerticalAlign verticalAlign = state.parentStyle()->verticalAlign(); 535 EVerticalAlign verticalAlign = state.parentStyle()->verticalAlign();
536 state.style()->setVerticalAlign(verticalAlign); 536 state.style()->setVerticalAlign(verticalAlign);
537 if (verticalAlign == VerticalAlignLength) 537 if (verticalAlign == EVerticalAlign::Length)
538 state.style()->setVerticalAlignLength( 538 state.style()->setVerticalAlignLength(
539 state.parentStyle()->getVerticalAlignLength()); 539 state.parentStyle()->getVerticalAlignLength());
540 } 540 }
541 541
542 void StyleBuilderFunctions::applyValueCSSPropertyVerticalAlign( 542 void StyleBuilderFunctions::applyValueCSSPropertyVerticalAlign(
543 StyleResolverState& state, 543 StyleResolverState& state,
544 const CSSValue& value) { 544 const CSSValue& value) {
545 if (value.isIdentifierValue()) { 545 if (value.isIdentifierValue()) {
546 state.style()->setVerticalAlign( 546 state.style()->setVerticalAlign(
547 toCSSIdentifierValue(value).convertTo<EVerticalAlign>()); 547 toCSSIdentifierValue(value).convertTo<EVerticalAlign>());
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 state.style()->setCaretColor( 1033 state.style()->setCaretColor(
1034 StyleBuilderConverter::convertStyleAutoColor(state, value)); 1034 StyleBuilderConverter::convertStyleAutoColor(state, value));
1035 } 1035 }
1036 if (state.applyPropertyToVisitedLinkStyle()) { 1036 if (state.applyPropertyToVisitedLinkStyle()) {
1037 state.style()->setVisitedLinkCaretColor( 1037 state.style()->setVisitedLinkCaretColor(
1038 StyleBuilderConverter::convertStyleAutoColor(state, value, true)); 1038 StyleBuilderConverter::convertStyleAutoColor(state, value, true));
1039 } 1039 }
1040 } 1040 }
1041 1041
1042 } // namespace blink 1042 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698