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

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

Issue 2518363003: Refactor InlineBox::calculateBoundaries() (Closed)
Patch Set: Rebase Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 if (!m_inlineTextBox) 93 if (!m_inlineTextBox)
94 return nullptr; 94 return nullptr;
95 95
96 return getOrCreate(m_lineLayoutItem, m_inlineTextBox->nextTextBox()); 96 return getOrCreate(m_lineLayoutItem, m_inlineTextBox->nextTextBox());
97 } 97 }
98 98
99 LayoutRect AbstractInlineTextBox::localBounds() const { 99 LayoutRect AbstractInlineTextBox::localBounds() const {
100 if (!m_inlineTextBox || !m_lineLayoutItem) 100 if (!m_inlineTextBox || !m_lineLayoutItem)
101 return LayoutRect(); 101 return LayoutRect();
102 102
103 return m_inlineTextBox->calculateBoundaries(); 103 return m_inlineTextBox->frameRect();
104 } 104 }
105 105
106 unsigned AbstractInlineTextBox::len() const { 106 unsigned AbstractInlineTextBox::len() const {
107 if (!m_inlineTextBox) 107 if (!m_inlineTextBox)
108 return 0; 108 return 0;
109 109
110 return m_inlineTextBox->len(); 110 return m_inlineTextBox->len();
111 } 111 }
112 112
113 AbstractInlineTextBox::Direction AbstractInlineTextBox::getDirection() const { 113 AbstractInlineTextBox::Direction AbstractInlineTextBox::getDirection() const {
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 210
211 InlineBox* previous = m_inlineTextBox->prevOnLine(); 211 InlineBox* previous = m_inlineTextBox->prevOnLine();
212 if (previous && previous->isInlineTextBox()) 212 if (previous && previous->isInlineTextBox())
213 return getOrCreate(toInlineTextBox(previous)->getLineLayoutItem(), 213 return getOrCreate(toInlineTextBox(previous)->getLineLayoutItem(),
214 toInlineTextBox(previous)); 214 toInlineTextBox(previous));
215 215
216 return nullptr; 216 return nullptr;
217 } 217 }
218 218
219 } // namespace blink 219 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/ScrollAnchor.cpp ('k') | third_party/WebKit/Source/core/layout/line/InlineBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698