Changeset 283331 in webkit

Timestamp:

Sep 30, 2021, 1:21:45 PM (5 years ago)

Author:

Devin Rousso

Message:

[GPU Process] support rendering Apple Pay buttons
​https://bugs.webkit.org/show_bug.cgi?id=230648
<rdar://problem/72061985>

Reviewed by Tim Horton.

• rendering/RenderThemeCocoa.mm:

(WebCore::RenderThemeCocoa::paintApplePayButton):
Instead of drawing directly into the GraphicsContext::platformContext (which will not be
valid in the WebProcess when DOM rendering happens in the GPUProcess), first draw into a
temporary ImageBuffer and then consume it to draw into the actual/used GraphicsContext.
While it is possible to create a dedicated display list item for this, we don't want to do
that because PKDrawApplePayButtonWithCornerRadius involves dealing with PDFs, which are
not as secure as we'd like for use in the GPUProcess.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/displaylists/DisplayListRecorder.cpp (modified) (1 diff)
• rendering/RenderThemeCocoa.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-30  Devin Rousso  <drousso@apple.com>
+
+        [GPU Process] support rendering Apple Pay buttons
+        https://bugs.webkit.org/show_bug.cgi?id=230648
+        <rdar://problem/72061985>
+
+        Reviewed by Tim Horton.
+
+        * rendering/RenderThemeCocoa.mm:
+        (WebCore::RenderThemeCocoa::paintApplePayButton):
+        Instead of drawing directly into the `GraphicsContext::platformContext` (which will not be
+        valid in the WebProcess when DOM rendering happens in the GPUProcess), first draw into a
+        temporary `ImageBuffer` and then consume it to draw into the actual/used `GraphicsContext`.
+        While it is possible to create a dedicated display list item for this, we don't want to do
+        that because `PKDrawApplePayButtonWithCornerRadius` involves dealing with PDFs, which are
+        not as secure as we'd like for use in the GPUProcess.
+
 2021-09-30  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp

@@ -278 +278 @@
 AffineTransform Recorder::getCTM(GraphicsContext::IncludeDeviceScale) const
 {
-    // FIXME: Respect the given value of IncludeDeviceScale.
+    // FIXME: <https://webkit.org/b/230647> ([GPU Process] add support for `IncludeDeviceScale` inside `DisplayList::Recorder::getCTM`)
     return currentState().ctm;
 }

trunk/Source/WebCore/rendering/RenderThemeCocoa.mm

@@ -29 +29 @@
 #import "GraphicsContextCG.h"
 #import "HTMLInputElement.h"
+#import "ImageBuffer.h"
 #import "RenderText.h"
 #import "UserAgentScripts.h"
@@ -152 +153 @@
 bool RenderThemeCocoa::paintApplePayButton(const RenderObject& renderer, const PaintInfo& paintInfo, const IntRect& paintRect)
 {
-    GraphicsContextStateSaver stateSaver(paintInfo.context());
-
-    paintInfo.context().setShouldSmoothFonts(true);
-    paintInfo.context().scale(FloatSize(1, -1));
+    auto& destinationContext = paintInfo.context();
+
+    auto imageBuffer = ImageBuffer::createCompatibleBuffer(paintRect.size(), destinationContext);
+    if (!imageBuffer)
+        return false;
 
     auto& style = renderer.style();
@@ -169 +171 @@
     });
 
-    PKDrawApplePayButtonWithCornerRadius(paintInfo.context().platformContext(), CGRectMake(paintRect.x(), -paintRect.maxY(), paintRect.width(), paintRect.height()), 1.0, largestCornerRadius, toPKPaymentButtonType(style.applePayButtonType()), toPKPaymentButtonStyle(style.applePayButtonStyle()), style.computedLocale());
+    auto& imageContext = imageBuffer->context();
+    imageContext.setShouldSmoothFonts(true);
+    imageContext.setShouldSubpixelQuantizeFonts(false);
+    imageContext.scale(FloatSize(1, -1));
+    PKDrawApplePayButtonWithCornerRadius(imageContext.platformContext(), CGRectMake(0, -paintRect.height(), paintRect.width(), paintRect.height()), 1.0, largestCornerRadius, toPKPaymentButtonType(style.applePayButtonType()), toPKPaymentButtonStyle(style.applePayButtonStyle()), style.computedLocale());
+
+    destinationContext.drawConsumingImageBuffer(WTFMove(imageBuffer), paintRect);
     return false;
 }