Source/core/rendering/RenderRubyBase.cpp - Issue 254803009: expansionOpportunityCount should be 'unsigned' rather than 'int'

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Source/core/rendering/RenderRubyBase.cpp

Issue 254803009: expansionOpportunityCount should be 'unsigned' rather than 'int' (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 8 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

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009 Google Inc. All rights reserved.	2 * Copyright (C) 2009 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 117 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
128 }	128 }

129 // Move all remaining children normally.	129 // Move all remaining children normally.

130 moveChildrenTo(toBase, firstChild(), beforeChild);	130 moveChildrenTo(toBase, firstChild(), beforeChild);

131 }	131 }

132	132

133 ETextAlign RenderRubyBase::textAlignmentForLine(bool /* endsWithSoftBreak */) co nst	133 ETextAlign RenderRubyBase::textAlignmentForLine(bool /* endsWithSoftBreak */) co nst

134 {	134 {

135 return JUSTIFY;	135 return JUSTIFY;

136 }	136 }

137	137

138 void RenderRubyBase::adjustInlineDirectionLineBounds(int expansionOpportunityCou nt, float& logicalLeft, float& logicalWidth) const	138 void RenderRubyBase::adjustInlineDirectionLineBounds(unsigned expansionOpportuni tyCount, float& logicalLeft, float& logicalWidth) const

139 {	139 {

140 int maxPreferredLogicalWidth = this->maxPreferredLogicalWidth();	140 int maxPreferredLogicalWidth = this->maxPreferredLogicalWidth();

141 if (maxPreferredLogicalWidth >= logicalWidth)	141 if (maxPreferredLogicalWidth >= logicalWidth)

142 return;	142 return;

143	143

144 // Inset the ruby base by half the inter-ideograph expansion amount.	144 // Inset the ruby base by half the inter-ideograph expansion amount.

145 float inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpportun ityCount + 1);	145 float inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpportun ityCount + 1);

146	146

147 logicalLeft += inset / 2;	147 logicalLeft += inset / 2;

148 logicalWidth -= inset;	148 logicalWidth -= inset;

149 }	149 }

150	150

151 } // namespace WebCore	151 } // namespace WebCore

OLD	NEW

« no previous file with comments | « Source/core/rendering/RenderRubyBase.h ('k') | Source/core/rendering/RenderRubyText.h » ('j') | no next file with comments »