Chromium Code Reviews| 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 class FrameLoaderClient; | 39 class FrameLoaderClient; |
| 40 class KURL; | 40 class KURL; |
| 41 class SecurityOrigin; | 41 class SecurityOrigin; |
| 42 | 42 |
| 43 class MixedContentChecker { | 43 class MixedContentChecker { |
| 44 WTF_MAKE_NONCOPYABLE(MixedContentChecker); | 44 WTF_MAKE_NONCOPYABLE(MixedContentChecker); |
| 45 public: | 45 public: |
| 46 MixedContentChecker(LocalFrame*); | 46 MixedContentChecker(LocalFrame*); |
| 47 | 47 |
| 48 bool canDisplayInsecureContent(SecurityOrigin*, const KURL&) const; | 48 bool canDisplayInsecureContent(SecurityOrigin*, const KURL&) const; |
| 49 bool canRunInsecureContent(SecurityOrigin*, const KURL&) const; | 49 bool canRunInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const |
| 50 { | |
| 51 return canRunInsecureContentInternal(securityOrigin, url, false); | |
| 52 } | |
| 53 bool canConnectInsecureWebSocket(SecurityOrigin* securityOrigin, const KURL& url) const | |
| 54 { | |
| 55 return canRunInsecureContentInternal(securityOrigin, url, true); | |
| 56 } | |
| 50 static bool isMixedContent(SecurityOrigin*, const KURL&); | 57 static bool isMixedContent(SecurityOrigin*, const KURL&); |
| 51 | 58 |
| 52 private: | 59 private: |
| 53 // FIXME: This should probably have a separate client from FrameLoader. | 60 // FIXME: This should probably have a separate client from FrameLoader. |
| 54 FrameLoaderClient* client() const; | 61 FrameLoaderClient* client() const; |
| 55 | 62 |
| 63 bool canRunInsecureContentInternal(SecurityOrigin*, const KURL&, bool) const ; | |
|
yhirano
2014/04/23 08:07:48
Can you name the boolean parameter?
tyoshino (SeeGerritForStatus)
2014/04/23 12:39:27
Done.
| |
| 64 | |
| 56 void logWarning(bool allowed, const String& action, const KURL&) const; | 65 void logWarning(bool allowed, const String& action, const KURL&) const; |
| 57 | 66 |
| 58 LocalFrame* m_frame; | 67 LocalFrame* m_frame; |
| 59 }; | 68 }; |
| 60 | 69 |
| 61 } // namespace WebCore | 70 } // namespace WebCore |
| 62 | 71 |
| 63 #endif // MixedContentChecker_h | 72 #endif // MixedContentChecker_h |
| 64 | |
| OLD | NEW |