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

Side by Side Diff: Source/core/rendering/shapes/ShapeOutsideInfo.cpp

Issue 669803002: Optimize for horizontal writing mode (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: w compile fix Created 6 years, 2 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) 2012 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2012 Adobe Systems Incorporated. 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 } 310 }
311 311
312 return m_shapeOutsideDeltas; 312 return m_shapeOutsideDeltas;
313 } 313 }
314 314
315 LayoutRect ShapeOutsideInfo::computedShapePhysicalBoundingBox() const 315 LayoutRect ShapeOutsideInfo::computedShapePhysicalBoundingBox() const
316 { 316 {
317 LayoutRect physicalBoundingBox = computedShape().shapeMarginLogicalBoundingB ox(); 317 LayoutRect physicalBoundingBox = computedShape().shapeMarginLogicalBoundingB ox();
318 physicalBoundingBox.setX(physicalBoundingBox.x() + logicalLeftOffset()); 318 physicalBoundingBox.setX(physicalBoundingBox.x() + logicalLeftOffset());
319 319
320 if (m_renderer.style()->isFlippedBlocksWritingMode()) 320 if (m_renderer.style()->slowIsFlippedBlocksWritingMode())
321 physicalBoundingBox.setY(m_renderer.logicalHeight() - physicalBoundingBo x.maxY()); 321 physicalBoundingBox.setY(m_renderer.logicalHeight() - physicalBoundingBo x.maxY());
322 else 322 else
323 physicalBoundingBox.setY(physicalBoundingBox.y() + logicalTopOffset()); 323 physicalBoundingBox.setY(physicalBoundingBox.y() + logicalTopOffset());
324 324
325 if (!m_renderer.style()->isHorizontalWritingMode()) 325 if (!m_renderer.style()->isHorizontalWritingMode())
326 physicalBoundingBox = physicalBoundingBox.transposedRect(); 326 physicalBoundingBox = physicalBoundingBox.transposedRect();
327 else 327 else
328 physicalBoundingBox.setY(physicalBoundingBox.y() + logicalTopOffset()); 328 physicalBoundingBox.setY(physicalBoundingBox.y() + logicalTopOffset());
329 329
330 return physicalBoundingBox; 330 return physicalBoundingBox;
331 } 331 }
332 332
333 FloatPoint ShapeOutsideInfo::shapeToRendererPoint(FloatPoint point) const 333 FloatPoint ShapeOutsideInfo::shapeToRendererPoint(FloatPoint point) const
334 { 334 {
335 FloatPoint result = FloatPoint(point.x() + logicalLeftOffset(), point.y() + logicalTopOffset()); 335 FloatPoint result = FloatPoint(point.x() + logicalLeftOffset(), point.y() + logicalTopOffset());
336 if (m_renderer.style()->isFlippedBlocksWritingMode()) 336 if (m_renderer.style()->slowIsFlippedBlocksWritingMode())
337 result.setY(m_renderer.logicalHeight() - result.y()); 337 result.setY(m_renderer.logicalHeight() - result.y());
338 if (!m_renderer.style()->isHorizontalWritingMode()) 338 if (!m_renderer.style()->isHorizontalWritingMode())
339 result = result.transposedPoint(); 339 result = result.transposedPoint();
340 return result; 340 return result;
341 } 341 }
342 342
343 FloatSize ShapeOutsideInfo::shapeToRendererSize(FloatSize size) const 343 FloatSize ShapeOutsideInfo::shapeToRendererSize(FloatSize size) const
344 { 344 {
345 if (!m_renderer.style()->isHorizontalWritingMode()) 345 if (!m_renderer.style()->isHorizontalWritingMode())
346 return size.transposedSize(); 346 return size.transposedSize();
347 return size; 347 return size;
348 } 348 }
349 349
350 } // namespace blink 350 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698