[webkit-changes] [277349] trunk/Source/WebKit

Tue, 11 May 2021 18:26:43 -0700

Title: [277349] trunk/Source/WebKit
Revision
277349
Author
timothy_hor...@apple.com
Date
2021-05-11 18:25:50 -0700 (Tue, 11 May 2021)

Log Message

Fix the CGDisplayListImageBufferBackend build
https://bugs.webkit.org/show_bug.cgi?id=225681

Unreviewed.


* Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.cpp:
(WebKit::CGDisplayListImageBufferBackend::getPixelBuffer const):
* Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.h:

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (277348 => 277349)


--- trunk/Source/WebKit/ChangeLog	2021-05-12 01:16:12 UTC (rev 277348)
+++ trunk/Source/WebKit/ChangeLog	2021-05-12 01:25:50 UTC (rev 277349)
@@ -1,3 +1,14 @@
+2021-05-11  Tim Horton  <timothy_hor...@apple.com>
+
+        Fix the CGDisplayListImageBufferBackend build
+        https://bugs.webkit.org/show_bug.cgi?id=225681
+
+        Unreviewed.
+
+        * Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.cpp:
+        (WebKit::CGDisplayListImageBufferBackend::getPixelBuffer const):
+        * Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.h:
+
 2021-05-11  Alex Christensen  <achristen...@webkit.org>
 
         Remove xpc_connection_kill

Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.cpp (277348 => 277349)


--- trunk/Source/WebKit/Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.cpp	2021-05-12 01:16:12 UTC (rev 277348)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.cpp	2021-05-12 01:25:50 UTC (rev 277349)
@@ -108,7 +108,7 @@
 Optional<WebCore::PixelBuffer> CGDisplayListImageBufferBackend::getPixelBuffer(WebCore::AlphaPremultiplication, const WebCore::IntRect&) const
 {
     ASSERT_NOT_REACHED();
-    return nullptr;
+    return { };
 }
 
 void CGDisplayListImageBufferBackend::putPixelBuffer(WebCore::AlphaPremultiplication, const WebCore::PixelBuffer&, const WebCore::IntRect&, const WebCore::IntPoint&, WebCore::AlphaPremultiplication)

Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.h (277348 => 277349)


--- trunk/Source/WebKit/Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.h	2021-05-12 01:16:12 UTC (rev 277348)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.h	2021-05-12 01:25:50 UTC (rev 277349)
@@ -50,7 +50,7 @@
     // NOTE: These all ASSERT_NOT_REACHED().
     RefPtr<WebCore::NativeImage> copyNativeImage(WebCore::BackingStoreCopy = WebCore::CopyBackingStore) const override;
     Vector<uint8_t> toBGRAData() const override;
-    RefPtr<WebCore::PixelBuffer> getPixelBuffer(WebCore::AlphaPremultiplication outputFormat, const WebCore::IntRect&) const override;
+    Optional<WebCore::PixelBuffer> getPixelBuffer(WebCore::AlphaPremultiplication outputFormat, const WebCore::IntRect&) const override;
     void putPixelBuffer(WebCore::AlphaPremultiplication inputFormat, const WebCore::PixelBuffer&, const WebCore::IntRect& srcRect, const WebCore::IntPoint& destPoint, WebCore::AlphaPremultiplication destFormat) override;
 
     static constexpr bool isOriginAtUpperLeftCorner = true;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to