third_party/WebKit/Source/core/loader/MixedContentChecker.h - Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION

Side by Side Diff: third_party/WebKit/Source/core/loader/MixedContentChecker.h

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2012 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 28 matching lines...) Expand all Loading...
39	39

40 namespace blink {	40 namespace blink {

41	41

42 class FrameLoaderClient;	42 class FrameLoaderClient;

43 class LocalFrame;	43 class LocalFrame;

44 class KURL;	44 class KURL;

45 class SecurityOrigin;	45 class SecurityOrigin;

46	46

47 class CORE_EXPORT MixedContentChecker final {	47 class CORE_EXPORT MixedContentChecker final {

48 WTF_MAKE_NONCOPYABLE(MixedContentChecker);	48 WTF_MAKE_NONCOPYABLE(MixedContentChecker);

49 DISALLOW_ALLOCATION();	49 DISALLOW_NEW();

50 public:	50 public:

51 enum ContextType {	51 enum ContextType {

52 ContextTypeNotMixedContent,	52 ContextTypeNotMixedContent,

53 ContextTypeBlockable,	53 ContextTypeBlockable,

54 ContextTypeOptionallyBlockable,	54 ContextTypeOptionallyBlockable,

55 ContextTypeShouldBeBlockable,	55 ContextTypeShouldBeBlockable,

56 };	56 };

57	57

58 enum ReportingStatus { SendReport, SuppressReport };	58 enum ReportingStatus { SendReport, SuppressReport };

59 static bool shouldBlockFetch(LocalFrame*, WebURLRequest::RequestContext, Web URLRequest::FrameType, const KURL&, ReportingStatus = SendReport);	59 static bool shouldBlockFetch(LocalFrame*, WebURLRequest::RequestContext, Web URLRequest::FrameType, const KURL&, ReportingStatus = SendReport);

(...skipping 28 matching lines...) Expand all Loading...
88 static ContextType contextTypeFromContext(WebURLRequest::RequestContext, Loc alFrame*);	88 static ContextType contextTypeFromContext(WebURLRequest::RequestContext, Loc alFrame*);

89 static const char* typeNameFromContext(WebURLRequest::RequestContext);	89 static const char* typeNameFromContext(WebURLRequest::RequestContext);

90 static void logToConsoleAboutFetch(LocalFrame*, const KURL&, WebURLRequest:: RequestContext, bool allowed);	90 static void logToConsoleAboutFetch(LocalFrame*, const KURL&, WebURLRequest:: RequestContext, bool allowed);

91 static void logToConsoleAboutWebSocket(LocalFrame*, const KURL&, bool allowe d);	91 static void logToConsoleAboutWebSocket(LocalFrame*, const KURL&, bool allowe d);

92 static void count(LocalFrame*, WebURLRequest::RequestContext);	92 static void count(LocalFrame*, WebURLRequest::RequestContext);

93 };	93 };

94	94

95 } // namespace blink	95 } // namespace blink

96	96

97 #endif // MixedContentChecker_h	97 #endif // MixedContentChecker_h

OLD	NEW