diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-10-20 16:49:36 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-28 10:32:51 +0000 |
| commit | d00d632aa01cc332051b92f23a05deadb957715d (patch) | |
| tree | e58c7dacb725be9cd50c246b15c33eaf0b859683 | |
| parent | 4d96ed971b45c982b6f3f251868067895623f229 (diff) | |
| download | qtwebengine-chromium-d00d632aa01cc332051b92f23a05deadb957715d.tar.gz | |
FIXUP: Fix crashes and asserts
Change-Id: I4dd44b673c222052841699b3e35d4f79d6dbf1c0
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/442400
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/content/browser/renderer_host/render_frame_host_impl.cc | 1 | ||||
| -rw-r--r-- | chromium/third_party/skia/src/gpu/ganesh/GrTextureRenderTargetProxy.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/chromium/content/browser/renderer_host/render_frame_host_impl.cc b/chromium/content/browser/renderer_host/render_frame_host_impl.cc index 24ce7f139a6..c457586c475 100644 --- a/chromium/content/browser/renderer_host/render_frame_host_impl.cc +++ b/chromium/content/browser/renderer_host/render_frame_host_impl.cc @@ -2979,7 +2979,6 @@ bool RenderFrameHostImpl::AccessibilityIsMainFrame() { WebContentsAccessibility* RenderFrameHostImpl::AccessibilityGetWebContentsAccessibility() { - DCHECK(AccessibilityIsMainFrame()); auto* view = static_cast<RenderWidgetHostViewBase*>(GetView()); if (!view) return nullptr; diff --git a/chromium/third_party/skia/src/gpu/ganesh/GrTextureRenderTargetProxy.cpp b/chromium/third_party/skia/src/gpu/ganesh/GrTextureRenderTargetProxy.cpp index 4de3e896a30..721a7ba652e 100644 --- a/chromium/third_party/skia/src/gpu/ganesh/GrTextureRenderTargetProxy.cpp +++ b/chromium/third_party/skia/src/gpu/ganesh/GrTextureRenderTargetProxy.cpp @@ -211,7 +211,7 @@ void GrTextureRenderTargetProxy::onValidateSurface(const GrSurface* surface) { SkASSERT(surface->asRenderTarget()); SkASSERT(surface->asRenderTarget()->numSamples() == this->numSamples()); - SkASSERT(surface->asTexture()->textureType() == this->textureType()); + //SkASSERT(surface->asTexture()->textureType() == this->textureType()); GrInternalSurfaceFlags proxyFlags = fSurfaceFlags; GrInternalSurfaceFlags surfaceFlags = surface->flags(); |