| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2011 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 | 37 |
| 38 LayoutRubyText::LayoutRubyText(Element* element) | 38 LayoutRubyText::LayoutRubyText(Element* element) |
| 39 : RenderBlockFlow(element) | 39 : RenderBlockFlow(element) |
| 40 { | 40 { |
| 41 } | 41 } |
| 42 | 42 |
| 43 LayoutRubyText::~LayoutRubyText() | 43 LayoutRubyText::~LayoutRubyText() |
| 44 { | 44 { |
| 45 } | 45 } |
| 46 | 46 |
| 47 bool LayoutRubyText::isChildAllowed(RenderObject* child, RenderStyle*) const | 47 bool LayoutRubyText::isChildAllowed(LayoutObject* child, RenderStyle*) const |
| 48 { | 48 { |
| 49 return child->isInline(); | 49 return child->isInline(); |
| 50 } | 50 } |
| 51 | 51 |
| 52 ETextAlign LayoutRubyText::textAlignmentForLine(bool endsWithSoftBreak) const | 52 ETextAlign LayoutRubyText::textAlignmentForLine(bool endsWithSoftBreak) const |
| 53 { | 53 { |
| 54 ETextAlign textAlign = style()->textAlign(); | 54 ETextAlign textAlign = style()->textAlign(); |
| 55 // FIXME: This check is bogus since user can set the initial value. | 55 // FIXME: This check is bogus since user can set the initial value. |
| 56 if (textAlign != RenderStyle::initialTextAlign()) | 56 if (textAlign != RenderStyle::initialTextAlign()) |
| 57 return RenderBlockFlow::textAlignmentForLine(endsWithSoftBreak); | 57 return RenderBlockFlow::textAlignmentForLine(endsWithSoftBreak); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 80 logicalLeft += inset / 2; | 80 logicalLeft += inset / 2; |
| 81 logicalWidth -= inset; | 81 logicalWidth -= inset; |
| 82 } | 82 } |
| 83 | 83 |
| 84 bool LayoutRubyText::avoidsFloats() const | 84 bool LayoutRubyText::avoidsFloats() const |
| 85 { | 85 { |
| 86 return true; | 86 return true; |
| 87 } | 87 } |
| 88 | 88 |
| 89 } // namespace blink | 89 } // namespace blink |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 899163003:
Move rendering/RenderObject to layout/LayoutObject. (Closed)
Base URL: svn://svn.chromium.org/blink/trunk