| 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 | 28 |
| 29 #include "config.h" | 29 #include "config.h" |
| 30 #include "core/loader/MixedContentChecker.h" | 30 #include "core/loader/MixedContentChecker.h" |
| 31 | 31 |
| 32 #include "core/dom/Document.h" | 32 #include "core/dom/Document.h" |
| 33 #include "core/loader/FrameLoader.h" | 33 #include "core/loader/FrameLoader.h" |
| 34 #include "core/loader/FrameLoaderClient.h" | 34 #include "core/loader/FrameLoaderClient.h" |
| 35 #include "core/frame/Frame.h" | 35 #include "core/frame/Frame.h" |
| 36 #include "core/page/Settings.h" | 36 #include "core/page/Settings.h" |
| 37 #include "platform/weborigin/SecurityOrigin.h" | 37 #include "platform/weborigin/SecurityOrigin.h" |
| 38 #include "wtf/text/WTFString.h" | |
| 39 | 38 |
| 40 namespace WebCore { | 39 namespace WebCore { |
| 41 | 40 |
| 42 MixedContentChecker::MixedContentChecker(Frame* frame) | 41 MixedContentChecker::MixedContentChecker(Frame* frame) |
| 43 : m_frame(frame) | 42 : m_frame(frame) |
| 44 { | 43 { |
| 45 } | 44 } |
| 46 | 45 |
| 47 FrameLoaderClient* MixedContentChecker::client() const | 46 FrameLoaderClient* MixedContentChecker::client() const |
| 48 { | 47 { |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 } | 89 } |
| 91 | 90 |
| 92 void MixedContentChecker::logWarning(bool allowed, const String& action, const K
URL& target) const | 91 void MixedContentChecker::logWarning(bool allowed, const String& action, const K
URL& target) const |
| 93 { | 92 { |
| 94 String message = String(allowed ? "" : "[blocked] ") + "The page at '" + m_f
rame->document()->url().elidedString() + "' was loaded over HTTPS, but " + actio
n + " insecure content from '" + target.elidedString() + "': this content should
also be loaded over HTTPS.\n"; | 93 String message = String(allowed ? "" : "[blocked] ") + "The page at '" + m_f
rame->document()->url().elidedString() + "' was loaded over HTTPS, but " + actio
n + " insecure content from '" + target.elidedString() + "': this content should
also be loaded over HTTPS.\n"; |
| 95 MessageLevel messageLevel = allowed ? WarningMessageLevel : ErrorMessageLeve
l; | 94 MessageLevel messageLevel = allowed ? WarningMessageLevel : ErrorMessageLeve
l; |
| 96 m_frame->document()->addConsoleMessage(SecurityMessageSource, messageLevel,
message); | 95 m_frame->document()->addConsoleMessage(SecurityMessageSource, messageLevel,
message); |
| 97 } | 96 } |
| 98 | 97 |
| 99 } // namespace WebCore | 98 } // namespace WebCore |
| OLD | NEW |