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

Side by Side Diff: sky/engine/core/rendering/RenderBlock.cpp

Issue 1200233002: Use the baseline information exposed by C++ to pipe baseline data through RenderBox. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « sky/engine/core/rendering/RenderBlock.h ('k') | sky/engine/core/rendering/RenderBox.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1333 matching lines...) Expand 10 before | Expand all | Expand 10 after
1344 } 1344 }
1345 1345
1346 LayoutUnit RenderBlock::minLineHeightForReplacedRenderer(bool isFirstLine, Layou tUnit replacedHeight) const 1346 LayoutUnit RenderBlock::minLineHeightForReplacedRenderer(bool isFirstLine, Layou tUnit replacedHeight) const
1347 { 1347 {
1348 if (!(style(isFirstLine)->lineBoxContain() & LineBoxContainBlock)) 1348 if (!(style(isFirstLine)->lineBoxContain() & LineBoxContainBlock))
1349 return 0; 1349 return 0;
1350 1350
1351 return std::max<LayoutUnit>(replacedHeight, lineHeight(isFirstLine, Horizont alLine, PositionOfInteriorLineBoxes)); 1351 return std::max<LayoutUnit>(replacedHeight, lineHeight(isFirstLine, Horizont alLine, PositionOfInteriorLineBoxes));
1352 } 1352 }
1353 1353
1354 int RenderBlock::firstLineBoxBaseline() const 1354 int RenderBlock::firstLineBoxBaseline(FontBaselineOrAuto baselineType) const
1355 { 1355 {
1356 for (RenderBox* curr = firstChildBox(); curr; curr = curr->nextSiblingBox()) { 1356 for (RenderBox* curr = firstChildBox(); curr; curr = curr->nextSiblingBox()) {
1357 if (!curr->isFloatingOrOutOfFlowPositioned()) { 1357 if (!curr->isFloatingOrOutOfFlowPositioned()) {
1358 int result = curr->firstLineBoxBaseline(); 1358 int result = curr->firstLineBoxBaseline(baselineType);
1359 if (result != -1) 1359 if (result != -1)
1360 return curr->logicalTop() + result; // Translate to our coordina te space. 1360 return curr->logicalTop() + result; // Translate to our coordina te space.
1361 } 1361 }
1362 } 1362 }
1363 1363
1364 return -1; 1364 return -1;
1365 } 1365 }
1366 1366
1367 int RenderBlock::inlineBlockBaseline(LineDirectionMode direction) const 1367 int RenderBlock::inlineBlockBaseline(LineDirectionMode direction) const
1368 { 1368 {
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
1672 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 1672 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
1673 { 1673 {
1674 showRenderObject(); 1674 showRenderObject();
1675 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 1675 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
1676 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 1676 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
1677 } 1677 }
1678 1678
1679 #endif 1679 #endif
1680 1680
1681 } // namespace blink 1681 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBlock.h ('k') | sky/engine/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698