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

Unified Diff: sky/engine/core/rendering/shapes/RectangleShape.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/RectangleShape.h ('k') | sky/engine/core/rendering/shapes/Shape.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/shapes/RectangleShape.cpp
diff --git a/sky/engine/core/rendering/shapes/RectangleShape.cpp b/sky/engine/core/rendering/shapes/RectangleShape.cpp
deleted file mode 100644
index 53df7f979a9bfe3d47c706247f4981ec08a2c960..0000000000000000000000000000000000000000
--- a/sky/engine/core/rendering/shapes/RectangleShape.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2012 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/RectangleShape.h"
-
-#include "wtf/MathExtras.h"
-
-namespace blink {
-
-static inline float ellipseXIntercept(float y, float rx, float ry)
-{
- ASSERT(ry > 0);
- return rx * sqrt(1 - (y * y) / (ry * ry));
-}
-
-FloatRect RectangleShape::shapeMarginBounds() const
-{
- ASSERT(shapeMargin() >= 0);
- if (!shapeMargin())
- return m_bounds;
-
- float boundsX = x() - shapeMargin();
- float boundsY = y() - shapeMargin();
- float boundsWidth = width() + shapeMargin() * 2;
- float boundsHeight = height() + shapeMargin() * 2;
- return FloatRect(boundsX, boundsY, boundsWidth, boundsHeight);
-}
-
-LineSegment RectangleShape::getExcludedInterval(LayoutUnit logicalTop, LayoutUnit logicalHeight) const
-{
- const FloatRect& bounds = shapeMarginBounds();
- if (bounds.isEmpty())
- return LineSegment();
-
- float y1 = logicalTop.toFloat();
- float y2 = (logicalTop + logicalHeight).toFloat();
-
- if (y2 < bounds.y() || y1 >= bounds.maxY())
- return LineSegment();
-
- float x1 = bounds.x();
- float x2 = bounds.maxX();
-
- float marginRadiusX = rx() + shapeMargin();
- float marginRadiusY = ry() + shapeMargin();
-
- if (marginRadiusY > 0) {
- if (y2 < bounds.y() + marginRadiusY) {
- float yi = y2 - bounds.y() - marginRadiusY;
- float xi = ellipseXIntercept(yi, marginRadiusX, marginRadiusY);
- x1 = bounds.x() + marginRadiusX - xi;
- x2 = bounds.maxX() - marginRadiusX + xi;
- } else if (y1 > bounds.maxY() - marginRadiusY) {
- float yi = y1 - (bounds.maxY() - marginRadiusY);
- float xi = ellipseXIntercept(yi, marginRadiusX, marginRadiusY);
- x1 = bounds.x() + marginRadiusX - xi;
- x2 = bounds.maxX() - marginRadiusX + xi;
- }
- }
-
- return LineSegment(x1, x2);
-}
-
-void RectangleShape::buildDisplayPaths(DisplayPaths& paths) const
-{
- paths.shape.addRoundedRect(m_bounds, m_radii);
- if (shapeMargin())
- paths.marginShape.addRoundedRect(shapeMarginBounds(), FloatSize(m_radii.width() + shapeMargin(), m_radii.height() + shapeMargin()));
-}
-
-} // namespace blink
« no previous file with comments | « sky/engine/core/rendering/shapes/RectangleShape.h ('k') | sky/engine/core/rendering/shapes/Shape.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698