third_party/WebKit/Source/core/layout/line/InlineTextBox.h - Issue 1433253003: [Line Layout API] Convert AbstractInlineTextBox to new line layout API

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

Issue 1433253003: [Line Layout API] Convert AbstractInlineTextBox to new line layout API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove PaintShim usage in AXInlineTextBox, remove nullptr definitions (split into other CL), addres… Created 5 years 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

« no previous file with comments | « third_party/WebKit/Source/core/layout/line/AbstractInlineTextBox.cpp ('k') | third_party/WebKit/Source/modules/accessibility/AXInlineTextBox.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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, 2009, 2010, 2011 Apple Inc. All rights reserv ed.	4 * Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Apple Inc. All rights reserv ed.

5 *	5 *

6 * This library is free software; you can redistribute it and/or	6 * This library is free software; you can redistribute it and/or

7 * modify it under the terms of the GNU Library General Public	7 * modify it under the terms of the GNU Library General Public

8 * License as published by the Free Software Foundation; either	8 * License as published by the Free Software Foundation; either

9 * version 2 of the License, or (at your option) any later version.	9 * version 2 of the License, or (at your option) any later version.

10 *	10 *

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 : InlineBox(obj)	44 : InlineBox(obj)

45 , m_prevTextBox(nullptr)	45 , m_prevTextBox(nullptr)

46 , m_nextTextBox(nullptr)	46 , m_nextTextBox(nullptr)

47 , m_start(start)	47 , m_start(start)

48 , m_len(length)	48 , m_len(length)

49 , m_truncation(cNoTruncation)	49 , m_truncation(cNoTruncation)

50 {	50 {

51 setIsText(true);	51 setIsText(true);

52 }	52 }

53	53

	54 private:

54 LayoutText& layoutObject() const { return toLayoutText(InlineBox::layoutObje ct()); }	55 LayoutText& layoutObject() const { return toLayoutText(InlineBox::layoutObje ct()); }
	leviw_travelin_and_unemployed 2015/12/07 18:50:27 If this can be removed, can we take it out in this If this can be removed, can we take it out in this patch? :)
	56 public:

55 LineLayoutText lineLayoutItem() const { return LineLayoutText(InlineBox::lin eLayoutItem()); }	57 LineLayoutText lineLayoutItem() const { return LineLayoutText(InlineBox::lin eLayoutItem()); }

56	58

57 void destroy() final;	59 void destroy() final;

58	60

59 InlineTextBox* prevTextBox() const { return m_prevTextBox; }	61 InlineTextBox* prevTextBox() const { return m_prevTextBox; }

60 InlineTextBox* nextTextBox() const { return m_nextTextBox; }	62 InlineTextBox* nextTextBox() const { return m_nextTextBox; }

61 void setNextTextBox(InlineTextBox* n) { m_nextTextBox = n; }	63 void setNextTextBox(InlineTextBox* n) { m_nextTextBox = n; }

62 void setPreviousTextBox(InlineTextBox* p) { m_prevTextBox = p; }	64 void setPreviousTextBox(InlineTextBox* p) { m_prevTextBox = p; }

63	65

64 // FIXME: These accessors should ASSERT(!isDirty()). See https://bugs.webkit .org/show_bug.cgi?id=97264	66 // FIXME: These accessors should ASSERT(!isDirty()). See https://bugs.webkit .org/show_bug.cgi?id=97264

(...skipping 117 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
182 }	184 }

183 };	185 };

184	186

185 DEFINE_INLINE_BOX_TYPE_CASTS(InlineTextBox);	187 DEFINE_INLINE_BOX_TYPE_CASTS(InlineTextBox);

186	188

187 void alignSelectionRectToDevicePixels(LayoutRect&);	189 void alignSelectionRectToDevicePixels(LayoutRect&);

188	190

189 } // namespace blink	191 } // namespace blink

190	192

191 #endif // InlineTextBox_h	193 #endif // InlineTextBox_h

OLD	NEW