Bug 231411

Summary:

[GPU Process] Unique RenderingResourceIdentifiers Part 8: Consolidate DisplayList::ResourceHeap

Product:

WebKit

Reporter:

Myles C. Maxfield <mmaxfield>

Component:

Layout and Rendering

Assignee:

Myles C. Maxfield <mmaxfield>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

annulen, bfulgham, ews-watchlist, gyuyoung.kim, ryuan.choi, sergio, simon.fraser, webkit-bug-importer, zalan

Priority:

Keywords:

InRadar

Version:

WebKit Nightly Build

Hardware:

Unspecified

OS:

Unspecified

Bug Depends on:

Bug Blocks:

217638

Attachments:

Description	Flags
Patch	none
Patch	none
Patch	none
Patch	simon.fraser: review+, ews-feeder: commit-queue-
Patch for committing	none
Patch for committing	none

Description Myles C. Maxfield 2021-10-07 21:51:13 PDT

Consolidate DisplayList::ResourceHeap

Comment 1 Radar WebKit Bug Importer 2021-10-07 21:51:56 PDT

<rdar://problem/84013167>

Comment 2 Myles C. Maxfield 2021-10-07 22:31:27 PDT

Created attachment 440573 [details]
Patch

Comment 3 Myles C. Maxfield 2021-10-07 22:34:34 PDT

Created attachment 440574 [details]
Patch

Comment 4 Myles C. Maxfield 2021-10-07 22:43:27 PDT

Comment on attachment 440574 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=440574&action=review

> Source/WebCore/platform/graphics/displaylists/DisplayListResourceHeap.h:44
> +    using ImageBufferHashMap = HashMap<RenderingResourceIdentifier, Ref<ImageBuffer>>;
> +    using NativeImageHashMap = HashMap<RenderingResourceIdentifier, Ref<NativeImage>>;
> +    using FontRenderingResourceMap = HashMap<RenderingResourceIdentifier, Ref<Font>>;
> +
> +    ResourceHeap() = default;

These are unnecessary.

Comment 5 Myles C. Maxfield 2021-10-07 23:33:04 PDT

Created attachment 440575 [details]
Patch

Comment 6 Myles C. Maxfield 2021-10-08 10:27:43 PDT

Created attachment 440639 [details]
Patch

Comment 7 Simon Fraser (smfr) 2021-10-11 21:39:22 PDT

Comment on attachment 440639 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=440639&action=review

> Source/WebCore/platform/graphics/displaylists/DisplayListResourceHeap.h:115
> +    HashMap<RenderingResourceIdentifier, Ref<ImageBuffer>> m_imageBuffers;
> +    HashMap<RenderingResourceIdentifier, Ref<NativeImage>> m_nativeImages;
> +    HashMap<RenderingResourceIdentifier, Ref<Font>> m_fonts;

Did you consider HashMap<RenderingResourceIdentifier, Variant<....>> ? An identifier will never be shared between these types, right?

Comment 8 Myles C. Maxfield 2021-10-11 22:09:15 PDT Comment hidden (obsolete)

Comment on attachment 440639 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=440639&action=review

>> Source/WebCore/platform/graphics/displaylists/DisplayListResourceHeap.h:115
>> +    HashMap<RenderingResourceIdentifier, Ref<Font>> m_fonts;
> 
> Did you consider HashMap<RenderingResourceIdentifier, Variant<....>> ? An identifier will never be shared between these types, right?

```
static_assert failed: For conversion construction of variants, exactly one type must be constructible
```

😭

Comment 9 Myles C. Maxfield 2021-10-11 22:31:40 PDT Comment hidden (obsolete)

Comment on attachment 440639 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=440639&action=review

>>> Source/WebCore/platform/graphics/displaylists/DisplayListResourceHeap.h:115
>>> +    HashMap<RenderingResourceIdentifier, Ref<Font>> m_fonts;
>> 
>> Did you consider HashMap<RenderingResourceIdentifier, Variant<....>> ? An identifier will never be shared between these types, right?
> 
> ```
> static_assert failed: For conversion construction of variants, exactly one type must be constructible
> ```
> 
> 😭

Whoops, ignore that, I got it to work.

Comment 10 Myles C. Maxfield 2021-10-11 22:39:48 PDT

Created attachment 440892 [details]
Patch for committing

Comment 11 Myles C. Maxfield 2021-10-11 23:34:55 PDT

Created attachment 440897 [details]
Patch for committing

Comment 12 Myles C. Maxfield 2021-10-12 01:05:26 PDT

Committed r283971 (242818@main): <https://commits.webkit.org/242818@main>