ChangeLog

2015-07-28  Zan Dobersek  <zdobersek@igalia.com>

        restrictedKeyMap() in PerformanceUserTiming.cpp should return a const reference to the HashMap

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

        Reviewed by NOBODY (OOPS!).

        Let restrictedKeyMap() return a const reference to the static HashMap object,

        avoiding copying the map on every retrieval.

        The patch also modifies the code to use a type alias instead of typedefing

        the RestrictedKeyMap type, and replaces the deprecated static local definition

        macro with NeverDestroyed.

        * page/PerformanceUserTiming.cpp:

2015-07-28  Chris Dumez  <cdumez@apple.com>

        Allow lax MIME type parsing for same-origin CSS in quirks mode.

Source/WebCore/page/PerformanceUserTiming.cpp

#include "Performance.h"

#include "PerformanceMark.h"

#include "PerformanceMeasure.h"

34#include <wtf/NeverDestroyed.h>

#include <wtf/dtoa/utils.h>

#include <wtf/text/WTFString.h>

@@namespace WebCore {

namespace {

41 ~~typ~~edef HashMap<String, NavigationTimingFunction> ~~RestrictedKeyMap~~;

42 static RestrictedKeyMap restrictedKeyMap()

42using RestrictedKeyMap = HashMap<String, NavigationTimingFunction>;

43static const RestrictedKeyMap& restrictedKeyMap()

4344{

    DEPRECATED_DEFINE_STATIC_LOCAL(RestrictedKeyMap, map, ());

    if (map.isEmpty()) {

        map.add("navigationStart", &PerformanceTiming::navigationStart);

        map.add("unloadEventStart", &PerformanceTiming::unloadEventStart);

        map.add("unloadEventEnd", &PerformanceTiming::unloadEventEnd);

        map.add("redirectStart", &PerformanceTiming::redirectStart);

        map.add("redirectEnd", &PerformanceTiming::redirectEnd);

        map.add("fetchStart", &PerformanceTiming::fetchStart);

        map.add("domainLookupStart", &PerformanceTiming::domainLookupStart);

        map.add("domainLookupEnd", &PerformanceTiming::domainLookupEnd);

        map.add("connectStart", &PerformanceTiming::connectStart);

        map.add("connectEnd", &PerformanceTiming::connectEnd);

        map.add("secureConnectionStart", &PerformanceTiming::secureConnectionStart);

        map.add("requestStart", &PerformanceTiming::requestStart);

        map.add("responseStart", &PerformanceTiming::responseStart);

        map.add("responseEnd", &PerformanceTiming::responseEnd);

        map.add("domLoading", &PerformanceTiming::domLoading);

        map.add("domInteractive", &PerformanceTiming::domInteractive);

        map.add("domContentLoadedEventStart", &PerformanceTiming::domContentLoadedEventStart);

        map.add("domContentLoadedEventEnd", &PerformanceTiming::domContentLoadedEventEnd);

        map.add("domComplete", &PerformanceTiming::domComplete);

        map.add("loadEventStart", &PerformanceTiming::loadEventStart);

        map.add("loadEventEnd", &PerformanceTiming::loadEventEnd);

    }

    static NeverDestroyed<RestrictedKeyMap> map;

    if (map.get().isEmpty()) {

        map.get().add("navigationStart", &PerformanceTiming::navigationStart);

        map.get().add("unloadEventStart", &PerformanceTiming::unloadEventStart);

        map.get().add("unloadEventEnd", &PerformanceTiming::unloadEventEnd);

        map.get().add("redirectStart", &PerformanceTiming::redirectStart);

        map.get().add("redirectEnd", &PerformanceTiming::redirectEnd);

        map.get().add("fetchStart", &PerformanceTiming::fetchStart);

        map.get().add("domainLookupStart", &PerformanceTiming::domainLookupStart);

        map.get().add("domainLookupEnd", &PerformanceTiming::domainLookupEnd);

        map.get().add("connectStart", &PerformanceTiming::connectStart);

        map.get().add("connectEnd", &PerformanceTiming::connectEnd);

        map.get().add("secureConnectionStart", &PerformanceTiming::secureConnectionStart);

        map.get().add("requestStart", &PerformanceTiming::requestStart);

        map.get().add("responseStart", &PerformanceTiming::responseStart);

        map.get().add("responseEnd", &PerformanceTiming::responseEnd);

        map.get().add("domLoading", &PerformanceTiming::domLoading);

        map.get().add("domInteractive", &PerformanceTiming::domInteractive);

        map.get().add("domContentLoadedEventStart", &PerformanceTiming::domContentLoadedEventStart);

        map.get().add("domContentLoadedEventEnd", &PerformanceTiming::domContentLoadedEventEnd);

        map.get().add("domComplete", &PerformanceTiming::domComplete);

        map.get().add("loadEventStart", &PerformanceTiming::loadEventStart);

        map.get().add("loadEventEnd", &PerformanceTiming::loadEventEnd);

    };

    return map;

}