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

Unified Diff: sky/engine/core/rendering/shapes/BoxShape.cpp

Issue 703563002: Remove shape-outside. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/rendering/shapes/BoxShape.h ('k') | sky/engine/core/rendering/shapes/BoxShapeTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/shapes/BoxShape.cpp
diff --git a/sky/engine/core/rendering/shapes/BoxShape.cpp b/sky/engine/core/rendering/shapes/BoxShape.cpp
deleted file mode 100644
index 54417d2ba51a54b2e3a09222098ad67ccf42415d..0000000000000000000000000000000000000000
--- a/sky/engine/core/rendering/shapes/BoxShape.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "core/rendering/shapes/BoxShape.h"
-
-#include "wtf/MathExtras.h"
-
-namespace blink {
-
-LayoutRect BoxShape::shapeMarginLogicalBoundingBox() const
-{
- FloatRect marginBounds(m_bounds.rect());
- if (shapeMargin() > 0)
- marginBounds.inflate(shapeMargin());
- return static_cast<LayoutRect>(marginBounds);
-}
-
-FloatRoundedRect BoxShape::shapeMarginBounds() const
-{
- FloatRoundedRect marginBounds(m_bounds);
- if (shapeMargin() > 0) {
- marginBounds.inflate(shapeMargin());
- marginBounds.expandRadii(shapeMargin());
- }
- return marginBounds;
-}
-
-LineSegment BoxShape::getExcludedInterval(LayoutUnit logicalTop, LayoutUnit logicalHeight) const
-{
- const FloatRoundedRect& marginBounds = shapeMarginBounds();
- if (marginBounds.isEmpty() || !lineOverlapsShapeMarginBounds(logicalTop, logicalHeight))
- return LineSegment();
-
- float y1 = logicalTop.toFloat();
- float y2 = (logicalTop + logicalHeight).toFloat();
- const FloatRect& rect = marginBounds.rect();
-
- if (!marginBounds.isRounded())
- return LineSegment(marginBounds.rect().x(), marginBounds.rect().maxX());
-
- float topCornerMaxY = std::max<float>(marginBounds.topLeftCorner().maxY(), marginBounds.topRightCorner().maxY());
- float bottomCornerMinY = std::min<float>(marginBounds.bottomLeftCorner().y(), marginBounds.bottomRightCorner().y());
-
- if (topCornerMaxY <= bottomCornerMinY && y1 <= topCornerMaxY && y2 >= bottomCornerMinY)
- return LineSegment(rect.x(), rect.maxX());
-
- float x1 = rect.maxX();
- float x2 = rect.x();
- float minXIntercept;
- float maxXIntercept;
-
- if (y1 <= marginBounds.topLeftCorner().maxY() && y2 >= marginBounds.bottomLeftCorner().y())
- x1 = rect.x();
-
- if (y1 <= marginBounds.topRightCorner().maxY() && y2 >= marginBounds.bottomRightCorner().y())
- x2 = rect.maxX();
-
- if (marginBounds.xInterceptsAtY(y1, minXIntercept, maxXIntercept)) {
- x1 = std::min<float>(x1, minXIntercept);
- x2 = std::max<float>(x2, maxXIntercept);
- }
-
- if (marginBounds.xInterceptsAtY(y2, minXIntercept, maxXIntercept)) {
- x1 = std::min<float>(x1, minXIntercept);
- x2 = std::max<float>(x2, maxXIntercept);
- }
-
- ASSERT(x2 >= x1);
- return LineSegment(x1, x2);
-}
-
-void BoxShape::buildDisplayPaths(DisplayPaths& paths) const
-{
- paths.shape.addRoundedRect(m_bounds.rect(), m_bounds.radii().topLeft(), m_bounds.radii().topRight(), m_bounds.radii().bottomLeft(), m_bounds.radii().bottomRight());
- if (shapeMargin())
- paths.marginShape.addRoundedRect(shapeMarginBounds().rect(), shapeMarginBounds().radii().topLeft(), shapeMarginBounds().radii().topRight(), shapeMarginBounds().radii().bottomLeft(), shapeMarginBounds().radii().bottomRight());
-}
-
-} // namespace blink
« no previous file with comments | « sky/engine/core/rendering/shapes/BoxShape.h ('k') | sky/engine/core/rendering/shapes/BoxShapeTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698