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

Side by Side Diff: Source/core/layout/LayoutRubyBase.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/LayoutRubyBase.h ('k') | Source/core/layout/LayoutRubyRun.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 * 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 { 46 {
47 } 47 }
48 48
49 LayoutRubyBase* LayoutRubyBase::createAnonymous(Document* document) 49 LayoutRubyBase* LayoutRubyBase::createAnonymous(Document* document)
50 { 50 {
51 LayoutRubyBase* layoutObject = new LayoutRubyBase(); 51 LayoutRubyBase* layoutObject = new LayoutRubyBase();
52 layoutObject->setDocumentForAnonymous(document); 52 layoutObject->setDocumentForAnonymous(document);
53 return layoutObject; 53 return layoutObject;
54 } 54 }
55 55
56 bool LayoutRubyBase::isChildAllowed(LayoutObject* child, const LayoutStyle&) con st 56 bool LayoutRubyBase::isChildAllowed(LayoutObject* child, const ComputedStyle&) c onst
57 { 57 {
58 return child->isInline(); 58 return child->isInline();
59 } 59 }
60 60
61 void LayoutRubyBase::moveChildren(LayoutRubyBase* toBase, LayoutObject* beforeCh ild) 61 void LayoutRubyBase::moveChildren(LayoutRubyBase* toBase, LayoutObject* beforeCh ild)
62 { 62 {
63 // This function removes all children that are before (!) beforeChild 63 // This function removes all children that are before (!) beforeChild
64 // and appends them to toBase. 64 // and appends them to toBase.
65 ASSERT_ARG(toBase, toBase); 65 ASSERT_ARG(toBase, toBase);
66 66
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 return; 141 return;
142 142
143 // Inset the ruby base by half the inter-ideograph expansion amount. 143 // Inset the ruby base by half the inter-ideograph expansion amount.
144 float inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpportun ityCount + 1); 144 float inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpportun ityCount + 1);
145 145
146 logicalLeft += inset / 2; 146 logicalLeft += inset / 2;
147 logicalWidth -= inset; 147 logicalWidth -= inset;
148 } 148 }
149 149
150 } // namespace blink 150 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutRubyBase.h ('k') | Source/core/layout/LayoutRubyRun.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698