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

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

Issue 1648573002: Transition to explicit constructors in LayoutUnit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove int constructors for size/point... they result in incorrect conversions until LayoutUnit is … 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) 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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 3593 matching lines...) Expand 10 before | Expand all | Expand 10 after
3604 { 3604 {
3605 // VisiblePositions at offsets inside containers either a) refer to the posi tions before/after 3605 // VisiblePositions at offsets inside containers either a) refer to the posi tions before/after
3606 // those containers (tables and select elements) or b) refer to the position inside an empty block. 3606 // those containers (tables and select elements) or b) refer to the position inside an empty block.
3607 // They never refer to children. 3607 // They never refer to children.
3608 // FIXME: Paint the carets inside empty blocks differently than the carets b efore/after elements. 3608 // FIXME: Paint the carets inside empty blocks differently than the carets b efore/after elements.
3609 3609
3610 LayoutRect rect(location(), LayoutSize(caretWidth(), size().height())); 3610 LayoutRect rect(location(), LayoutSize(caretWidth(), size().height()));
3611 bool ltr = box ? box->isLeftToRightDirection() : style()->isLeftToRightDirec tion(); 3611 bool ltr = box ? box->isLeftToRightDirection() : style()->isLeftToRightDirec tion();
3612 3612
3613 if ((!caretOffset) ^ ltr) 3613 if ((!caretOffset) ^ ltr)
3614 rect.move(LayoutSize(size().width() - caretWidth(), 0)); 3614 rect.move(LayoutSize(size().width() - caretWidth(), LayoutUnit()));
3615 3615
3616 if (box) { 3616 if (box) {
3617 RootInlineBox& rootBox = box->root(); 3617 RootInlineBox& rootBox = box->root();
3618 LayoutUnit top = rootBox.lineTop(); 3618 LayoutUnit top = rootBox.lineTop();
3619 rect.setY(top); 3619 rect.setY(top);
3620 rect.setHeight(rootBox.lineBottom() - top); 3620 rect.setHeight(rootBox.lineBottom() - top);
3621 } 3621 }
3622 3622
3623 // If height of box is smaller than font height, use the latter one, 3623 // If height of box is smaller than font height, use the latter one,
3624 // otherwise the caret might become invisible. 3624 // otherwise the caret might become invisible.
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after
4640 4640
4641 void LayoutBox::clearPercentHeightDescendants() 4641 void LayoutBox::clearPercentHeightDescendants()
4642 { 4642 {
4643 for (LayoutObject* curr = slowFirstChild(); curr; curr = curr->nextInPreOrde r(this)) { 4643 for (LayoutObject* curr = slowFirstChild(); curr; curr = curr->nextInPreOrde r(this)) {
4644 if (curr->isBox()) 4644 if (curr->isBox())
4645 toLayoutBox(curr)->removeFromPercentHeightContainer(); 4645 toLayoutBox(curr)->removeFromPercentHeightContainer();
4646 } 4646 }
4647 } 4647 }
4648 4648
4649 } // namespace blink 4649 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.h ('k') | third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698