Chromium Code Reviews| 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 133 { | 133 { |
| 134 return JUSTIFY; | 134 return JUSTIFY; |
| 135 } | 135 } |
| 136 | 136 |
| 137 void LayoutRubyBase::adjustInlineDirectionLineBounds(unsigned expansionOpportuni tyCount, LayoutUnit& logicalLeft, LayoutUnit& logicalWidth) const | 137 void LayoutRubyBase::adjustInlineDirectionLineBounds(unsigned expansionOpportuni tyCount, LayoutUnit& logicalLeft, LayoutUnit& logicalWidth) const |
| 138 { | 138 { |
| 139 int maxPreferredLogicalWidth = this->maxPreferredLogicalWidth(); | 139 int maxPreferredLogicalWidth = this->maxPreferredLogicalWidth(); |
| 140 if (maxPreferredLogicalWidth >= logicalWidth) | 140 if (maxPreferredLogicalWidth >= logicalWidth) |
| 141 return; | 141 return; |
| 142 | 142 |
| 143 unsigned maxCount = static_cast<unsigned>(LayoutUnit::max().floor()); | |
|
wkorman
2015/08/11 01:03:32
Do we need to worry about similar overflow here?
| |
| 144 if (expansionOpportunityCount > maxCount) | |
| 145 expansionOpportunityCount = maxCount; | |
| 146 | |
| 143 // Inset the ruby base by half the inter-ideograph expansion amount. | 147 // Inset the ruby base by half the inter-ideograph expansion amount. |
| 144 LayoutUnit inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpp ortunityCount + 1); | 148 LayoutUnit inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpp ortunityCount + 1); |
| 145 | 149 |
| 146 logicalLeft += inset / 2; | 150 logicalLeft += inset / 2; |
| 147 logicalWidth -= inset; | 151 logicalWidth -= inset; |
| 148 } | 152 } |
| 149 | 153 |
| 150 } // namespace blink | 154 } // namespace blink |
| OLD | NEW |