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

Side by Side Diff: Source/core/rendering/RenderRubyBase.cpp

Issue 332543002: Rename Repaint to Paint Invalidation Part 4 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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/rendering/RenderReplaced.cpp ('k') | Source/core/rendering/RenderSelectionInfo.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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 ASSERT_ARG(toBase, toBase); 66 ASSERT_ARG(toBase, toBase);
67 67
68 if (beforeChild && beforeChild->parent() != this) 68 if (beforeChild && beforeChild->parent() != this)
69 beforeChild = splitAnonymousBoxesAroundChild(beforeChild); 69 beforeChild = splitAnonymousBoxesAroundChild(beforeChild);
70 70
71 if (childrenInline()) 71 if (childrenInline())
72 moveInlineChildren(toBase, beforeChild); 72 moveInlineChildren(toBase, beforeChild);
73 else 73 else
74 moveBlockChildren(toBase, beforeChild); 74 moveBlockChildren(toBase, beforeChild);
75 75
76 setNeedsLayoutAndPrefWidthsRecalcAndFullRepaint(); 76 setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
77 toBase->setNeedsLayoutAndPrefWidthsRecalcAndFullRepaint(); 77 toBase->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
78 } 78 }
79 79
80 void RenderRubyBase::moveInlineChildren(RenderRubyBase* toBase, RenderObject* be foreChild) 80 void RenderRubyBase::moveInlineChildren(RenderRubyBase* toBase, RenderObject* be foreChild)
81 { 81 {
82 ASSERT(childrenInline()); 82 ASSERT(childrenInline());
83 ASSERT_ARG(toBase, toBase); 83 ASSERT_ARG(toBase, toBase);
84 84
85 if (!firstChild()) 85 if (!firstChild())
86 return; 86 return;
87 87
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 return; 142 return;
143 143
144 // Inset the ruby base by half the inter-ideograph expansion amount. 144 // Inset the ruby base by half the inter-ideograph expansion amount.
145 float inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpportun ityCount + 1); 145 float inset = (logicalWidth - maxPreferredLogicalWidth) / (expansionOpportun ityCount + 1);
146 146
147 logicalLeft += inset / 2; 147 logicalLeft += inset / 2;
148 logicalWidth -= inset; 148 logicalWidth -= inset;
149 } 149 }
150 150
151 } // namespace WebCore 151 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderReplaced.cpp ('k') | Source/core/rendering/RenderSelectionInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698