Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h (283899 => 283900)
--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h 2021-10-11 16:13:30 UTC (rev 283899)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h 2021-10-11 16:18:43 UTC (rev 283900)
@@ -72,7 +72,7 @@
static constexpr bool isInlineItem = true;
static constexpr bool isDrawingItem = false;
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
};
class Restore {
@@ -81,7 +81,7 @@
static constexpr bool isInlineItem = true;
static constexpr bool isDrawingItem = false;
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
};
class Translate {
@@ -99,7 +99,7 @@
float x() const { return m_x; }
float y() const { return m_y; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
float m_x { 0 };
@@ -119,7 +119,7 @@
float angle() const { return m_angle; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
float m_angle { 0 }; // In radians.
@@ -138,7 +138,7 @@
const FloatSize& amount() const { return m_size; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
FloatSize m_size;
@@ -157,7 +157,7 @@
const AffineTransform& transform() const { return m_transform; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
AffineTransform m_transform;
@@ -176,7 +176,7 @@
const AffineTransform& transform() const { return m_transform; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
AffineTransform m_transform;
@@ -194,7 +194,7 @@
}
Color color() const { return { m_colorData }; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
SRGBA<uint8_t> m_colorData;
@@ -213,7 +213,7 @@
Color color() const { return { m_colorData }; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
SRGBA<uint8_t> m_colorData;
@@ -232,7 +232,7 @@
float thickness() const { return m_thickness; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
float m_thickness { 0 };
@@ -255,7 +255,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<SetState> decode(Decoder&);
- void apply(GraphicsContext&, NativeImage* strokePatternImage, NativeImage* fillPatternImage);
+ WEBCORE_EXPORT void apply(GraphicsContext&, NativeImage* strokePatternImage, NativeImage* fillPatternImage);
private:
struct PatternData {
@@ -579,7 +579,7 @@
LineCap lineCap() const { return m_lineCap; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
LineCap m_lineCap;
@@ -600,7 +600,7 @@
const DashArray& dashArray() const { return m_dashArray; }
float dashOffset() const { return m_dashOffset; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<SetLineDash> decode(Decoder&);
@@ -646,7 +646,7 @@
LineJoin lineJoin() const { return m_lineJoin; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
LineJoin m_lineJoin;
@@ -665,7 +665,7 @@
float miterLimit() const { return m_miterLimit; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
float m_miterLimit;
@@ -677,7 +677,7 @@
static constexpr bool isInlineItem = true;
static constexpr bool isDrawingItem = false;
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
};
// FIXME: treat as drawing item?
@@ -694,7 +694,7 @@
const FloatRect& rect() const { return m_rect; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
FloatRect m_rect;
@@ -713,7 +713,7 @@
const FloatRect& rect() const { return m_rect; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
FloatRect m_rect;
@@ -735,7 +735,7 @@
FloatRect destinationRect() const { return m_destinationRect; }
bool isValid() const { return m_imageBufferIdentifier.isValid(); }
- void apply(GraphicsContext&, WebCore::ImageBuffer&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&, WebCore::ImageBuffer&) const;
NO_RETURN_DUE_TO_ASSERT void apply(GraphicsContext&) const;
@@ -765,7 +765,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<ClipOutToPath> decode(Decoder&);
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
Path m_path;
@@ -809,7 +809,7 @@
const Path& path() const { return m_path; }
WindRule windRule() const { return m_windRule; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<ClipPath> decode(Decoder&);
@@ -924,10 +924,10 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<DrawGlyphs> decode(Decoder&);
- DrawGlyphs(const Font&, const GlyphBufferGlyph*, const GlyphBufferAdvance*, unsigned count, const FloatPoint& localAnchor, FontSmoothingMode);
+ WEBCORE_EXPORT DrawGlyphs(const Font&, const GlyphBufferGlyph*, const GlyphBufferAdvance*, unsigned count, const FloatPoint& localAnchor, FontSmoothingMode);
WEBCORE_EXPORT DrawGlyphs(RenderingResourceIdentifier, Vector<GlyphBufferGlyph, 128>&&, Vector<GlyphBufferAdvance, 128>&&, const FloatRect&, const FloatPoint& localAnchor, FontSmoothingMode);
- void apply(GraphicsContext&, const Font&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&, const Font&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_bounds; }
@@ -1014,7 +1014,7 @@
// FIXME: We might want to validate ImagePaintingOptions.
bool isValid() const { return m_imageBufferIdentifier.isValid(); }
- void apply(GraphicsContext&, WebCore::ImageBuffer&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&, WebCore::ImageBuffer&) const;
NO_RETURN_DUE_TO_ASSERT void apply(GraphicsContext&) const;
@@ -1050,7 +1050,7 @@
bool isValid() const { return m_imageIdentifier.isValid(); }
NO_RETURN_DUE_TO_ASSERT void apply(GraphicsContext&) const;
- void apply(GraphicsContext&, NativeImage&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&, NativeImage&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_destinationRect; }
@@ -1082,7 +1082,7 @@
bool isValid() const { return m_imageIdentifier.isValid(); }
NO_RETURN_DUE_TO_ASSERT void apply(GraphicsContext&) const;
- void apply(GraphicsContext&, NativeImage&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&, NativeImage&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_destination; }
@@ -1111,7 +1111,7 @@
float opacity() const { return m_opacity; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return std::nullopt; }
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
@@ -1126,7 +1126,7 @@
static constexpr bool isInlineItem = true;
static constexpr bool isDrawingItem = true;
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return std::nullopt; }
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
@@ -1147,7 +1147,7 @@
FloatRect rect() const { return m_rect; }
float borderThickness() const { return m_borderThickness; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_rect; }
@@ -1172,7 +1172,7 @@
FloatPoint point1() const { return m_point1; }
FloatPoint point2() const { return m_point2; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const;
@@ -1199,7 +1199,7 @@
bool isPrinting() const { return m_printing; }
bool doubleLines() const { return m_doubleLines; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const;
@@ -1289,7 +1289,7 @@
FloatRect rect() const { return m_rect; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const;
@@ -1313,7 +1313,7 @@
FloatRect rect() const { return m_rect; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_rect; }
@@ -1343,7 +1343,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<DrawPath> decode(Decoder&);
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_path.fastBoundingRect(); }
@@ -1399,7 +1399,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<DrawFocusRingPath> decode(Decoder&);
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const;
@@ -1459,7 +1459,7 @@
float offset() const { return m_offset; }
const Color& color() const { return m_color; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const;
@@ -1522,7 +1522,7 @@
const FloatRect& rect() const { return m_rect; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_rect; }
@@ -1546,7 +1546,7 @@
FloatRect rect() const { return m_rect; }
const Color& color() const { return m_color; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_rect; }
@@ -1593,7 +1593,7 @@
const FloatRect& rect() const { return m_rect; }
const Gradient& gradient() const { return m_gradient.get(); }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_rect; }
@@ -1647,7 +1647,7 @@
CompositeOperator compositeOperator() const { return m_op; }
BlendMode blendMode() const { return m_blendMode; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_rect; }
@@ -1717,7 +1717,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<FillRoundedRect> decode(Decoder&);
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_rect.rect(); }
@@ -1777,7 +1777,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<FillRectWithRoundedHole> decode(Decoder&);
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_rect; }
@@ -1831,7 +1831,7 @@
}
Path path() const { return Path::from({m_lineData}); }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return path().fastBoundingRect(); }
@@ -1851,7 +1851,7 @@
}
Path path() const { return Path::from({m_arcData}); }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return path().fastBoundingRect(); }
@@ -1871,7 +1871,7 @@
}
Path path() const { return Path::from({m_quadCurveData}); }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return path().fastBoundingRect(); }
@@ -1891,7 +1891,7 @@
}
Path path() const { return Path::from({m_bezierCurveData}); }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return path().fastBoundingRect(); }
@@ -1922,7 +1922,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<FillPath> decode(Decoder&);
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_path.fastBoundingRect(); }
@@ -1961,7 +1961,7 @@
FloatRect rect() const { return m_rect; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_rect; }
@@ -2131,7 +2131,7 @@
FloatRect rect() const { return m_rect; }
float lineWidth() const { return m_lineWidth; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const;
@@ -2163,7 +2163,7 @@
FloatPoint start() const { return m_start; }
FloatPoint end() const { return m_end; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const;
@@ -2187,7 +2187,7 @@
}
Path path() const { return Path::from({m_arcData}); }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const;
@@ -2207,7 +2207,7 @@
}
Path path() const { return Path::from({m_quadCurveData}); }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const;
@@ -2227,7 +2227,7 @@
}
Path path() const { return Path::from({m_bezierCurveData}); }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const;
@@ -2258,7 +2258,7 @@
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<StrokePath> decode(Decoder&);
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const;
@@ -2297,7 +2297,7 @@
const FloatRect& rect() const { return m_rect; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const;
@@ -2319,7 +2319,7 @@
const FloatRect& rect() const { return m_rect; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
std::optional<FloatRect> globalBounds() const { return std::nullopt; }
std::optional<FloatRect> localBounds(const GraphicsContext&) const { return m_rect; }
@@ -2336,7 +2336,7 @@
static constexpr bool isInlineItem = true;
static constexpr bool isDrawingItem = false;
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
};
class ApplyFillPattern {
@@ -2345,7 +2345,7 @@
static constexpr bool isInlineItem = true;
static constexpr bool isDrawingItem = false;
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
};
#endif
@@ -2363,7 +2363,7 @@
float scaleFactor() const { return m_scaleFactor; }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
float m_scaleFactor { 1 };
@@ -2383,7 +2383,7 @@
GraphicsContextFlushIdentifier identifier() const { return m_identifier; }
bool isValid() const { return m_identifier.isValid(); }
- void apply(GraphicsContext&) const;
+ WEBCORE_EXPORT void apply(GraphicsContext&) const;
private:
GraphicsContextFlushIdentifier m_identifier;