corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1988912. r=ahale a=dmeehan

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D265351
This commit is contained in:
Lee Salzman
2025-09-19 17:41:40 +00:00
committed by dmeehan@mozilla.com
parent 309c387fc9
commit ac301ae584
3 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
dom/canvas/CanvasRenderingContext2D.cpp
View File

@@ -5503,20 +5503,20 @@ static Matrix ComputeRotationMatrix(gfxFloat aRotatedWidth,
// - // -
Maybe<layers::SurfaceDescriptor> ValidSurfaceDescriptorForRemoteCanvas2d( bool ValidSurfaceDescriptorForRemoteCanvas2d(
const layers::SurfaceDescriptor& sdConst) { const layers::SurfaceDescriptor& aSd,
auto sd = sdConst; // Copy, so we can mutate it. Maybe<layers::SurfaceDescriptor>* aResultSd) {
if (sd.type() != layers::SurfaceDescriptor::TSurfaceDescriptorGPUVideo) { if (aSd.type() != layers::SurfaceDescriptor::TSurfaceDescriptorGPUVideo) {
return Nothing(); return false;
} }
auto& sdv = sd.get_SurfaceDescriptorGPUVideo(); const auto& sdv = aSd.get_SurfaceDescriptorGPUVideo();
if (sdv.type() != if (sdv.type() !=
layers::SurfaceDescriptorGPUVideo::TSurfaceDescriptorRemoteDecoder) { layers::SurfaceDescriptorGPUVideo::TSurfaceDescriptorRemoteDecoder) {
return Nothing(); return false;
} }
auto& sdrd = sdv.get_SurfaceDescriptorRemoteDecoder(); const auto& sdrd = sdv.get_SurfaceDescriptorRemoteDecoder();
auto& subdesc = sdrd.subdesc(); const auto& subdesc = sdrd.subdesc();
switch (subdesc.type()) { switch (subdesc.type()) {
case layers::RemoteDecoderVideoSubDescriptor::Tnull_t: case layers::RemoteDecoderVideoSubDescriptor::Tnull_t:
break; break;
@@ -5525,7 +5525,7 @@ Maybe<layers::SurfaceDescriptor> ValidSurfaceDescriptorForRemoteCanvas2d(
TSurfaceDescriptorMacIOSurface: { TSurfaceDescriptorMacIOSurface: {
const auto& ssd = subdesc.get_SurfaceDescriptorMacIOSurface(); const auto& ssd = subdesc.get_SurfaceDescriptorMacIOSurface();
if (ssd.gpuFence()) { if (ssd.gpuFence()) {
return Nothing(); return false;
} }
break; break;
} }
@@ -5533,18 +5533,31 @@ Maybe<layers::SurfaceDescriptor> ValidSurfaceDescriptorForRemoteCanvas2d(
#ifdef XP_WIN #ifdef XP_WIN
case layers::RemoteDecoderVideoSubDescriptor::TSurfaceDescriptorD3D10: { case layers::RemoteDecoderVideoSubDescriptor::TSurfaceDescriptorD3D10: {
if (!StaticPrefs::gfx_canvas_remote_use_draw_image_fast_path_d3d()) { if (!StaticPrefs::gfx_canvas_remote_use_draw_image_fast_path_d3d()) {
return Nothing(); return false;
} }
auto& ssd = subdesc.get_SurfaceDescriptorD3D10(); const auto& ssd = subdesc.get_SurfaceDescriptorD3D10();
ssd.handle() = if (aResultSd) {
nullptr; // Not IPC-able, but it's just an optimization to have this. *aResultSd = Some(aSd);
break; // Not IPC-able, but it's just an optimization to have this.
aResultSd->ref()
.get_SurfaceDescriptorGPUVideo()
.get_SurfaceDescriptorRemoteDecoder()
.subdesc()
.get_SurfaceDescriptorD3D10()
.handle() = nullptr;
} else if (ssd.handle()) {
return false;
}
return true;
} }
#endif #endif
default: default:
return Nothing(); return false;
} }
return Some(sd); if (aResultSd) {
*aResultSd = Some(aSd);
}
return true;
} }
static Maybe<layers::SurfaceDescriptor> static Maybe<layers::SurfaceDescriptor>
@@ -5558,9 +5571,13 @@ MaybeGetSurfaceDescriptorForRemoteCanvas(
return Nothing(); return Nothing();
} }
const auto sd = aResult.mLayersImage->GetDesc(); if (const auto sd = aResult.mLayersImage->GetDesc()) {
if (!sd) return Nothing(); Maybe<layers::SurfaceDescriptor> result;
return ValidSurfaceDescriptorForRemoteCanvas2d(*sd); if (ValidSurfaceDescriptorForRemoteCanvas2d(*sd, &result)) {
return result;
}
}
return Nothing();
} }
// drawImage(in HTMLImageElement image, in float dx, in float dy); // drawImage(in HTMLImageElement image, in float dx, in float dy);

5
dom/canvas/CanvasRenderingContextHelper.h
View File

@@ -89,8 +89,9 @@ class CanvasRenderingContextHelper {
nsCOMPtr<nsICanvasRenderingContextInternal> mCurrentContext; nsCOMPtr<nsICanvasRenderingContextInternal> mCurrentContext;
}; };
Maybe<layers::SurfaceDescriptor> ValidSurfaceDescriptorForRemoteCanvas2d( bool ValidSurfaceDescriptorForRemoteCanvas2d(
const layers::SurfaceDescriptor&); const layers::SurfaceDescriptor& aSd,
Maybe<layers::SurfaceDescriptor>* aResultSd = nullptr);
} // namespace dom } // namespace dom
namespace CanvasUtils { namespace CanvasUtils {

19
gfx/2d/RecordedEventImpl.h
View File

@@ -3255,8 +3255,10 @@ struct ElementStreamFormat<S, layers::SurfaceDescriptor> {
using T = layers::SurfaceDescriptor; using T = layers::SurfaceDescriptor;
static void Write(S& s, const T& t) { static void Write(S& s, const T& t) {
// More rigorous version is coming soon! -Kelsey Maybe<T> valid;
const auto valid = dom::ValidSurfaceDescriptorForRemoteCanvas2d(t); if (!dom::ValidSurfaceDescriptorForRemoteCanvas2d(t, &valid)) {
MOZ_CRASH("Invalid surface descriptor for write");
}
MOZ_RELEASE_ASSERT(valid && *valid == t); MOZ_RELEASE_ASSERT(valid && *valid == t);
if (kIsDebug) { if (kIsDebug) {
// We better be able to memcpy and destroy this if we're going to send it // We better be able to memcpy and destroy this if we're going to send it
@@ -3272,10 +3274,15 @@ struct ElementStreamFormat<S, layers::SurfaceDescriptor> {
s.write(reinterpret_cast<const char*>(&tValid), sizeof(T)); s.write(reinterpret_cast<const char*>(&tValid), sizeof(T));
} }
static void Read(S& s, T& t) { static void Read(S& s, T& t) {
s.read(reinterpret_cast<char*>(&t), sizeof(T)); char buf[sizeof(T)];
const auto valid = dom::ValidSurfaceDescriptorForRemoteCanvas2d(t); s.read(buf, sizeof(T));
MOZ_RELEASE_ASSERT(valid && *valid == t); const auto& sd = *reinterpret_cast<const layers::SurfaceDescriptor*>(buf);
t = *valid; if (dom::ValidSurfaceDescriptorForRemoteCanvas2d(sd)) {
t = sd;
MOZ_RELEASE_ASSERT(sd == t);
} else {
s.SetIsBad();
}
} }
}; };