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

Unified Diff: sky/engine/core/rendering/shapes/ShapeInterval.h

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/Shape.cpp ('k') | sky/engine/core/rendering/shapes/ShapeOutsideInfo.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/shapes/ShapeInterval.h
diff --git a/sky/engine/core/rendering/shapes/ShapeInterval.h b/sky/engine/core/rendering/shapes/ShapeInterval.h
deleted file mode 100644
index e6ce2dae8fc4e00043d3ced6854226177199375d..0000000000000000000000000000000000000000
--- a/sky/engine/core/rendering/shapes/ShapeInterval.h
+++ /dev/null
@@ -1,110 +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.
- */
-
-#ifndef ShapeInterval_h
-#define ShapeInterval_h
-
-#include "wtf/Vector.h"
-
-namespace blink {
-
-template <typename T>
-class ShapeInterval {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- ShapeInterval()
- : m_x1(-1)
- , m_x2(-2)
- {
- // The initial values of m_x1,x2 don't matter (unless you're looking
- // at them in the debugger) so long as isUndefined() is true.
- ASSERT(isUndefined());
- }
-
- ShapeInterval(T x1, T x2)
- : m_x1(x1)
- , m_x2(x2)
- {
- ASSERT(x2 >= x1);
- }
-
- bool isUndefined() const { return m_x2 < m_x1; }
- T x1() const { return isUndefined() ? 0 : m_x1; }
- T x2() const { return isUndefined() ? 0 : m_x2; }
- T width() const { return isUndefined() ? 0 : m_x2 - m_x1; }
- bool isEmpty() const { return isUndefined() ? true : m_x1 == m_x2; }
-
- void set(T x1, T x2)
- {
- ASSERT(x2 >= x1);
- m_x1 = x1;
- m_x2 = x2;
- }
-
- bool overlaps(const ShapeInterval<T>& interval) const
- {
- if (isUndefined() || interval.isUndefined())
- return false;
- return x2() >= interval.x1() && x1() <= interval.x2();
- }
-
- bool contains(const ShapeInterval<T>& interval) const
- {
- if (isUndefined() || interval.isUndefined())
- return false;
- return x1() <= interval.x1() && x2() >= interval.x2();
- }
-
- bool operator==(const ShapeInterval<T>& other) const { return x1() == other.x1() && x2() == other.x2(); }
- bool operator!=(const ShapeInterval<T>& other) const { return !operator==(other); }
-
- void unite(const ShapeInterval<T>& interval)
- {
- if (interval.isUndefined())
- return;
- if (isUndefined())
- set(interval.x1(), interval.x2());
- else
- set(std::min<T>(x1(), interval.x1()), std::max<T>(x2(), interval.x2()));
- }
-
-private:
- T m_x1;
- T m_x2;
-};
-
-typedef ShapeInterval<int> IntShapeInterval;
-typedef ShapeInterval<float> FloatShapeInterval;
-
-typedef Vector<IntShapeInterval> IntShapeIntervals;
-typedef Vector<FloatShapeInterval> FloatShapeIntervals;
-
-} // namespace blink
-
-#endif // ShapeInterval_h
« no previous file with comments | « sky/engine/core/rendering/shapes/Shape.cpp ('k') | sky/engine/core/rendering/shapes/ShapeOutsideInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698