Changeset 277349 in webkit

Timestamp:

May 11, 2021, 6:25:50 PM (5 years ago)

Author:

timothy_horton@apple.com

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:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.cpp (modified) (1 diff)
• Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-05-11  Tim Horton  <timothy_horton@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  <achristensen@webkit.org>
 

trunk/Source/WebKit/Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.cpp

@@ -109 +109 @@
 {
     ASSERT_NOT_REACHED();
-    return nullptr;
+    return { };
 }
 

trunk/Source/WebKit/Shared/RemoteLayerTree/CGDisplayListImageBufferBackend.h

@@ -51 +51 @@
     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;