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

Side by Side Diff: Source/core/layout/line/EllipsisBox.h

Issue 1065783002: Remove legacy markup box behavior when line-clamping. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rename new layout test to reflect intent. Created 5 years, 8 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) 2003, 2006 Apple Computer, Inc. 2 * Copyright (C) 2003, 2006 Apple Computer, Inc.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 13 matching lines...) Expand all
24 #include "core/layout/line/InlineBox.h" 24 #include "core/layout/line/InlineBox.h"
25 25
26 namespace blink { 26 namespace blink {
27 27
28 class HitTestRequest; 28 class HitTestRequest;
29 class HitTestResult; 29 class HitTestResult;
30 30
31 class EllipsisBox final : public InlineBox { 31 class EllipsisBox final : public InlineBox {
32 public: 32 public:
33 EllipsisBox(LayoutObject& obj, const AtomicString& ellipsisStr, InlineFlowBo x* parent, 33 EllipsisBox(LayoutObject& obj, const AtomicString& ellipsisStr, InlineFlowBo x* parent,
34 int width, int height, int x, int y, bool firstLine, bool isVertical, In lineBox* markupBox) 34 int width, int height, int x, int y, bool firstLine, bool isVertical)
35 : InlineBox(obj, FloatPointWillBeLayoutPoint(x, y), width, firstLine, tr ue, false, false, isVertical, 0, 0, parent) 35 : InlineBox(obj, FloatPointWillBeLayoutPoint(x, y), width, firstLine, tr ue, false, false, isVertical, 0, 0, parent)
36 , m_shouldPaintMarkupBox(markupBox)
37 , m_height(height) 36 , m_height(height)
38 , m_str(ellipsisStr) 37 , m_str(ellipsisStr)
39 , m_selectionState(LayoutObject::SelectionNone) 38 , m_selectionState(LayoutObject::SelectionNone)
40 { 39 {
41 setHasVirtualLogicalHeight(); 40 setHasVirtualLogicalHeight();
42 } 41 }
43 42
44 virtual void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override; 43 virtual void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;
45 virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInCo ntainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit li neBottom) override; 44 virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInCo ntainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit li neBottom) override;
46 void setSelectionState(LayoutObject::SelectionState s) { m_selectionState = s; } 45 void setSelectionState(LayoutObject::SelectionState s) { m_selectionState = s; }
47 IntRect selectionRect(); 46 IntRect selectionRect();
48 47
49 virtual FloatWillBeLayoutUnit virtualLogicalHeight() const override { return m_height; } 48 virtual FloatWillBeLayoutUnit virtualLogicalHeight() const override { return m_height; }
50 virtual LayoutObject::SelectionState selectionState() const override { retur n m_selectionState; } 49 virtual LayoutObject::SelectionState selectionState() const override { retur n m_selectionState; }
51 const AtomicString& ellipsisStr() { return m_str; } 50 const AtomicString& ellipsisStr() { return m_str; }
52 InlineBox* markupBox() const;
53 51
54 virtual const char* boxName() const override; 52 virtual const char* boxName() const override;
55 53
56 private: 54 private:
57 55
58 bool m_shouldPaintMarkupBox;
59 int m_height; 56 int m_height;
60 AtomicString m_str; 57 AtomicString m_str;
61 LayoutObject::SelectionState m_selectionState; 58 LayoutObject::SelectionState m_selectionState;
62 }; 59 };
63 60
64 } // namespace blink 61 } // namespace blink
65 62
66 #endif // EllipsisBox_h 63 #endif // EllipsisBox_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutDeprecatedFlexibleBox.cpp ('k') | Source/core/layout/line/EllipsisBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698