| 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 14 matching lines...) Expand all Loading... |
| 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 */ | 27 */ |
| 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/page/Console.h" | |
| 36 #include "core/page/DOMWindow.h" | |
| 37 #include "core/page/Frame.h" | 35 #include "core/page/Frame.h" |
| 38 #include "core/page/Settings.h" | 36 #include "core/page/Settings.h" |
| 39 #include "weborigin/SchemeRegistry.h" | |
| 40 #include "weborigin/SecurityOrigin.h" | 37 #include "weborigin/SecurityOrigin.h" |
| 41 #include "wtf/text/CString.h" | |
| 42 #include "wtf/text/WTFString.h" | 38 #include "wtf/text/WTFString.h" |
| 43 | 39 |
| 44 namespace WebCore { | 40 namespace WebCore { |
| 45 | 41 |
| 46 MixedContentChecker::MixedContentChecker(Frame* frame) | 42 MixedContentChecker::MixedContentChecker(Frame* frame) |
| 47 : m_frame(frame) | 43 : m_frame(frame) |
| 48 { | 44 { |
| 49 } | 45 } |
| 50 | 46 |
| 51 FrameLoaderClient* MixedContentChecker::client() const | 47 FrameLoaderClient* MixedContentChecker::client() const |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 return allowed; | 89 return allowed; |
| 94 } | 90 } |
| 95 | 91 |
| 96 void MixedContentChecker::logWarning(bool allowed, const String& action, const K
URL& target) const | 92 void MixedContentChecker::logWarning(bool allowed, const String& action, const K
URL& target) const |
| 97 { | 93 { |
| 98 String message = String(allowed ? "" : "[blocked] ") + "The page at " + m_fr
ame->document()->url().elidedString() + " " + action + " insecure content from "
+ target.elidedString() + ".\n"; | 94 String message = String(allowed ? "" : "[blocked] ") + "The page at " + m_fr
ame->document()->url().elidedString() + " " + action + " insecure content from "
+ target.elidedString() + ".\n"; |
| 99 m_frame->document()->addConsoleMessage(SecurityMessageSource, WarningMessage
Level, message); | 95 m_frame->document()->addConsoleMessage(SecurityMessageSource, WarningMessage
Level, message); |
| 100 } | 96 } |
| 101 | 97 |
| 102 } // namespace WebCore | 98 } // namespace WebCore |
| OLD | NEW |