| 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 moveChildrenTo(toBase, firstChild(), beforeChild); | 127 moveChildrenTo(toBase, firstChild(), beforeChild); |
| 128 } | 128 } |
| 129 | 129 |
| 130 ETextAlign LayoutRubyBase::textAlignmentForLine(bool /* endsWithSoftBreak */) co
nst | 130 ETextAlign LayoutRubyBase::textAlignmentForLine(bool /* endsWithSoftBreak */) co
nst |
| 131 { | 131 { |
| 132 return JUSTIFY; | 132 return JUSTIFY; |
| 133 } | 133 } |
| 134 | 134 |
| 135 void LayoutRubyBase::adjustInlineDirectionLineBounds(unsigned expansionOpportuni
tyCount, LayoutUnit& logicalLeft, LayoutUnit& logicalWidth) const | 135 void LayoutRubyBase::adjustInlineDirectionLineBounds(unsigned expansionOpportuni
tyCount, LayoutUnit& logicalLeft, LayoutUnit& logicalWidth) const |
| 136 { | 136 { |
| 137 int maxPreferredLogicalWidth = this->maxPreferredLogicalWidth(); | 137 int maxPreferredLogicalWidth = this->maxPreferredLogicalWidth().toInt(); |
| 138 if (maxPreferredLogicalWidth >= logicalWidth) | 138 if (maxPreferredLogicalWidth >= logicalWidth) |
| 139 return; | 139 return; |
| 140 | 140 |
| 141 unsigned maxCount = static_cast<unsigned>(LayoutUnit::max().floor()); | 141 unsigned maxCount = static_cast<unsigned>(LayoutUnit::max().floor()); |
| 142 if (expansionOpportunityCount > maxCount) | 142 if (expansionOpportunityCount > maxCount) |
| 143 expansionOpportunityCount = maxCount; | 143 expansionOpportunityCount = maxCount; |
| 144 | 144 |
| 145 // Inset the ruby base by half the inter-ideograph expansion amount. | 145 // Inset the ruby base by half the inter-ideograph expansion amount. |
| 146 LayoutUnit inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpp
ortunityCount + 1); | 146 LayoutUnit inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpp
ortunityCount + 1); |
| 147 | 147 |
| 148 logicalLeft += inset / 2; | 148 logicalLeft += inset / 2; |
| 149 logicalWidth -= inset; | 149 logicalWidth -= inset; |
| 150 } | 150 } |
| 151 | 151 |
| 152 } // namespace blink | 152 } // namespace blink |
| OLD | NEW |