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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutRubyRun.cpp

Issue 1656743002: Removing more implicit LayoutUnit construction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix additional test Created 4 years, 10 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
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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 } 217 }
218 218
219 void LayoutRubyRun::layout() 219 void LayoutRubyRun::layout()
220 { 220 {
221 LayoutBlockFlow::layout(); 221 LayoutBlockFlow::layout();
222 222
223 LayoutRubyText* rt = rubyText(); 223 LayoutRubyText* rt = rubyText();
224 if (!rt) 224 if (!rt)
225 return; 225 return;
226 226
227 rt->setLogicalLeft(0); 227 rt->setLogicalLeft(LayoutUnit());
228 228
229 // Place the LayoutRubyText such that its bottom is flush with the lineTop o f the first line of the LayoutRubyBase. 229 // Place the LayoutRubyText such that its bottom is flush with the lineTop o f the first line of the LayoutRubyBase.
230 LayoutUnit lastLineRubyTextBottom = rt->logicalHeight(); 230 LayoutUnit lastLineRubyTextBottom = rt->logicalHeight();
231 LayoutUnit firstLineRubyTextTop; 231 LayoutUnit firstLineRubyTextTop;
232 RootInlineBox* rootBox = rt->lastRootBox(); 232 RootInlineBox* rootBox = rt->lastRootBox();
233 if (rootBox) { 233 if (rootBox) {
234 // In order to align, we have to ignore negative leading. 234 // In order to align, we have to ignore negative leading.
235 firstLineRubyTextTop = rt->firstRootBox()->logicalTopLayoutOverflow(); 235 firstLineRubyTextTop = rt->firstRootBox()->logicalTopLayoutOverflow();
236 lastLineRubyTextBottom = rootBox->logicalBottomLayoutOverflow(); 236 lastLineRubyTextBottom = rootBox->logicalBottomLayoutOverflow();
237 } 237 }
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 case U_LB_GLUE: 324 case U_LB_GLUE:
325 case U_LB_OPEN_PUNCTUATION: 325 case U_LB_OPEN_PUNCTUATION:
326 return false; 326 return false;
327 default: 327 default:
328 break; 328 break;
329 } 329 }
330 return true; 330 return true;
331 } 331 }
332 332
333 } // namespace blink 333 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutReplaced.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutSlider.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698