Bug 98507 – [GTK] Test /webkit2/WebKitWebView/populate-menu asserts in debug bots

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Carlos Garcia Campos]

/webkit2/WebKitWebView/populate-menu:                                ASSERTION FAILED: iconRecord || m_retainedPageURLs.contains(pageURLOriginal)

../../Source/WebCore/loader/icon/IconDatabase.cpp(266) : virtual WebCore::Image* WebCore::IconDatabase::synchronousIconForPageURL(const WTF::String&, const WebCore::IntSize&)

[Carlos Garcia Campos]

Created attachment 167305 [details]
Patch

[WebKit Review Bot]

Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API

[Martin Robinson]

Comment on attachment 167305 [details]
Patch

Okay. But before you land, do you mind having Mario look over this too?

[Mario Sanchez Prada]

Comment on attachment 167305 [details]
Patch

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

The patch looks good to me too. A pity I didn't realize of this issue when writing the original patch, quite happy Carlos figured it out and fixed it, though.

> Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp:151
>      PendingIconRequestVector* icons = database->priv->pendingIconRequests.get(pageURL);

Completely off-topic thing: you might consider renaming this 'icons' variable before landing to something more adequate, such as 'pendingIconRequests', or something like that.

> Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp:156
> +    RefPtr<cairo_surface_t> icon = getIconSurfaceSynchronously(database, pageURL, &error.outPtr());

I like this refactoring: taking this call out of the loop. Good catch.

[Carlos Garcia Campos]

Committed r130625: <http://trac.webkit.org/changeset/130625>