| 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 RenderBlock* anonBlockHere = toRenderBlock(firstChildHere); | 123 RenderBlock* anonBlockHere = toRenderBlock(firstChildHere); |
| 124 RenderBlock* anonBlockThere = toRenderBlock(lastChildThere); | 124 RenderBlock* anonBlockThere = toRenderBlock(lastChildThere); |
| 125 anonBlockHere->moveAllChildrenTo(anonBlockThere, anonBlockThere->childre
n()); | 125 anonBlockHere->moveAllChildrenTo(anonBlockThere, anonBlockThere->childre
n()); |
| 126 anonBlockHere->deleteLineBoxTree(); | 126 anonBlockHere->deleteLineBoxTree(); |
| 127 anonBlockHere->destroy(); | 127 anonBlockHere->destroy(); |
| 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 RenderRubyRun* RenderRubyBase::rubyRun() const | |
| 134 { | |
| 135 ASSERT(parent()); | |
| 136 ASSERT(parent()->isRubyRun()); | |
| 137 | |
| 138 return toRenderRubyRun(parent()); | |
| 139 } | |
| 140 | |
| 141 ETextAlign RenderRubyBase::textAlignmentForLine(bool /* endsWithSoftBreak */) co
nst | 133 ETextAlign RenderRubyBase::textAlignmentForLine(bool /* endsWithSoftBreak */) co
nst |
| 142 { | 134 { |
| 143 return JUSTIFY; | 135 return JUSTIFY; |
| 144 } | 136 } |
| 145 | 137 |
| 146 void RenderRubyBase::adjustInlineDirectionLineBounds(int expansionOpportunityCou
nt, float& logicalLeft, float& logicalWidth) const | 138 void RenderRubyBase::adjustInlineDirectionLineBounds(int expansionOpportunityCou
nt, float& logicalLeft, float& logicalWidth) const |
| 147 { | 139 { |
| 148 int maxPreferredLogicalWidth = this->maxPreferredLogicalWidth(); | 140 int maxPreferredLogicalWidth = this->maxPreferredLogicalWidth(); |
| 149 if (maxPreferredLogicalWidth >= logicalWidth) | 141 if (maxPreferredLogicalWidth >= logicalWidth) |
| 150 return; | 142 return; |
| 151 | 143 |
| 152 // Inset the ruby base by half the inter-ideograph expansion amount. | 144 // Inset the ruby base by half the inter-ideograph expansion amount. |
| 153 float inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpportun
ityCount + 1); | 145 float inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpportun
ityCount + 1); |
| 154 | 146 |
| 155 logicalLeft += inset / 2; | 147 logicalLeft += inset / 2; |
| 156 logicalWidth -= inset; | 148 logicalWidth -= inset; |
| 157 } | 149 } |
| 158 | 150 |
| 159 } // namespace WebCore | 151 } // namespace WebCore |
| OLD | NEW |