| Summary: | [WPE][Debug] http/tests/media/video-redirect.html crashing | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | Philippe Normand <pnormand> |
| Component: | WPE WebKit | Assignee: | Nobody <webkit-unassigned> |
| Status: | RESOLVED FIXED | ||
| Severity: | Normal | CC: | alex, bugs-noreply, philn, zdobersek |
| Priority: | P2 | ||
| Version: | WebKit Nightly Build | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
|
Description
Philippe Normand
2022-05-01 03:53:42 PDT
Not sure how to fix this properly, this might be a workaround...
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp
index 49e80eeb6e40..63e8f3d4ad36 100644
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp
@@ -182,7 +182,7 @@ void TextureMapperLayer::paintSelf(TextureMapperPaintOptions& options)
solidColorLayer.setColor(m_state.solidColor);
contentsLayer = &solidColorLayer;
}
- if (!contentsLayer)
+ if (!contentsLayer || !contentsLayer->client())
return;
if (!m_state.contentsTileSize.isEmpty()) {
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h b/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h
index 12f56ab813ba..0d3c43578f96 100644
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h
@@ -45,9 +45,7 @@ public:
}
void setClient(TextureMapperPlatformLayer::Client* client) { m_client = client; }
-
-protected:
- TextureMapperPlatformLayer::Client* client() { return m_client; }
+ TextureMapperPlatformLayer::Client* client() const { return m_client; }
private:
TextureMapperPlatformLayer::Client* m_client { nullptr };
Also affected by this crash: fast/mediastream/getUserMedia-rvfc.html [ Crash ] fast/mediastream/getUserMedia-video-rescaling.html [ Crash ] fast/mediastream/mediastreamtrack-video-clone.html [ Crash ] fast/mediastream/play-newly-added-audio-track.html [ Crash ] http/wpt/mediarecorder/set-srcObject-MediaStream-Blob.html [ Crash ] Looks like that was fixed. |