| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 25 matching lines...) Expand all Loading... |
| 36 #include "core/dom/Document.h" | 36 #include "core/dom/Document.h" |
| 37 #include "core/fetch/FetchContext.h" | 37 #include "core/fetch/FetchContext.h" |
| 38 #include "core/fetch/ResourceFetcher.h" | 38 #include "core/fetch/ResourceFetcher.h" |
| 39 #include "core/fetch/UniqueIdentifier.h" | 39 #include "core/fetch/UniqueIdentifier.h" |
| 40 #include "core/frame/FrameConsole.h" | 40 #include "core/frame/FrameConsole.h" |
| 41 #include "core/frame/LocalFrame.h" | 41 #include "core/frame/LocalFrame.h" |
| 42 #include "core/inspector/InspectorInstrumentation.h" | 42 #include "core/inspector/InspectorInstrumentation.h" |
| 43 #include "core/inspector/InspectorTraceEvents.h" | 43 #include "core/inspector/InspectorTraceEvents.h" |
| 44 #include "core/loader/FrameLoader.h" | 44 #include "core/loader/FrameLoader.h" |
| 45 #include "core/loader/FrameLoaderClient.h" | 45 #include "core/loader/FrameLoaderClient.h" |
| 46 #include "core/loader/MixedContentChecker.h" |
| 46 #include "core/page/Page.h" | 47 #include "core/page/Page.h" |
| 47 #include "platform/exported/WrappedResourceRequest.h" | 48 #include "platform/exported/WrappedResourceRequest.h" |
| 48 #include "platform/network/ResourceError.h" | 49 #include "platform/network/ResourceError.h" |
| 49 #include "platform/network/ResourceRequest.h" | 50 #include "platform/network/ResourceRequest.h" |
| 50 #include "platform/network/ResourceResponse.h" | 51 #include "platform/network/ResourceResponse.h" |
| 51 #include "platform/weborigin/SecurityOrigin.h" | 52 #include "platform/weborigin/SecurityOrigin.h" |
| 52 #include "platform/weborigin/SecurityPolicy.h" | 53 #include "platform/weborigin/SecurityPolicy.h" |
| 53 #include "public/platform/Platform.h" | 54 #include "public/platform/Platform.h" |
| 54 #include "public/platform/WebURLLoader.h" | 55 #include "public/platform/WebURLLoader.h" |
| 55 #include "public/platform/WebURLRequest.h" | 56 #include "public/platform/WebURLRequest.h" |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 InspectorInstrumentation::didFailLoading(frame, m_identifier, ResourceError:
:cancelledError(m_url)); | 222 InspectorInstrumentation::didFailLoading(frame, m_identifier, ResourceError:
:cancelledError(m_url)); |
| 222 frame->console().didFailLoading(m_identifier, ResourceError::cancelledError(
m_url)); | 223 frame->console().didFailLoading(m_identifier, ResourceError::cancelledError(
m_url)); |
| 223 } | 224 } |
| 224 | 225 |
| 225 DEFINE_TRACE(PingLoader) | 226 DEFINE_TRACE(PingLoader) |
| 226 { | 227 { |
| 227 PageLifecycleObserver::trace(visitor); | 228 PageLifecycleObserver::trace(visitor); |
| 228 } | 229 } |
| 229 | 230 |
| 230 } | 231 } |
| OLD | NEW |