Changeset 223260 in webkit
- Timestamp:
- Oct 12, 2017 2:38:04 PM (6 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r223259 r223260 1 2017-10-12 Daniel Bates <dabates@apple.com> 2 3 Mark more InlineBox member functions as const 4 https://bugs.webkit.org/show_bug.cgi?id=178217 5 6 Reviewed by Andy Estes. 7 8 * rendering/InlineBox.cpp: 9 (WebCore::InlineBox::locationIncludingFlipping const): Mark as const. Also fix some style 10 nits while I am here. 11 (WebCore::InlineBox::flipForWritingMode const): Mark as const. 12 (WebCore::InlineBox::locationIncludingFlipping): Deleted. 13 (WebCore::InlineBox::flipForWritingMode): Deleted. 14 * rendering/InlineBox.h: 15 1 16 2017-10-12 Daniel Bates <dabates@apple.com> 2 17 -
trunk/Source/WebCore/rendering/InlineBox.cpp
r220503 r223260 289 289 } 290 290 291 FloatPoint InlineBox::locationIncludingFlipping() 292 { 293 if (!m_renderer.style().isFlippedBlocksWritingMode()) 294 return FloatPoint(x(), y());291 FloatPoint InlineBox::locationIncludingFlipping() const 292 { 293 if (!m_renderer.style().isFlippedBlocksWritingMode()) 294 return topLeft(); 295 295 RenderBlockFlow& block = root().blockFlow(); 296 296 if (block.style().isHorizontalWritingMode()) 297 return FloatPoint(x(), block.height() - height() - y()); 298 else 299 return FloatPoint(block.width() - width() - x(), y()); 300 } 301 302 void InlineBox::flipForWritingMode(FloatRect& rect) 297 return { x(), block.height() - height() - y() }; 298 return { block.width() - width() - x(), y() }; 299 } 300 301 void InlineBox::flipForWritingMode(FloatRect& rect) const 303 302 { 304 303 if (!m_renderer.style().isFlippedBlocksWritingMode()) … … 307 306 } 308 307 309 FloatPoint InlineBox::flipForWritingMode(const FloatPoint& point) 308 FloatPoint InlineBox::flipForWritingMode(const FloatPoint& point) const 310 309 { 311 310 if (!m_renderer.style().isFlippedBlocksWritingMode()) … … 314 313 } 315 314 316 void InlineBox::flipForWritingMode(LayoutRect& rect) 315 void InlineBox::flipForWritingMode(LayoutRect& rect) const 317 316 { 318 317 if (!m_renderer.style().isFlippedBlocksWritingMode()) … … 321 320 } 322 321 323 LayoutPoint InlineBox::flipForWritingMode(const LayoutPoint& point) 322 LayoutPoint InlineBox::flipForWritingMode(const LayoutPoint& point) const 324 323 { 325 324 if (!m_renderer.style().isFlippedBlocksWritingMode()) -
trunk/Source/WebCore/rendering/InlineBox.h
r220503 r223260 255 255 } 256 256 257 FloatPoint locationIncludingFlipping() ;258 void flipForWritingMode(FloatRect&) ;259 FloatPoint flipForWritingMode(const FloatPoint&) ;260 void flipForWritingMode(LayoutRect&) ;261 LayoutPoint flipForWritingMode(const LayoutPoint&) ;257 FloatPoint locationIncludingFlipping() const; 258 void flipForWritingMode(FloatRect&) const; 259 FloatPoint flipForWritingMode(const FloatPoint&) const; 260 void flipForWritingMode(LayoutRect&) const; 261 LayoutPoint flipForWritingMode(const LayoutPoint&) const; 262 262 263 263 bool knownToHaveNoOverflow() const { return m_bitfields.knownToHaveNoOverflow(); }
Note: See TracChangeset
for help on using the changeset viewer.