X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=Source%2FWebCore%2Fplatform%2Fgraphics%2Fdisplaylists%2FDisplayListItems.h;h=5065f3829716a15d6ec2a33ef5760b4944766cb1;hp=07d2d5f2dcbaf4358e4123f9c4bfd8e83b7c25ea;hb=eaecb099d59420fea0892021ce00b51d7df52d3c;hpb=146c491b78cb7d98cb75cb1bb68c1998cd2fc46c diff --git a/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h b/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h index 07d2d5f..5065f38 100644 --- a/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h +++ b/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h @@ -64,7 +64,6 @@ enum class ItemType { ClipOut, ClipOutToPath, ClipPath, - ClipConvexPolygon, DrawGlyphs, DrawImage, DrawTiledImage, @@ -78,7 +77,6 @@ enum class ItemType { DrawLinesForText, DrawLineForDocumentMarker, DrawEllipse, - DrawConvexPolygon, DrawPath, DrawFocusRingPath, DrawFocusRingRects, @@ -522,25 +520,6 @@ private: WindRule m_windRule; }; -class ClipConvexPolygon : public Item { -public: - static Ref create(size_t numberOfPoints, const FloatPoint* points, bool antialiased) - { - return adoptRef(*new ClipConvexPolygon(numberOfPoints, points, antialiased)); - } - - const Vector& points() const { return m_points; } - bool antialias() const { return m_antialias; } - -private: - ClipConvexPolygon(size_t numberOfPoints, const FloatPoint*, bool antialiased); - - virtual void apply(GraphicsContext&) const override; - - Vector m_points; - bool m_antialias; -}; - class DrawGlyphs : public DrawingItem { public: static Ref create(const Font& font, const GlyphBufferGlyph* glyphs, const GlyphBufferAdvance* advances, unsigned count, const FloatPoint& blockLocation, const FloatSize& localAnchor, FontSmoothingMode smoothingMode) @@ -897,26 +876,6 @@ private: FloatRect m_rect; }; -class DrawConvexPolygon : public DrawingItem { -public: - static Ref create(size_t numberOfPoints, const FloatPoint* points, bool antialiased) - { - return adoptRef(*new DrawConvexPolygon(numberOfPoints, points, antialiased)); - } - - const Vector& points() const { return m_points; } - bool antialiased() const { return m_antialiased; } - -private: - DrawConvexPolygon(size_t numberOfPoints, const FloatPoint*, bool antialiased); - - virtual void apply(GraphicsContext&) const override; - virtual Optional localBounds(const GraphicsContext&) const override; - - Vector m_points; - bool m_antialiased; -}; - class DrawPath : public DrawingItem { public: static Ref create(const Path& path) @@ -1355,9 +1314,6 @@ private: float m_scaleFactor; }; -// FIXME: this needs to move. -void addConvexPolygonToPath(Path&, size_t numPoints, const FloatPoint*); - TextStream& operator<<(TextStream&, const Item&); } // namespace DisplayList @@ -1391,7 +1347,6 @@ SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(Clip) SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(ClipOut) SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(ClipOutToPath) SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(ClipPath) -SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(ClipConvexPolygon) SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(DrawGlyphs) SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(DrawImage) SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(DrawTiledImage) @@ -1405,7 +1360,6 @@ SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(DrawLine) SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(DrawLinesForText) SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(DrawLineForDocumentMarker) SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(DrawEllipse) -SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(DrawConvexPolygon) SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(DrawPath) SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(DrawFocusRingPath) SPECIALIZE_TYPE_TRAITS_DISPLAYLIST_ITEM(DrawFocusRingRects)