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

Side by Side Diff: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.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) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
7 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 7 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
8 * Copyright (C) 2015 Google Inc. All rights reserved. 8 * Copyright (C) 2015 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 2777 matching lines...) Expand 10 before | Expand all | Expand 10 after
2788 case CSSPropertyTextTransform: 2788 case CSSPropertyTextTransform:
2789 return CSSIdentifierValue::create(style.textTransform()); 2789 return CSSIdentifierValue::create(style.textTransform());
2790 case CSSPropertyTop: 2790 case CSSPropertyTop:
2791 return valueForPositionOffset(style, CSSPropertyTop, layoutObject); 2791 return valueForPositionOffset(style, CSSPropertyTop, layoutObject);
2792 case CSSPropertyTouchAction: 2792 case CSSPropertyTouchAction:
2793 return touchActionFlagsToCSSValue(style.getTouchAction()); 2793 return touchActionFlagsToCSSValue(style.getTouchAction());
2794 case CSSPropertyUnicodeBidi: 2794 case CSSPropertyUnicodeBidi:
2795 return CSSIdentifierValue::create(style.unicodeBidi()); 2795 return CSSIdentifierValue::create(style.unicodeBidi());
2796 case CSSPropertyVerticalAlign: 2796 case CSSPropertyVerticalAlign:
2797 switch (style.verticalAlign()) { 2797 switch (style.verticalAlign()) {
2798 case VerticalAlignBaseline: 2798 case EVerticalAlign::Baseline:
2799 return CSSIdentifierValue::create(CSSValueBaseline); 2799 return CSSIdentifierValue::create(CSSValueBaseline);
2800 case VerticalAlignMiddle: 2800 case EVerticalAlign::Middle:
2801 return CSSIdentifierValue::create(CSSValueMiddle); 2801 return CSSIdentifierValue::create(CSSValueMiddle);
2802 case VerticalAlignSub: 2802 case EVerticalAlign::Sub:
2803 return CSSIdentifierValue::create(CSSValueSub); 2803 return CSSIdentifierValue::create(CSSValueSub);
2804 case VerticalAlignSuper: 2804 case EVerticalAlign::Super:
2805 return CSSIdentifierValue::create(CSSValueSuper); 2805 return CSSIdentifierValue::create(CSSValueSuper);
2806 case VerticalAlignTextTop: 2806 case EVerticalAlign::TextTop:
2807 return CSSIdentifierValue::create(CSSValueTextTop); 2807 return CSSIdentifierValue::create(CSSValueTextTop);
2808 case VerticalAlignTextBottom: 2808 case EVerticalAlign::TextBottom:
2809 return CSSIdentifierValue::create(CSSValueTextBottom); 2809 return CSSIdentifierValue::create(CSSValueTextBottom);
2810 case VerticalAlignTop: 2810 case EVerticalAlign::Top:
2811 return CSSIdentifierValue::create(CSSValueTop); 2811 return CSSIdentifierValue::create(CSSValueTop);
2812 case VerticalAlignBottom: 2812 case EVerticalAlign::Bottom:
2813 return CSSIdentifierValue::create(CSSValueBottom); 2813 return CSSIdentifierValue::create(CSSValueBottom);
2814 case VerticalAlignBaselineMiddle: 2814 case EVerticalAlign::BaselineMiddle:
2815 return CSSIdentifierValue::create(CSSValueWebkitBaselineMiddle); 2815 return CSSIdentifierValue::create(CSSValueWebkitBaselineMiddle);
2816 case VerticalAlignLength: 2816 case EVerticalAlign::Length:
2817 return zoomAdjustedPixelValueForLength(style.getVerticalAlignLength(), 2817 return zoomAdjustedPixelValueForLength(style.getVerticalAlignLength(),
2818 style); 2818 style);
2819 } 2819 }
2820 ASSERT_NOT_REACHED(); 2820 ASSERT_NOT_REACHED();
2821 return nullptr; 2821 return nullptr;
2822 case CSSPropertyVisibility: 2822 case CSSPropertyVisibility:
2823 return CSSIdentifierValue::create(style.visibility()); 2823 return CSSIdentifierValue::create(style.visibility());
2824 case CSSPropertyWhiteSpace: 2824 case CSSPropertyWhiteSpace:
2825 return CSSIdentifierValue::create(style.whiteSpace()); 2825 return CSSIdentifierValue::create(style.whiteSpace());
2826 case CSSPropertyWidows: 2826 case CSSPropertyWidows:
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
3645 case CSSPropertyAll: 3645 case CSSPropertyAll:
3646 return nullptr; 3646 return nullptr;
3647 default: 3647 default:
3648 break; 3648 break;
3649 } 3649 }
3650 ASSERT_NOT_REACHED(); 3650 ASSERT_NOT_REACHED();
3651 return nullptr; 3651 return nullptr;
3652 } 3652 }
3653 3653
3654 } // namespace blink 3654 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698