Modified: trunk/Source/WebCore/ChangeLog (253094 => 253095)
--- trunk/Source/WebCore/ChangeLog 2019-12-04 06:30:19 UTC (rev 253094)
+++ trunk/Source/WebCore/ChangeLog 2019-12-04 08:02:03 UTC (rev 253095)
@@ -1,3 +1,17 @@
+2019-12-04 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build
+
+ * platform/graphics/displaylists/DisplayListItems.h:
+ (WebCore::DisplayList::DrawRect::decode):
+ (WebCore::DisplayList::DrawPath::decode):
+ (WebCore::DisplayList::FillRect::decode):
+ (WebCore::DisplayList::FillRectWithColor::decode):
+ (WebCore::DisplayList::FillCompositedRect::decode):
+ (WebCore::DisplayList::FillPath::decode):
+ (WebCore::DisplayList::ClearRect::decode):
+ Some deleted stuff leaked into the patch.
+
2019-12-03 Daniel Bates <daba...@apple.com>
Remove unused DragController::client()
Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h (253094 => 253095)
--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h 2019-12-04 06:30:19 UTC (rev 253094)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h 2019-12-04 08:02:03 UTC (rev 253095)
@@ -955,12 +955,7 @@
if (!borderThickness)
return WTF::nullopt;
- auto item = DrawRect::create(*rect, *borderThickness);
-
- if (!decodeForDrawingItem(decoder, item.get()))
- return WTF::nullopt;
-
- return item;
+ return DrawRect::create(*rect, *borderThickness);
}
class DrawLine : public DrawingItem {
@@ -1113,12 +1108,7 @@
if (!path)
return WTF::nullopt;
- auto item = DrawPath::create(*path);
-
- if (!decodeForDrawingItem(decoder, item.get()))
- return WTF::nullopt;
-
- return item;
+ return DrawPath::create(*path);
}
class DrawFocusRingPath : public DrawingItem {
@@ -1222,12 +1212,7 @@
if (!rect)
return WTF::nullopt;
- auto item = FillRect::create(*rect);
-
- if (!decodeForDrawingItem(decoder, item.get()))
- return WTF::nullopt;
-
- return item;
+ return FillRect::create(*rect);
}
// FIXME: Make these inherit from FillRect proper.
@@ -1276,12 +1261,7 @@
if (!color)
return WTF::nullopt;
- auto item = FillRectWithColor::create(*rect, *color);
-
- if (!decodeForDrawingItem(decoder, item.get()))
- return WTF::nullopt;
-
- return item;
+ return FillRectWithColor::create(*rect, *color);
}
class FillRectWithGradient : public DrawingItem {
@@ -1369,12 +1349,7 @@
if (!blendMode)
return WTF::nullopt;
- auto item = FillCompositedRect::create(*rect, *color, *op, *blendMode);
-
- if (!decodeForDrawingItem(decoder, item.get()))
- return WTF::nullopt;
-
- return item;
+ return FillCompositedRect::create(*rect, *color, *op, *blendMode);
}
class FillRoundedRect : public DrawingItem {
@@ -1470,12 +1445,7 @@
if (!path)
return WTF::nullopt;
- auto item = FillPath::create(*path);
-
- if (!decodeForDrawingItem(decoder, item.get()))
- return WTF::nullopt;
-
- return item;
+ return FillPath::create(*path);
}
class FillEllipse : public DrawingItem {
@@ -1608,12 +1578,7 @@
if (!rect)
return WTF::nullopt;
- auto item = ClearRect::create(*rect);
-
- if (!decodeForDrawingItem(decoder, item.get()))
- return WTF::nullopt;
-
- return item;
+ return ClearRect::create(*rect);
}
#if USE(CG)
