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

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

Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-6
Patch Set: get-names-7: rebase 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) 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 28 matching lines...) Expand all
39 { 39 {
40 setHasVirtualLogicalHeight(); 40 setHasVirtualLogicalHeight();
41 } 41 }
42 42
43 void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutU nit lineBottom) const override; 43 void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutU nit lineBottom) const override;
44 bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom ) override; 44 bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom ) override;
45 void setSelectionState(SelectionState s) { m_selectionState = s; } 45 void setSelectionState(SelectionState s) { m_selectionState = s; }
46 IntRect selectionRect() const; 46 IntRect selectionRect() const;
47 47
48 LayoutUnit virtualLogicalHeight() const override { return LayoutUnit(m_heigh t); } 48 LayoutUnit virtualLogicalHeight() const override { return LayoutUnit(m_heigh t); }
49 SelectionState selectionState() const override { return m_selectionState; } 49 SelectionState getSelectionState() const override { return m_selectionState; }
50 const AtomicString& ellipsisStr() const { return m_str; } 50 const AtomicString& ellipsisStr() const { return m_str; }
51 51
52 const char* boxName() const override; 52 const char* boxName() const override;
53 53
54 private: 54 private:
55 55
56 int m_height; 56 int m_height;
57 AtomicString m_str; 57 AtomicString m_str;
58 SelectionState m_selectionState; 58 SelectionState m_selectionState;
59 }; 59 };
60 60
61 } // namespace blink 61 } // namespace blink
62 62
63 #endif // EllipsisBox_h 63 #endif // EllipsisBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698