| Index: third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.idl
|
| diff --git a/third_party/WebKit/public/platform/WebMixedContent.h b/third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.idl
|
| similarity index 64%
|
| copy from third_party/WebKit/public/platform/WebMixedContent.h
|
| copy to third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.idl
|
| index e263e5c2c8b931f4c7a59a56727c25b768ffc3fe..c0c9f8fdf14667395f953f9e4dd76442cb352401 100644
|
| --- a/third_party/WebKit/public/platform/WebMixedContent.h
|
| +++ b/third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.idl
|
| @@ -1,3 +1,4 @@
|
| +
|
| /*
|
| * Copyright (C) 2016 Google Inc. All rights reserved.
|
| *
|
| @@ -28,31 +29,25 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef WebMixedContent_h
|
| -#define WebMixedContent_h
|
| -
|
| -#include "public/platform/WebURLRequest.h"
|
| -
|
| -namespace blink {
|
| + // https://www.w3.org/TR/navigation-timing-2/#dfn-current-document
|
|
|
| -// Types and helper functions related to mixed content checks.
|
| -class WebMixedContent {
|
| - public:
|
| - enum class ContextType {
|
| - NotMixedContent,
|
| - Blockable,
|
| - OptionallyBlockable,
|
| - ShouldBeBlockable,
|
| - };
|
| -
|
| - BLINK_PLATFORM_EXPORT static ContextType contextTypeFromRequestContext(
|
| - WebURLRequest::RequestContext,
|
| - bool strictMixedContentCheckingForPlugin);
|
| -
|
| - BLINK_PLATFORM_EXPORT static const char* requestContextName(
|
| - WebURLRequest::RequestContext);
|
| +enum NavigationType {
|
| + "navigate",
|
| + "reload",
|
| + "back_forward",
|
| + "prerender"
|
| };
|
|
|
| -} // namespace blink
|
| -
|
| -#endif // WebMixedContent_h
|
| +interface PerformanceNavigationTiming : PerformanceResourceTiming {
|
| + readonly attribute DOMHighResTimeStamp unloadEventStart;
|
| + readonly attribute DOMHighResTimeStamp unloadEventEnd;
|
| + readonly attribute DOMHighResTimeStamp domInteractive;
|
| + readonly attribute DOMHighResTimeStamp domContentLoadedEventStart;
|
| + readonly attribute DOMHighResTimeStamp domContentLoadedEventEnd;
|
| + readonly attribute DOMHighResTimeStamp domComplete;
|
| + readonly attribute DOMHighResTimeStamp loadEventStart;
|
| + readonly attribute DOMHighResTimeStamp loadEventEnd;
|
| + readonly attribute NavigationType type;
|
| + readonly attribute unsigned short redirectCount;
|
| + serializer = {inherit, attribute};
|
| +};
|
|
|