Title: [289767] trunk/Source/WebCore
Revision
289767
Author
[email protected]
Date
2022-02-14 14:48:41 -0800 (Mon, 14 Feb 2022)

Log Message

[GPU Process] Implement GraphicsContext::drawLineForText() in terms of GraphicsContext::drawLinesForText()
https://bugs.webkit.org/show_bug.cgi?id=236464

Reviewed by Simon Fraser.

Make GraphicsContext::drawLineForText() non virtual and delete all the
super classes' implementations for this function since it calls the virtual
function drawLinesForText().

* platform/graphics/GraphicsContext.h:
* platform/graphics/NullGraphicsContext.h:
* platform/graphics/displaylists/DisplayListRecorder.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (289766 => 289767)


--- trunk/Source/WebCore/ChangeLog	2022-02-14 22:46:48 UTC (rev 289766)
+++ trunk/Source/WebCore/ChangeLog	2022-02-14 22:48:41 UTC (rev 289767)
@@ -1,3 +1,18 @@
+2022-02-14  Said Abou-Hallawa  <[email protected]>
+
+        [GPU Process] Implement GraphicsContext::drawLineForText() in terms of GraphicsContext::drawLinesForText()
+        https://bugs.webkit.org/show_bug.cgi?id=236464
+
+        Reviewed by Simon Fraser.
+
+        Make GraphicsContext::drawLineForText() non virtual and delete all the
+        super classes' implementations for this function since it calls the virtual
+        function drawLinesForText().
+
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/NullGraphicsContext.h:
+        * platform/graphics/displaylists/DisplayListRecorder.h:
+
 2022-02-14  Wenson Hsieh  <[email protected]>
 
         [Live Text] Plumb platform image analysis objects to the web process

Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (289766 => 289767)


--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h	2022-02-14 22:46:48 UTC (rev 289766)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h	2022-02-14 22:48:41 UTC (rev 289767)
@@ -476,7 +476,7 @@
     }
 
     WEBCORE_EXPORT FloatRect computeUnderlineBoundsForText(const FloatRect&, bool printing);
-    WEBCORE_EXPORT virtual void drawLineForText(const FloatRect&, bool printing, bool doubleLines = false, StrokeStyle = SolidStroke);
+    WEBCORE_EXPORT void drawLineForText(const FloatRect&, bool printing, bool doubleLines = false, StrokeStyle = SolidStroke);
     virtual void drawLinesForText(const FloatPoint&, float thickness, const DashArray& widths, bool printing, bool doubleLines = false, StrokeStyle = SolidStroke) = 0;
     virtual void drawDotsForDocumentMarker(const FloatRect&, DocumentMarkerLineStyle) = 0;
 

Modified: trunk/Source/WebCore/platform/graphics/NullGraphicsContext.h (289766 => 289767)


--- trunk/Source/WebCore/platform/graphics/NullGraphicsContext.h	2022-02-14 22:46:48 UTC (rev 289766)
+++ trunk/Source/WebCore/platform/graphics/NullGraphicsContext.h	2022-02-14 22:48:41 UTC (rev 289767)
@@ -84,7 +84,6 @@
     void strokeRect(const FloatRect&, float) final { }
     void clipPath(const Path&, WindRule = WindRule::EvenOdd) final { }
     FloatRect roundToDevicePixels(const FloatRect& rect, RoundingMode = RoundAllSides) final { return rect; }
-    void drawLineForText(const FloatRect&, bool, bool = false, StrokeStyle = SolidStroke) final { }
     void drawLinesForText(const FloatPoint&, float, const DashArray&, bool, bool = false, StrokeStyle = SolidStroke) final { }
     void setLineCap(LineCap) final { }
     void setLineDash(const DashArray&, float) final { }

Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h (289766 => 289767)


--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h	2022-02-14 22:46:48 UTC (rev 289766)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h	2022-02-14 22:48:41 UTC (rev 289767)
@@ -187,7 +187,6 @@
 #endif
 
     void fillRoundedRectImpl(const FloatRoundedRect&, const Color&) final { ASSERT_NOT_REACHED(); }
-    void drawLineForText(const FloatRect&, bool, bool, StrokeStyle) final { ASSERT_NOT_REACHED(); }
 
     WEBCORE_EXPORT const GraphicsContextState& state() const final;
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to