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

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 1614 matching lines...) Expand 10 before | Expand all | Expand 10 after
1625 LayoutUnit logicalHeight = lastTextBox()->logicalBottomVisualOverflow() - lo gicalTop; 1625 LayoutUnit logicalHeight = lastTextBox()->logicalBottomVisualOverflow() - lo gicalTop;
1626 1626
1627 LayoutRect rect(logicalLeftSide, logicalTop, logicalWidth, logicalHeight); 1627 LayoutRect rect(logicalLeftSide, logicalTop, logicalWidth, logicalHeight);
1628 if (!style()->isHorizontalWritingMode()) 1628 if (!style()->isHorizontalWritingMode())
1629 rect = rect.transposedRect(); 1629 rect = rect.transposedRect();
1630 return rect; 1630 return rect;
1631 } 1631 }
1632 1632
1633 LayoutRect LayoutText::localOverflowRectForPaintInvalidation() const 1633 LayoutRect LayoutText::localOverflowRectForPaintInvalidation() const
1634 { 1634 {
1635 if (style()->visibility() != VISIBLE) 1635 if (style()->visibility() != EVisibility::Visible)
1636 return LayoutRect(); 1636 return LayoutRect();
1637 1637
1638 return unionRect(visualOverflowRect(), localSelectionRect()); 1638 return unionRect(visualOverflowRect(), localSelectionRect());
1639 } 1639 }
1640 1640
1641 LayoutRect LayoutText::localSelectionRect() const 1641 LayoutRect LayoutText::localSelectionRect() const
1642 { 1642 {
1643 ASSERT(!needsLayout()); 1643 ASSERT(!needsLayout());
1644 1644
1645 if (getSelectionState() == SelectionNone) 1645 if (getSelectionState() == SelectionNone)
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1756 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) { 1756 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
1757 invalidateDisplayItemClient(*box, invalidationReason); 1757 invalidateDisplayItemClient(*box, invalidationReason);
1758 if (box->truncation() != cNoTruncation) { 1758 if (box->truncation() != cNoTruncation) {
1759 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox()) 1759 if (EllipsisBox* ellipsisBox = box->root().ellipsisBox())
1760 invalidateDisplayItemClient(*ellipsisBox, invalidationReason); 1760 invalidateDisplayItemClient(*ellipsisBox, invalidationReason);
1761 } 1761 }
1762 } 1762 }
1763 } 1763 }
1764 1764
1765 } // namespace blink 1765 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698