| 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 24 matching lines...) Expand all Loading... |
| 35 #include "core/frame/LocalFrameClient.h" | 35 #include "core/frame/LocalFrameClient.h" |
| 36 #include "core/frame/Settings.h" | 36 #include "core/frame/Settings.h" |
| 37 #include "core/frame/UseCounter.h" | 37 #include "core/frame/UseCounter.h" |
| 38 #include "core/inspector/ConsoleMessage.h" | 38 #include "core/inspector/ConsoleMessage.h" |
| 39 #include "core/loader/DocumentLoader.h" | 39 #include "core/loader/DocumentLoader.h" |
| 40 #include "core/loader/FrameLoader.h" | 40 #include "core/loader/FrameLoader.h" |
| 41 #include "platform/RuntimeEnabledFeatures.h" | 41 #include "platform/RuntimeEnabledFeatures.h" |
| 42 #include "platform/network/NetworkUtils.h" | 42 #include "platform/network/NetworkUtils.h" |
| 43 #include "platform/weborigin/SchemeRegistry.h" | 43 #include "platform/weborigin/SchemeRegistry.h" |
| 44 #include "platform/weborigin/SecurityOrigin.h" | 44 #include "platform/weborigin/SecurityOrigin.h" |
| 45 #include "platform/wtf/text/StringBuilder.h" |
| 45 #include "public/platform/WebAddressSpace.h" | 46 #include "public/platform/WebAddressSpace.h" |
| 46 #include "public/platform/WebInsecureRequestPolicy.h" | 47 #include "public/platform/WebInsecureRequestPolicy.h" |
| 47 #include "public/platform/WebMixedContent.h" | 48 #include "public/platform/WebMixedContent.h" |
| 48 #include "wtf/text/StringBuilder.h" | |
| 49 | 49 |
| 50 namespace blink { | 50 namespace blink { |
| 51 | 51 |
| 52 namespace { | 52 namespace { |
| 53 | 53 |
| 54 // When a frame is local, use its full URL to represent the main resource. When | 54 // When a frame is local, use its full URL to represent the main resource. When |
| 55 // the frame is remote, the full URL isn't accessible, so use the origin. This | 55 // the frame is remote, the full URL isn't accessible, so use the origin. This |
| 56 // function is used, for example, to determine the URL to show in console | 56 // function is used, for example, to determine the URL to show in console |
| 57 // messages about mixed content. | 57 // messages about mixed content. |
| 58 KURL MainResourceUrlForFrame(Frame* frame) { | 58 KURL MainResourceUrlForFrame(Frame* frame) { |
| (...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 633 } | 633 } |
| 634 | 634 |
| 635 bool strict_mixed_content_checking_for_plugin = | 635 bool strict_mixed_content_checking_for_plugin = |
| 636 mixed_frame->GetSettings() && | 636 mixed_frame->GetSettings() && |
| 637 mixed_frame->GetSettings()->GetStrictMixedContentCheckingForPlugin(); | 637 mixed_frame->GetSettings()->GetStrictMixedContentCheckingForPlugin(); |
| 638 return WebMixedContent::ContextTypeFromRequestContext( | 638 return WebMixedContent::ContextTypeFromRequestContext( |
| 639 request.GetRequestContext(), strict_mixed_content_checking_for_plugin); | 639 request.GetRequestContext(), strict_mixed_content_checking_for_plugin); |
| 640 } | 640 } |
| 641 | 641 |
| 642 } // namespace blink | 642 } // namespace blink |
| OLD | NEW |