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

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

Issue 2181953004: Changed ComputedStyle's EVisibility to be an enum class and fixed naming (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_move_computedstyle_around
Patch Set: Rebase Created 4 years, 4 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 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
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 1607 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 LayoutUnit logicalHeight = lastTextBox()->logicalBottomVisualOverflow() - lo gicalTop; 1618 LayoutUnit logicalHeight = lastTextBox()->logicalBottomVisualOverflow() - lo gicalTop;
1619 1619
1620 LayoutRect rect(logicalLeftSide, logicalTop, logicalWidth, logicalHeight); 1620 LayoutRect rect(logicalLeftSide, logicalTop, logicalWidth, logicalHeight);
1621 if (!style()->isHorizontalWritingMode()) 1621 if (!style()->isHorizontalWritingMode())
1622 rect = rect.transposedRect(); 1622 rect = rect.transposedRect();
1623 return rect; 1623 return rect;
1624 } 1624 }
1625 1625
1626 LayoutRect LayoutText::localOverflowRectForPaintInvalidation() const 1626 LayoutRect LayoutText::localOverflowRectForPaintInvalidation() const
1627 { 1627 {
1628 if (style()->visibility() != VISIBLE) 1628 if (style()->visibility() != EVisibility::Visible)
1629 return LayoutRect(); 1629 return LayoutRect();
1630 1630
1631 return unionRect(visualOverflowRect(), localSelectionRect()); 1631 return unionRect(visualOverflowRect(), localSelectionRect());
1632 } 1632 }
1633 1633
1634 LayoutRect LayoutText::localSelectionRect() const 1634 LayoutRect LayoutText::localSelectionRect() const
1635 { 1635 {
1636 ASSERT(!needsLayout()); 1636 ASSERT(!needsLayout());
1637 1637
1638 if (getSelectionState() == SelectionNone) 1638 if (getSelectionState() == SelectionNone)
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1749 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) { 1749 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
1750 invalidateDisplayItemClient(*box, invalidationReason); 1750 invalidateDisplayItemClient(*box, invalidationReason);
1751 if (box->truncation() != cNoTruncation) { 1751 if (box->truncation() != cNoTruncation) {
1752 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox()) 1752 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox())
1753 invalidateDisplayItemClient(*ellipsisBox, invalidationReason); 1753 invalidateDisplayItemClient(*ellipsisBox, invalidationReason);
1754 } 1754 }
1755 } 1755 }
1756 } 1756 }
1757 1757
1758 } // namespace blink 1758 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698