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

Unified Diff: Source/core/rendering/shapes/ShapeInsideInfo.h

Issue 209443007: Remove shape-inside support (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove now unused segmentIsEmpty Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/line/LineWidth.cpp ('k') | Source/core/rendering/shapes/ShapeInsideInfo.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/shapes/ShapeInsideInfo.h
diff --git a/Source/core/rendering/shapes/ShapeInsideInfo.h b/Source/core/rendering/shapes/ShapeInsideInfo.h
deleted file mode 100644
index ff618a27ae08ecfaa034eda0523df79366abf3a9..0000000000000000000000000000000000000000
--- a/Source/core/rendering/shapes/ShapeInsideInfo.h
+++ /dev/null
@@ -1,129 +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 HOLDER "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 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 ShapeInsideInfo_h
-#define ShapeInsideInfo_h
-
-#include "core/rendering/shapes/ShapeInfo.h"
-#include "wtf/PassOwnPtr.h"
-#include "wtf/Vector.h"
-
-namespace WebCore {
-
-class InlineIterator;
-class RenderBlock;
-class RenderObject;
-
-struct LineSegmentIterator {
- RenderObject* root;
- RenderObject* object;
- unsigned offset;
- LineSegmentIterator(RenderObject* root, RenderObject* object, unsigned offset)
- : root(root)
- , object(object)
- , offset(offset)
- {
- }
-};
-
-struct LineSegmentRange {
- LineSegmentIterator start;
- LineSegmentIterator end;
- LineSegmentRange(const InlineIterator& start, const InlineIterator& end);
-};
-
-typedef Vector<LineSegmentRange> SegmentRangeList;
-
-class ShapeInsideInfo FINAL : public ShapeInfo<RenderBlock> {
-public:
- static PassOwnPtr<ShapeInsideInfo> createInfo(const RenderBlock& renderer) { return adoptPtr(new ShapeInsideInfo(renderer)); }
- static bool isEnabledFor(const RenderBlock& renderer);
-
- bool updateSegmentsForLine(LayoutSize lineOffset, LayoutUnit lineHeight);
- bool updateSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight);
-
- bool hasSegments() const
- {
- return lineOverlapsShapeBounds() && m_segments.size();
- }
- const SegmentList& segments() const
- {
- ASSERT(hasSegments());
- return m_segments;
- }
- SegmentRangeList& segmentRanges() { return m_segmentRanges; }
- const SegmentRangeList& segmentRanges() const { return m_segmentRanges; }
- const LineSegment* currentSegment() const
- {
- if (!hasSegments())
- return 0;
- ASSERT(m_segmentRanges.size() < m_segments.size());
- return &m_segments[m_segmentRanges.size()];
- }
- void clearSegments() { m_segments.clear(); }
- bool adjustLogicalLineTop(float minSegmentWidth);
- LayoutUnit computeFirstFitPositionForFloat(const FloatSize&) const;
-
- void setNeedsLayout(bool value) { m_needsLayout = value; }
- bool needsLayout() { return m_needsLayout; }
-
- virtual bool lineOverlapsShapeBounds() const OVERRIDE
- {
- return computedShape().lineOverlapsShapePaddingBounds(m_referenceBoxLineTop, m_lineHeight);
- }
-
-protected:
- virtual LayoutBox referenceBox() const OVERRIDE
- {
- if (shapeValue()->layoutBox() == BoxMissing)
- return ContentBox;
- return shapeValue()->layoutBox();
- }
- virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return computedShape().shapePaddingLogicalBoundingBox(); }
- virtual ShapeValue* shapeValue() const OVERRIDE;
- virtual void getIntervals(LayoutUnit lineTop, LayoutUnit lineHeight, SegmentList& segments) const OVERRIDE
- {
- return computedShape().getIncludedIntervals(lineTop, lineHeight, segments);
- }
-
- virtual const RenderStyle* styleForWritingMode() const OVERRIDE;
-
-private:
- ShapeInsideInfo(const RenderBlock& renderer)
- : ShapeInfo<RenderBlock> (renderer)
- , m_needsLayout(false)
- { }
-
- SegmentRangeList m_segmentRanges;
- bool m_needsLayout;
- SegmentList m_segments;
-};
-
-}
-#endif
« no previous file with comments | « Source/core/rendering/line/LineWidth.cpp ('k') | Source/core/rendering/shapes/ShapeInsideInfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698