Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: Source/core/layout/LayoutRubyText.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutRubyText.h ('k') | Source/core/layout/LayoutScrollbar.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
37 37
38 LayoutRubyText::LayoutRubyText(Element* element) 38 LayoutRubyText::LayoutRubyText(Element* element)
39 : LayoutBlockFlow(element) 39 : LayoutBlockFlow(element)
40 { 40 {
41 } 41 }
42 42
43 LayoutRubyText::~LayoutRubyText() 43 LayoutRubyText::~LayoutRubyText()
44 { 44 {
45 } 45 }
46 46
47 bool LayoutRubyText::isChildAllowed(LayoutObject* child, const LayoutStyle&) con st 47 bool LayoutRubyText::isChildAllowed(LayoutObject* child, const ComputedStyle&) c onst
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 != LayoutStyle::initialTextAlign()) 56 if (textAlign != ComputedStyle::initialTextAlign())
57 return LayoutBlockFlow::textAlignmentForLine(endsWithSoftBreak); 57 return LayoutBlockFlow::textAlignmentForLine(endsWithSoftBreak);
58 58
59 // The default behavior is to allow ruby text to expand if it is shorter tha n the ruby base. 59 // The default behavior is to allow ruby text to expand if it is shorter tha n the ruby base.
60 return JUSTIFY; 60 return JUSTIFY;
61 } 61 }
62 62
63 void LayoutRubyText::adjustInlineDirectionLineBounds(unsigned expansionOpportuni tyCount, float& logicalLeft, float& logicalWidth) const 63 void LayoutRubyText::adjustInlineDirectionLineBounds(unsigned expansionOpportuni tyCount, float& logicalLeft, float& logicalWidth) const
64 { 64 {
65 ETextAlign textAlign = style()->textAlign(); 65 ETextAlign textAlign = style()->textAlign();
66 // FIXME: This check is bogus since user can set the initial value. 66 // FIXME: This check is bogus since user can set the initial value.
67 if (textAlign != LayoutStyle::initialTextAlign()) 67 if (textAlign != ComputedStyle::initialTextAlign())
68 return LayoutBlockFlow::adjustInlineDirectionLineBounds(expansionOpportu nityCount, logicalLeft, logicalWidth); 68 return LayoutBlockFlow::adjustInlineDirectionLineBounds(expansionOpportu nityCount, logicalLeft, logicalWidth);
69 69
70 int maxPreferredLogicalWidth = this->maxPreferredLogicalWidth(); 70 int maxPreferredLogicalWidth = this->maxPreferredLogicalWidth();
71 if (maxPreferredLogicalWidth >= logicalWidth) 71 if (maxPreferredLogicalWidth >= logicalWidth)
72 return; 72 return;
73 73
74 // Inset the ruby text by half the inter-ideograph expansion amount, but no more than a full-width 74 // Inset the ruby text by half the inter-ideograph expansion amount, but no more than a full-width
75 // ruby character on each side. 75 // ruby character on each side.
76 float inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpportun ityCount + 1); 76 float inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpportun ityCount + 1);
77 if (expansionOpportunityCount) 77 if (expansionOpportunityCount)
78 inset = std::min<float>(2 * style()->fontSize(), inset); 78 inset = std::min<float>(2 * style()->fontSize(), inset);
79 79
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
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutRubyText.h ('k') | Source/core/layout/LayoutScrollbar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698