Title: [280133] releases/WebKitGTK/webkit-2.32/Source/WebCore
- Revision
- 280133
- Author
- [email protected]
- Date
- 2021-07-21 07:44:41 -0700 (Wed, 21 Jul 2021)
Log Message
Merge r274025 - CanvasRenderingContext2DBase::canDrawTextWithParams() needs to resolve styles before using the drawingContext
https://bugs.webkit.org/show_bug.cgi?id=221257
<rdar://problem/73878095>
Reviewed by Ryosuke Niwa.
Simply call fontProxy() (which internally resolves styles) before calling drawingContext().
Test: fast/text/canvas-synchronous-events.html
* html/canvas/CanvasRenderingContext2DBase.cpp:
(WebCore::CanvasRenderingContext2DBase::canDrawTextWithParams):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (280132 => 280133)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-07-21 14:44:35 UTC (rev 280132)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-07-21 14:44:41 UTC (rev 280133)
@@ -1,3 +1,18 @@
+2021-03-05 Myles C. Maxfield <[email protected]>
+
+ CanvasRenderingContext2DBase::canDrawTextWithParams() needs to resolve styles before using the drawingContext
+ https://bugs.webkit.org/show_bug.cgi?id=221257
+ <rdar://problem/73878095>
+
+ Reviewed by Ryosuke Niwa.
+
+ Simply call fontProxy() (which internally resolves styles) before calling drawingContext().
+
+ Test: fast/text/canvas-synchronous-events.html
+
+ * html/canvas/CanvasRenderingContext2DBase.cpp:
+ (WebCore::CanvasRenderingContext2DBase::canDrawTextWithParams):
+
2021-03-12 Rob Buis <[email protected]>
Cancel image loader events after first dispatch
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (280132 => 280133)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2021-07-21 14:44:35 UTC (rev 280132)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2021-07-21 14:44:41 UTC (rev 280133)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2021 Apple Inc. All rights reserved.
* Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
* Copyright (C) 2007 Alp Toker <[email protected]>
* Copyright (C) 2008 Eric Seidel <[email protected]>
@@ -61,6 +61,7 @@
#include "RenderImage.h"
#include "RenderLayer.h"
#include "RenderTheme.h"
+#include "ScriptDisallowedScope.h"
#include "SecurityOrigin.h"
#include "Settings.h"
#include "StrokeStyleApplier.h"
@@ -2438,11 +2439,14 @@
bool CanvasRenderingContext2DBase::canDrawTextWithParams(float x, float y, bool fill, Optional<float> maxWidth)
{
+ if (!fontProxy()->realized())
+ return false;
+
+ ScriptDisallowedScope::InMainThread scriptDisallowedScope;
+
auto* c = drawingContext();
if (!c)
return false;
- if (!this->fontProxy()->realized())
- return false;
if (!state().hasInvertibleTransform)
return false;
if (!std::isfinite(x) | !std::isfinite(y))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
