Use a single map for all callback types in WebPageProxy

• Component: WebKit2
• Status: RESOLVED FIXED

Replace WebPageProxy’s multiple callback maps with one map for all callback types.

Created attachment 233373 [details]
Part 1

Comment on attachment 233373 [details]
Part 1

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

> Source/WebKit2/UIProcess/GenericCallback.h:177
> +    typename std::enable_if<std::is_base_of<CallbackBase, T>::value, RefPtr<T>>::type take(uint64_t callbackID)

Oops, the enable_if isn’t necessary anymore. I’ll get rid of it.

[Anders Carlsson]

Comment on attachment 233373 [details]
Part 1

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

> Source/WebKit2/UIProcess/GenericCallback.h:170
> +    void put(PassRefPtr<CallbackBase> callback)

I think set or add would be better than put but I don't feel strongly about it.

(In reply to comment #3)
> (From update of attachment 233373 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=233373&action=review
> 
> > Source/WebKit2/UIProcess/GenericCallback.h:170
> > +    void put(PassRefPtr<CallbackBase> callback)
> 
> I think set or add would be better than put but I don't feel strongly about it.

I wanted to use something different from the HashMap function names add and set, because the argument is consumed.

Committed part 1 as <http://trac.webkit.org/r170158>.

Created attachment 233384 [details]
Part 2

Committed part 2 as <http://trac.webkit.org/r170168>.