| 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 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 #include "core/layout/LayoutRubyRun.h" | 33 #include "core/layout/LayoutRubyRun.h" |
| 34 | 34 |
| 35 #include "core/layout/LayoutRubyBase.h" | 35 #include "core/layout/LayoutRubyBase.h" |
| 36 #include "core/layout/LayoutRubyText.h" | 36 #include "core/layout/LayoutRubyText.h" |
| 37 #include "core/layout/LayoutText.h" | 37 #include "core/layout/LayoutText.h" |
| 38 | 38 |
| 39 namespace blink { | 39 namespace blink { |
| 40 | 40 |
| 41 LayoutRubyRun::LayoutRubyRun() | 41 LayoutRubyRun::LayoutRubyRun() |
| 42 : LayoutBlockFlow(0) | 42 : LayoutBlockFlow(nullptr) |
| 43 { | 43 { |
| 44 setReplaced(true); | 44 setReplaced(true); |
| 45 setInline(true); | 45 setInline(true); |
| 46 } | 46 } |
| 47 | 47 |
| 48 LayoutRubyRun::~LayoutRubyRun() | 48 LayoutRubyRun::~LayoutRubyRun() |
| 49 { | 49 { |
| 50 } | 50 } |
| 51 | 51 |
| 52 bool LayoutRubyRun::hasRubyText() const | 52 bool LayoutRubyRun::hasRubyText() const |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisp
lay(parentRuby->styleRef(), INLINE_BLOCK); | 199 RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisp
lay(parentRuby->styleRef(), INLINE_BLOCK); |
| 200 rr->setStyle(newStyle.release()); | 200 rr->setStyle(newStyle.release()); |
| 201 return rr; | 201 return rr; |
| 202 } | 202 } |
| 203 | 203 |
| 204 LayoutObject* LayoutRubyRun::layoutSpecialExcludedChild(bool relayoutChildren, S
ubtreeLayoutScope& layoutScope) | 204 LayoutObject* LayoutRubyRun::layoutSpecialExcludedChild(bool relayoutChildren, S
ubtreeLayoutScope& layoutScope) |
| 205 { | 205 { |
| 206 // Don't bother positioning the LayoutRubyRun yet. | 206 // Don't bother positioning the LayoutRubyRun yet. |
| 207 LayoutRubyText* rt = rubyText(); | 207 LayoutRubyText* rt = rubyText(); |
| 208 if (!rt) | 208 if (!rt) |
| 209 return 0; | 209 return nullptr; |
| 210 if (relayoutChildren) | 210 if (relayoutChildren) |
| 211 layoutScope.setChildNeedsLayout(rt); | 211 layoutScope.setChildNeedsLayout(rt); |
| 212 rt->layoutIfNeeded(); | 212 rt->layoutIfNeeded(); |
| 213 return rt; | 213 return rt; |
| 214 } | 214 } |
| 215 | 215 |
| 216 void LayoutRubyRun::layout() | 216 void LayoutRubyRun::layout() |
| 217 { | 217 { |
| 218 LayoutBlockFlow::layout(); | 218 LayoutBlockFlow::layout(); |
| 219 | 219 |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 // We can overhang the ruby by no more than half the width of the neighborin
g text | 296 // We can overhang the ruby by no more than half the width of the neighborin
g text |
| 297 // and no more than half the font size. | 297 // and no more than half the font size. |
| 298 int halfWidthOfFontSize = rubyText->style(firstLine)->fontSize() / 2; | 298 int halfWidthOfFontSize = rubyText->style(firstLine)->fontSize() / 2; |
| 299 if (startOverhang) | 299 if (startOverhang) |
| 300 startOverhang = std::min<int>(startOverhang, std::min<int>(toLayoutText(
startLayoutObject)->minLogicalWidth(), halfWidthOfFontSize)); | 300 startOverhang = std::min<int>(startOverhang, std::min<int>(toLayoutText(
startLayoutObject)->minLogicalWidth(), halfWidthOfFontSize)); |
| 301 if (endOverhang) | 301 if (endOverhang) |
| 302 endOverhang = std::min<int>(endOverhang, std::min<int>(toLayoutText(endL
ayoutObject)->minLogicalWidth(), halfWidthOfFontSize)); | 302 endOverhang = std::min<int>(endOverhang, std::min<int>(toLayoutText(endL
ayoutObject)->minLogicalWidth(), halfWidthOfFontSize)); |
| 303 } | 303 } |
| 304 | 304 |
| 305 } // namespace blink | 305 } // namespace blink |
| OLD | NEW |