Title: [282528] releases/WebKitGTK/webkit-2.32/Source/WebCore
- Revision
- 282528
- Author
- [email protected]
- Date
- 2021-09-16 03:09:30 -0700 (Thu, 16 Sep 2021)
Log Message
Merge r277915 - Detect invalid InlinePathData in StrokeInlinePath
https://bugs.webkit.org/show_bug.cgi?id=225691
Patch by Rob Buis <[email protected]> on 2021-05-22
Reviewed by Ryosuke Niwa.
Detect invalid InlinePathData in StrokeInlinePath.
* platform/graphics/displaylists/DisplayListItems.h:
(WebCore::DisplayList::StrokeInlinePath::StrokeInlinePath):
(WebCore::DisplayList::StrokeInlinePath::path const): Deleted.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (282527 => 282528)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-09-16 10:09:24 UTC (rev 282527)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-09-16 10:09:30 UTC (rev 282528)
@@ -1,3 +1,16 @@
+2021-05-22 Rob Buis <[email protected]>
+
+ Detect invalid InlinePathData in StrokeInlinePath
+ https://bugs.webkit.org/show_bug.cgi?id=225691
+
+ Reviewed by Ryosuke Niwa.
+
+ Detect invalid InlinePathData in StrokeInlinePath.
+
+ * platform/graphics/displaylists/DisplayListItems.h:
+ (WebCore::DisplayList::StrokeInlinePath::StrokeInlinePath):
+ (WebCore::DisplayList::StrokeInlinePath::path const): Deleted.
+
2021-05-21 Rob Buis <[email protected]>
Detect invalid InlinePathData in FillInlinePath
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h (282527 => 282528)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h 2021-09-16 10:09:24 UTC (rev 282527)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h 2021-09-16 10:09:30 UTC (rev 282528)
@@ -2071,26 +2071,26 @@
#if ENABLE(INLINE_PATH_DATA)
-class StrokeInlinePath {
+class StrokeInlinePath : public InlinePathDataStorage {
public:
static constexpr ItemType itemType = ItemType::StrokeInlinePath;
static constexpr bool isInlineItem = true;
static constexpr bool isDrawingItem = true;
+ StrokeInlinePath(const StrokeInlinePath& other)
+ : InlinePathDataStorage(other.m_pathData)
+ {
+ }
+
StrokeInlinePath(const InlinePathData& pathData)
- : m_pathData(pathData)
+ : InlinePathDataStorage(pathData)
{
}
- Path path() const { return Path::from(m_pathData); }
-
void apply(GraphicsContext&) const;
Optional<FloatRect> globalBounds() const { return WTF::nullopt; }
Optional<FloatRect> localBounds(const GraphicsContext&) const;
-
-private:
- InlinePathData m_pathData;
};
#endif // ENABLE(INLINE_PATH_DATA)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
