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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutMenuList.cpp

Issue 2555923002: Changed TextDirection to an enum class and renamed its members (Closed)
Patch Set: Rebase after reopen Created 3 years, 12 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 * This file is part of the select element layoutObject in WebCore. 2 * This file is part of the select element layoutObject in WebCore.
3 * 3 *
4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
5 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. 5 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * (C) 2009 Torch Mobile Inc. All rights reserved. 7 * (C) 2009 Torch Mobile Inc. All rights reserved.
8 * (http://www.torchmobile.com/) 8 * (http://www.torchmobile.com/)
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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 innerStyle.setMarginTop(Length()); 95 innerStyle.setMarginTop(Length());
96 innerStyle.setMarginBottom(Length()); 96 innerStyle.setMarginBottom(Length());
97 innerStyle.setAlignSelfPosition(ItemPositionFlexStart); 97 innerStyle.setAlignSelfPosition(ItemPositionFlexStart);
98 } 98 }
99 99
100 Length paddingStart = 100 Length paddingStart =
101 Length(LayoutTheme::theme().popupInternalPaddingStart(styleRef()), Fixed); 101 Length(LayoutTheme::theme().popupInternalPaddingStart(styleRef()), Fixed);
102 Length paddingEnd = Length(LayoutTheme::theme().popupInternalPaddingEnd( 102 Length paddingEnd = Length(LayoutTheme::theme().popupInternalPaddingEnd(
103 frameView()->getHostWindow(), styleRef()), 103 frameView()->getHostWindow(), styleRef()),
104 Fixed); 104 Fixed);
105 innerStyle.setPaddingLeft(styleRef().direction() == LTR ? paddingStart 105 innerStyle.setPaddingLeft(
106 : paddingEnd); 106 styleRef().direction() == TextDirection::Ltr ? paddingStart : paddingEnd);
107 innerStyle.setPaddingRight(styleRef().direction() == LTR ? paddingEnd 107 innerStyle.setPaddingRight(
108 : paddingStart); 108 styleRef().direction() == TextDirection::Ltr ? paddingEnd : paddingStart);
109 innerStyle.setPaddingTop( 109 innerStyle.setPaddingTop(
110 Length(LayoutTheme::theme().popupInternalPaddingTop(styleRef()), Fixed)); 110 Length(LayoutTheme::theme().popupInternalPaddingTop(styleRef()), Fixed));
111 innerStyle.setPaddingBottom(Length( 111 innerStyle.setPaddingBottom(Length(
112 LayoutTheme::theme().popupInternalPaddingBottom(styleRef()), Fixed)); 112 LayoutTheme::theme().popupInternalPaddingBottom(styleRef()), Fixed));
113 113
114 if (m_optionStyle) { 114 if (m_optionStyle) {
115 if ((m_optionStyle->direction() != innerStyle.direction() || 115 if ((m_optionStyle->direction() != innerStyle.direction() ||
116 m_optionStyle->unicodeBidi() != innerStyle.unicodeBidi())) 116 m_optionStyle->unicodeBidi() != innerStyle.unicodeBidi()))
117 m_innerBlock->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation( 117 m_innerBlock->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(
118 LayoutInvalidationReason::StyleChange); 118 LayoutInvalidationReason::StyleChange);
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 312
313 LayoutUnit LayoutMenuList::clientPaddingLeft() const { 313 LayoutUnit LayoutMenuList::clientPaddingLeft() const {
314 return paddingLeft() + m_innerBlock->paddingLeft(); 314 return paddingLeft() + m_innerBlock->paddingLeft();
315 } 315 }
316 316
317 LayoutUnit LayoutMenuList::clientPaddingRight() const { 317 LayoutUnit LayoutMenuList::clientPaddingRight() const {
318 return paddingRight() + m_innerBlock->paddingRight(); 318 return paddingRight() + m_innerBlock->paddingRight();
319 } 319 }
320 320
321 } // namespace blink 321 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698