Bug 182686

Created attachment 333583 [details] WIP patch Extends the CanvasBase functionality, roughly mirroring HTMLCanvasElement. Also implements getContext() to support the 2D context type. Still depends on bugs #182503 and #182685, but also requires standalone layout tests.

Created attachment 379894 [details] Patch

Created attachment 380624 [details] Patch

Comment on attachment 380624 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=380624&action=review > Source/WebCore/css/CSSValuePool.cpp:71 > + if (isMainThread()) > + return m_identifierValues[ident].get(); > + return CSSPrimitiveValue::create(ident); This is going to very confusing because most callosities of this function will be like: CSSValuePool::singleton().createIdentifierValue We should instead make CSSParser access CSSValuePool via its member; e.g. m_valuePool and assert that CSSValuePool::singleton is only accessed in the main thread. That way, value pool optimization will also work in worker, which might be important in keeping memory usage in check.

(In reply to Ryosuke Niwa from comment #4) > Comment on attachment 380624 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=380624&action=review > > > Source/WebCore/css/CSSValuePool.cpp:71 > > + if (isMainThread()) > > + return m_identifierValues[ident].get(); > > + return CSSPrimitiveValue::create(ident); > > This is going to very confusing because most callosities of this function > will be like: > CSSValuePool::singleton().createIdentifierValue > > We should instead make CSSParser access CSSValuePool via its member; e.g. > m_valuePool > and assert that CSSValuePool::singleton is only accessed in the main thread. > > That way, value pool optimization will also work in worker, > which might be important in keeping memory usage in check. I'd like to do something like this, but CSSParser is just a bunch of static functions, for the most part... Perhaps an alternative would be to have a CSSValuePool per-thread(?) But if we did that, I don't know where/how destruction would be handled. Alternatively, canvas only needs style parsing for colours and fonts - perhaps we could just have a separate CanvasCSSParser provided by Document/WorkerGlobalScope that provides only those functions?

(In reply to Chris Lord from comment #5) > I'd like to do something like this, but CSSParser is just a bunch of static > functions, for the most part... Perhaps an alternative would be to have a > CSSValuePool per-thread(?) But if we did that, I don't know where/how > destruction would be handled. > > Alternatively, canvas only needs style parsing for colours and fonts - > perhaps we could just have a separate CanvasCSSParser provided by > Document/WorkerGlobalScope that provides only those functions? What I've gone with is for CSSParser (and fast-path equivalent) to have a prototype that accepts a given CSSValuePool, and WorkerGlobalScope has a CSSValuePool member. I've also added a main-thread assert to CSSValuePool::singleton. This does mean that CSSValuePool's members are no longer LazyNeverDestroyed, however. I'll tackle fonts in later patches, but this seems like a reasonably simple solution for colours. Patch incoming.

Created attachment 380787 [details] Patch

I did what I said in comment #6. It's a deceptively large-looking patch, but it's essentially just adding an extra parameter to the static CSS property parsing functions to allow a CSSValuePool to be passed through. Along with the assert in singleton(), this seems a pretty decent way of stopping off-main-thread access - It certainly caught a few things I missed on my initial run. This still requires the patches in bug #182503 and bug #182685.

Created attachment 382582 [details] Patch

Created attachment 382583 [details] Patch

Created attachment 382585 [details] Patch

Comment on attachment 382585 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382585&action=review > Source/WebCore/css/parser/CSSPropertyParser.cpp:487 > -static RefPtr<CSSFontFeatureValue> consumeFontFeatureTag(CSSParserTokenRange& range) > +static RefPtr<CSSFontFeatureValue> consumeFontFeatureTag(CSSValuePool& cssValuePool, CSSParserTokenRange& range) We are not going to uglify the code by adding CSSValuePool argument everywhere. Please find alternative solutions, like using thread global data. > Source/WebCore/css/parser/CSSPropertyParser.cpp:689 > +static RefPtr<CSSValue> consumeFontVariantEastAsian(CSSValuePool& cssValuePool, CSSParserTokenRange& range) We are not going to start passing

Perhaps you could make many of the static function members and so have a general solution for context passing.

Created attachment 382725 [details] Patch

(In reply to Antti Koivisto from comment #12) > Comment on attachment 382585 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=382585&action=review > > > Source/WebCore/css/parser/CSSPropertyParser.cpp:487 > > -static RefPtr<CSSFontFeatureValue> consumeFontFeatureTag(CSSParserTokenRange& range) > > +static RefPtr<CSSFontFeatureValue> consumeFontFeatureTag(CSSValuePool& cssValuePool, CSSParserTokenRange& range) > > We are not going to uglify the code by adding CSSValuePool argument > everywhere. Please find alternative solutions, like using thread global data. Yes, fair enough - I've removed all of these changes and just used ThreadGlobalData instead.

This patch is too massive. Please split it into smaller pieces.

(In reply to Ryosuke Niwa from comment #16) > This patch is too massive. Please split it into smaller pieces. The majority of the patch is just test expectation changes - Given OffscreenCanvas is behind a flag and Mac/iOS aren't affected, I guess this isn't so important to land simultaneously. I guess I could just split it per test subdirectory, does that sound ok?

Comment on attachment 382725 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382725&action=review > Source/WebCore/ChangeLog:1 > +2019-10-08 Zan Dobersek <zdobersek@igalia.com> and Chris Lord <clord@igalia.com> Additional attribution should happen in the description, not this line. Ditto for other change logs. > Source/WebCore/platform/graphics/ImageSource.cpp:-56 > - ASSERT(isMainThread()); This assert should still exist when offscreen canvas is disabled. > Source/WebCore/platform/graphics/ImageSource.h:43 > -class ImageSource : public ThreadSafeRefCounted<ImageSource, WTF::DestructionThread::Main>, public CanMakeWeakPtr<ImageSource> { > +class ImageSource : public ThreadSafeRefCounted<ImageSource>, public CanMakeWeakPtr<ImageSource> { This isn't right. As far as I understand, destruction happening in a non-main thread would corrupt data in macOS / iOS.

(In reply to Ryosuke Niwa from comment #18) > Comment on attachment 382725 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=382725&action=review > > > Source/WebCore/ChangeLog:1 > > +2019-10-08 Zan Dobersek <zdobersek@igalia.com> and Chris Lord <clord@igalia.com> > > Additional attribution should happen in the description, not this line. > Ditto for other change logs. It's done elsewhere like this in ChangeLogs and I've had previous patches approved and committed with this format, could you be more specific with how you'd like it changed? > > Source/WebCore/platform/graphics/ImageSource.cpp:-56 > > - ASSERT(isMainThread()); > > This assert should still exist when offscreen canvas is disabled. > > > Source/WebCore/platform/graphics/ImageSource.h:43 > > -class ImageSource : public ThreadSafeRefCounted<ImageSource, WTF::DestructionThread::Main>, public CanMakeWeakPtr<ImageSource> { > > +class ImageSource : public ThreadSafeRefCounted<ImageSource>, public CanMakeWeakPtr<ImageSource> { > > This isn't right. As far as I understand, destruction happening in a > non-main thread would corrupt data in macOS / iOS. I'm going to go over this and see if it's actually necessary or could be worked around in a different way.

> > > Source/WebCore/platform/graphics/ImageSource.cpp:-56 > > > - ASSERT(isMainThread()); > > > > This assert should still exist when offscreen canvas is disabled. > > > > > Source/WebCore/platform/graphics/ImageSource.h:43 > > > -class ImageSource : public ThreadSafeRefCounted<ImageSource, WTF::DestructionThread::Main>, public CanMakeWeakPtr<ImageSource> { > > > +class ImageSource : public ThreadSafeRefCounted<ImageSource>, public CanMakeWeakPtr<ImageSource> { > > > > This isn't right. As far as I understand, destruction happening in a > > non-main thread would corrupt data in macOS / iOS. > > I'm going to go over this and see if it's actually necessary or could be > worked around in a different way. So going over and testing, I remember what this issue was - drawShadowLayer ends up triggering ImageBuffer::copyImage, which at least on cairo ends up creating an ImageSource using a native image buffer (and is safe to use off-main-thread). I ran into this in bug 202797 and ended up just creating an image buffer and using getPremultipliedImageData/putByteArray instead of copyImage to work around it... I'll see if that makes sense here, or find a better fix. I'll look at what happens on other backends too, I wonder if this is a general problem or specific to the cairo drawing backend.

> I ran into this in bug 202797 and ended up just creating an image buffer and > using getPremultipliedImageData/putByteArray instead of copyImage to work > around it... I'll see if that makes sense here, or find a better fix. I'll > look at what happens on other backends too, I wonder if this is a general > problem or specific to the cairo drawing backend. So the only reason copyImage was being called is because it's used to get the native image pointer in cairo's GraphicsContext for clipToImageBuffer(). I'm testing just putting a Cairo-specific native image accessor on ImageBuffer, and if that works I expect we can just remove the changes to ImageSource altogether.

ok, no, unfortunately not as simple as that. That was one of the reasons, but there are other reasons too... I'm not sure that this can be worked around so easily, but still will see what I can do.

(In reply to Chris Lord from comment #22) > ok, no, unfortunately not as simple as that. That was one of the reasons, > but there are other reasons too... I'm not sure that this can be worked > around so easily, but still will see what I can do. Of course, a night's sleep makes everything simpler. It is as simple as that (hopefully, pending tests) - reworking the Cairo backend a tiny bit so that it doesn't use copyImage unnecessarily fixes this issue and makes the changes to ImageSource completely unnecessary. I'll open up a separate bug for that change.

Created attachment 383051 [details] Patch

I didn't change the ChangeLog attribution as it exists like this elsewhere in the file already. If you'd really like that to be different, if you could be more specific about the format I should follow that would be appreciated. Likewise, I haven't split the test expectation changes away from this patch to make it smaller as it would result in a bunch of unexpected passes on Gtk/WPE until the expectations are updated and it seems counter-intuitive to me to check in changes that knowingly break things (there's no escaping that the test expectation changes here are going to be large). Test expectation changes aside, I'd say this patch is quite small now. If you could be more specific with any feedback if it's still too large, that would again be much appreciated.

Comment on attachment 383051 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=383051&action=review > Source/WebCore/css/parser/CSSParser.h:79 > + static RefPtr<CSSValue> parseSingleValue(CSSValuePool&, CSSPropertyID, const String&, const CSSParserContext& = strictCSSParserContext()); This has no implementation nor callers. > Source/WebCore/css/parser/CSSParser.h:89 > + static Color parseColor(CSSValuePool&, const String&, bool strict = false); Neither does this.

We talked about this and I suggested factoring the (apparently small) subset of CSS parser needed for this feature into a separate type. This will make it easier to audit that what we are doing is actually thread safe with reasonable confidence.

After talking on IRC, the plan for this patch is to isolate the part of CSS parsing that it needs (just colour parsing at this point), add a thread-safe API for that, rather than enabling the whole of CSS parsing off-main-thread. My initial plan is to augment and enable the parser fast-path for off-main-thread use, the augmentation of which I'm doing in bug 204347. This does mean that some malformed colour formats will not work in OffscreenCanvas, but I think we can deal with these separately, later. Currently I have truncated rgb/rgba working and I plan on adding hsl/hsla. This will mean that the most common ways of specifying colour will work at least, while just a handful of malformed specifications (that for some reason are tested for?) won't work.

Created attachment 383961 [details] Patch

Created attachment 383964 [details] Patch

Discovered that relying on the fast-path wasn't really going to cut it and after discussing on IRC, decided that the way forward would be to make the necessary parts of the parser thread-safe under a different name-space to differentiate them. So this patch makes parseColor and functions it depends on thread-safe (essentially by making CSSValuePool usage optional in those functions), and makes CanvasStyle use the thread-safe version of consumeColor directly. As this was all under CSSPropertyParserHelpers, there is now a CSSPropertyParserHelpers::ThreadSafe namespace, under which contains only functions that are safe to call off-main-thread.

Comment on attachment 383964 [details] Patch Attachment 383964 [details] did not pass win-ews (win): Output: https://webkit-queues.webkit.org/results/13270081 New failing tests: fast/css/test-setting-canvas-color.html

Created attachment 384002 [details] Archive of layout-test-results from ews213 for win-future The attached test failures were seen while running run-webkit-tests on the win-ews. Bot: ews213 Port: win-future Platform: CYGWIN_NT-10.0-17763-3.0.5-338.x86_64-x86_64-64bit

Created attachment 384045 [details] Patch

Comment on attachment 384045 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=384045&action=review > Source/WebCore/css/parser/CSSParser.cpp:120 > return namedColor; > > // Try the fast path to parse hex and rgb. > - RefPtr<CSSValue> value = CSSParserFastPaths::parseColor(string, strict ? HTMLStandardMode : HTMLQuirksMode); > - > + CSSValuePool* valuePool = isMainThread() ? &CSSValuePool::singleton() : nullptr; > + auto parseMode = strict ? HTMLStandardMode : HTMLQuirksMode; > + RefPtr<CSSValue> value = CSSParserFastPaths::parseColor(string, parseMode, valuePool); > + > // If that fails, try the full parser. > - if (!value) > - value = parseSingleValue(CSSPropertyColor, string, strictCSSParserContext()); > + if (!value) { > + CSSTokenizer tokenizer(string); > + CSSParserTokenRange range(tokenizer.tokenRange()); > + range.consumeWhitespace(); > + value = CSSPropertyParserHelpers::ThreadSafe::consumeColor(range, parseMode, valuePool); > + if (!range.atEnd()) > + value = nullptr; > + } > if (!value || !value->isPrimitiveValue()) > return Color(); Maybe you could provide a separate CSSParser::parseColorThreadSafea and avoid branching on isMainThread? Are we assuming CSSParserFastPaths is entirely thread safe? > Source/WebCore/html/canvas/CanvasStyle.cpp:55 > { > Color color = CSSParser::parseColor(colorString); > - if (color.isValid()) > + if (color.isValid() || !isMainThread()) > return color; Can we just branch based on if this is an offscreen canvas? Thread checks are not nice.

(In reply to Antti Koivisto from comment #35) > Comment on attachment 384045 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=384045&action=review > > > Source/WebCore/css/parser/CSSParser.cpp:120 > > return namedColor; > > > > // Try the fast path to parse hex and rgb. > > - RefPtr<CSSValue> value = CSSParserFastPaths::parseColor(string, strict ? HTMLStandardMode : HTMLQuirksMode); > > - > > + CSSValuePool* valuePool = isMainThread() ? &CSSValuePool::singleton() : nullptr; > > + auto parseMode = strict ? HTMLStandardMode : HTMLQuirksMode; > > + RefPtr<CSSValue> value = CSSParserFastPaths::parseColor(string, parseMode, valuePool); > > + > > // If that fails, try the full parser. > > - if (!value) > > - value = parseSingleValue(CSSPropertyColor, string, strictCSSParserContext()); > > + if (!value) { > > + CSSTokenizer tokenizer(string); > > + CSSParserTokenRange range(tokenizer.tokenRange()); > > + range.consumeWhitespace(); > > + value = CSSPropertyParserHelpers::ThreadSafe::consumeColor(range, parseMode, valuePool); > > + if (!range.atEnd()) > > + value = nullptr; > > + } > > if (!value || !value->isPrimitiveValue()) > > return Color(); > > Maybe you could provide a separate CSSParser::parseColorThreadSafea and > avoid branching on isMainThread? > > Are we assuming CSSParserFastPaths is entirely thread safe? > > > Source/WebCore/html/canvas/CanvasStyle.cpp:55 > > { > > Color color = CSSParser::parseColor(colorString); > > - if (color.isValid()) > > + if (color.isValid() || !isMainThread()) > > return color; > > Can we just branch based on if this is an offscreen canvas? Thread checks > are not nice. These both sound good, will get to this imminently.

(In reply to Chris Lord from comment #36) > (In reply to Antti Koivisto from comment #35) > > Comment on attachment 384045 [details] > > Are we assuming CSSParserFastPaths is entirely thread safe? for parseColor, yes - at least, from my inspection, all it does is basic string manipulation. The only thing that wasn't safe to do off-main-thread was use CSSValuePool::singleton(). The rest of the file looks similar, but I haven't inspected it like parseColor as we aren't using it. Something interesting I found, when FastPath::parseColor fails, CSSParser calls parseSingleValue, which calls CSSFastPath::maybeParseValue, which calls parseColor again - so we were actually calling this twice (at least it looked that way) for every colour that required the full parser. This patch no longer calls maybeParseValue, so fixes that (assuming I'm not misinterpreting what was happening). I assume not just calling maybeParse in the first place was to avoid unnecessary checks for things that aren't colours. This reminds me, I think this patch doesn't add the main-thread assert on CSSValuePool::singleton() like earlier versions did, so I'll make sure to add that again.

Created attachment 384061 [details] Patch

Comment on attachment 384061 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=384061&action=review > Source/WebCore/css/parser/CSSParser.cpp:100 > Color CSSParser::parseColor(const String& string, bool strict) > +{ > + return parseColorThreadSafe(string, &CSSValuePool::singleton(), strict); > +} > + > +Color CSSParser::parseColorThreadSafe(const String& string, CSSValuePool* valuePool, bool strict) Function that takes valuePool is clearly not thread safe, no matter what the name says. You should just write a separate thread safe function and leave the existing parseColor alone.

Created attachment 384285 [details] Patch

Created attachment 384286 [details] Patch

Created attachment 384287 [details] Patch

Comment on attachment 384287 [details] Patch Ok, looks good. r=me

Comment on attachment 384287 [details] Patch Clearing flags on attachment: 384287 Committed r252856: <https://trac.webkit.org/changeset/252856>

All reviewed patches have been landed. Closing bug.

<rdar://problem/57472685>