[GPU Process] REGRESSION: display-p3 stroke color in canvas crashes the webpage #19383
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
EWS run on previous version of this PR (hash b970fd8) |
webkit-ews-buildbot
added
the
merging-blocked
shallawa
removed
the
merging-blocked
shallawa
force-pushed
the
eng/GPU-Process-REGRESSION-display-p3-stroke-color-in-canvas-crashes-the-webpage
branch
from
b970fd8
to
276ed08
Compare
|
EWS run on previous version of this PR (hash 276ed08) |
webkit-ews-buildbot
added
the
merging-blocked
shallawa
removed
the
merging-blocked
shallawa
force-pushed
the
eng/GPU-Process-REGRESSION-display-p3-stroke-color-in-canvas-crashes-the-webpage
branch
from
276ed08
to
aa1dc22
Compare
|
EWS run on current version of this PR (hash aa1dc22) |
smfr
approved these changes
Oct 23, 2023
| Color color() const { return { m_colorData }; } | ||
| const SRGBA<uint8_t>& colorData() const { return m_colorData; } | ||
| SetInlineFillColor(SRGBA<uint8_t> colorData) | ||
| : m_colorData(*Color(colorData).tryGetAsPackedInline()) |
There was a problem hiding this comment.
Bouncing between SRGBA<uint8_t>, Color and PackedColor::RGBA doesn't seem great.
There was a problem hiding this comment.
Yes this is correct. I think we should have a direct conversion from SRGBA<uint8_t> to PackedColor::RGBA. We need the opposite of SRGBA<uint8_t> asSRGBA(PackedColor::RGBA color). I will address this in a separate patch.
…he webpage https://bugs.webkit.org/show_bug.cgi?id=263387 rdar://117226767 Reviewed by Simon Fraser. Recording the inline path data items is enabled only if the state stroke has an inline color or if the stroke color was not changed since last time the state was committed. A crash will happen when the current stroke color is not inline (display-p3 for example) and it has been committed to the destination context in GPUP but the stroke thickness was changed. The item SetInlineStrokeColor tries to get the inline data a non inline color although the current stroke color is not inline and it has not changed. So the crash happens. The fix is to merge the inline stroke changes into one DisplayList item named SetInlineStroke. It has two optional members: the inline color data and the thickness. Each member will be set only if it was changed since last commit. For representing the color in SetInlineStroke, PackedColor::RGBA will be used instead of SRGBA<uint8_t> since it is easier to be encoded. * LayoutTests/fast/canvas/canvas-line-no-change-display-p3-stroke-expected.html: Added. * LayoutTests/fast/canvas/canvas-line-no-change-display-p3-stroke.html: Added. * Source/WebCore/platform/graphics/Color.h: (WebCore::Color::tryGetAsPackedInline const): * Source/WebCore/platform/graphics/displaylists/DisplayListItem.h: * Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp: (WebCore::DisplayList::SetInlineStroke::apply const): (WebCore::DisplayList::SetInlineStroke::dump const): (WebCore::DisplayList::SetInlineStrokeColor::apply const): Deleted. (WebCore::DisplayList::SetInlineStrokeColor::dump const): Deleted. (WebCore::DisplayList::SetStrokeThickness::apply const): Deleted. (WebCore::DisplayList::SetStrokeThickness::dump const): Deleted. * Source/WebCore/platform/graphics/displaylists/DisplayListItems.h: (WebCore::DisplayList::SetInlineFillColor::SetInlineFillColor): (WebCore::DisplayList::SetInlineFillColor::color const): (WebCore::DisplayList::SetInlineFillColor::colorData const): (WebCore::DisplayList::SetInlineStroke::SetInlineStroke): (WebCore::DisplayList::SetInlineStroke::color const): (WebCore::DisplayList::SetInlineStroke::colorData const): (WebCore::DisplayList::SetInlineStroke::thickness const): (WebCore::DisplayList::SetInlineStrokeColor::SetInlineStrokeColor): Deleted. (WebCore::DisplayList::SetInlineStrokeColor::color const): Deleted. (WebCore::DisplayList::SetInlineStrokeColor::colorData const): Deleted. (WebCore::DisplayList::SetStrokeThickness::SetStrokeThickness): Deleted. (WebCore::DisplayList::SetStrokeThickness::thickness const): Deleted. * Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp: (WebCore::DisplayList::Recorder::appendStateChangeItem): (WebCore::DisplayList::Recorder::buildSetInlineStroke): (WebCore::DisplayList::Recorder::strokePath): * Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h: * Source/WebCore/platform/graphics/displaylists/DisplayListRecorderImpl.cpp: (WebCore::DisplayList::RecorderImpl::recordSetInlineFillColor): (WebCore::DisplayList::RecorderImpl::recordSetInlineStroke): (WebCore::DisplayList::RecorderImpl::recordStrokeLineWithColorAndThickness): (WebCore::DisplayList::RecorderImpl::recordSetInlineStrokeColor): Deleted. (WebCore::DisplayList::RecorderImpl::recordSetStrokeThickness): Deleted. * Source/WebCore/platform/graphics/displaylists/DisplayListRecorderImpl.h: * Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.cpp: (WebKit::RemoteDisplayListRecorder::setInlineFillColor): (WebKit::RemoteDisplayListRecorder::setInlineStroke): (WebKit::RemoteDisplayListRecorder::strokeLineWithColorAndThickness): (WebKit::RemoteDisplayListRecorder::setInlineStrokeColor): Deleted. (WebKit::RemoteDisplayListRecorder::setStrokeThickness): Deleted. * Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.h: * Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.messages.in: * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: * Source/WebKit/WebProcess/GPU/graphics/RemoteDisplayListRecorderProxy.cpp: (WebKit::RemoteDisplayListRecorderProxy::recordSetInlineFillColor): (WebKit::RemoteDisplayListRecorderProxy::recordSetInlineStroke): (WebKit::RemoteDisplayListRecorderProxy::recordStrokeLineWithColorAndThickness): (WebKit::RemoteDisplayListRecorderProxy::recordSetInlineStrokeColor): Deleted. (WebKit::RemoteDisplayListRecorderProxy::recordSetStrokeThickness): Deleted. * Source/WebKit/WebProcess/GPU/graphics/RemoteDisplayListRecorderProxy.h: * Tools/TestWebKitAPI/Tests/WebCore/DisplayListTests.cpp: (TestWebKitAPI::TEST): * Tools/TestWebKitAPI/Tests/WebCore/cg/DisplayListTestsCG.cpp: (TestWebKitAPI::TEST): Canonical link: https://commits.webkit.org/269664@main
webkit-commit-queue
force-pushed
the
eng/GPU-Process-REGRESSION-display-p3-stroke-color-in-canvas-crashes-the-webpage
branch
from
aa1dc22
to
922c037
Compare
|
Committed 269664@main (922c037): https://commits.webkit.org/269664@main Reviewed commits have been landed. Closing PR #19383 and removing active labels. |
webkit-commit-queue
removed
the
merge-queue
shallawa
deleted the
eng/GPU-Process-REGRESSION-display-p3-stroke-color-in-canvas-crashes-the-webpage
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
922c037
aa1dc22