ChangeLog

2014-04-16  Darin Adler  <darin@apple.com>

        Use HashMap<unique_ptr> and Vector<unique_ptr> instead of deprecatedDeleteAllValues

        https://bugs.webkit.org/show_bug.cgi?id=73757

        Reviewed by NOBODY (OOPS!).

        * wtf/Vector.h:

        (WTF::deprecatedDeleteAllValues): Deleted.

2014-04-16  Simon Fraser  <simon.fraser@apple.com>

        Don't include CryptographicallyRandomNumber.h in StringImpl.h

Source/WebKit2/ChangeLog

2014-04-16  Darin Adler  <darin@apple.com>

        Use HashMap<unique_ptr> and Vector<unique_ptr> instead of deprecatedDeleteAllValues

        https://bugs.webkit.org/show_bug.cgi?id=73757

        Reviewed by NOBODY (OOPS!).

        * Shared/Plugins/NPRemoteObjectMap.cpp:

        (WebKit::NPRemoteObjectMap::pluginDestroyed): Use new-style code and write the

        deprecatedDeleteAllValues function out using a loop. Might be nice to return here

        and use unique_ptr instead some day, but I tried that before and got it wrong, so

        lets do that another time.

2014-04-16  Benjamin Poulain  <bpoulain@apple.com>

        [iOS][WK2] Fix the DidCommitLoad initial scrolling position

Source/WTF/wtf/Vector.h

@@inline void Vector<T, inlineCapacity, OverflowHandler>::checkConsistency()

}

template<typename T, size_t inlineCapacity, typename OverflowHandler>

void deprecatedDeleteAllValues(const Vector<T, inlineCapacity, OverflowHandler>& collection)

{

    typedef typename Vector<T, inlineCapacity, OverflowHandler>::const_iterator iterator;

    iterator end = collection.end();

    for (iterator it = collection.begin(); it != end; ++it)

        delete *it;

}

template<typename T, size_t inlineCapacity, typename OverflowHandler>

inline void swap(Vector<T, inlineCapacity, OverflowHandler>& a, Vector<T, inlineCapacity, OverflowHandler>& b)

{

    a.swap(b);

Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp

@@NPVariant NPRemoteObjectMap::npVariantDataToNPVariant(const NPVariantData& npVar

void NPRemoteObjectMap::pluginDestroyed(Plugin* plugin)

{

    Vector<NPObjectMessageReceiver*> messageReceivers;

    // Gather the receivers associated with this plug-in.

    for (HashMap<uint64_t, NPObjectMessageReceiver*>::const_iterator it = m_registeredNPObjects.begin(), end = m_registeredNPObjects.end(); it != end; ++it) {

        NPObjectMessageReceiver* npObjectMessageReceiver = it->value;

        if (npObjectMessageReceiver->plugin() == plugin)

            messageReceivers.append(npObjectMessageReceiver);

    }

    // Now delete all the receivers.

    deprecatedDeleteAllValues(messageReceivers);

    Vector<NPObjectProxy*> objectProxies;

    for (HashSet<NPObjectProxy*>::const_iterator it = m_npObjectProxies.begin(), end = m_npObjectProxies.end(); it != end; ++it) {

        NPObjectProxy* npObjectProxy = *it;

        if (npObjectProxy->plugin() == plugin)

            objectProxies.append(npObjectProxy);

    // Gather and delete the receivers associated with this plug-in.

    Vector<NPObjectMessageReceiver*> receivers;

    for (auto* receiver : m_registeredNPObjects.values()) {

        if (receiver->plugin() == plugin)

            receivers.append(receiver);

217204 }

205 for (auto* receiver : receivers)

206 delete receiver;

218207

219208 // Invalidate and remove all proxies associated with this plug-in.

    for (size_t i = 0; i < objectProxies.size(); ++i) {

        NPObjectProxy* npObjectProxy = objectProxies[i];

        npObjectProxy->invalidate();

        ASSERT(m_npObjectProxies.contains(npObjectProxy));

        m_npObjectProxies.remove(npObjectProxy);

    Vector<NPObjectProxy*> proxies;

    for (auto* proxy : m_npObjectProxies) {

        if (proxy->plugin() == plugin)

            proxies.append(proxy);

    }

    for (auto* proxy : proxies) {

        proxy->invalidate();

        ASSERT(m_npObjectProxies.contains(proxy));

        m_npObjectProxies.remove(proxy);

    }

}