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 24 matching lines...) Expand all Loading... |
35 #include "core/dom/Document.h" | 35 #include "core/dom/Document.h" |
36 #include "core/frame/Frame.h" | 36 #include "core/frame/Frame.h" |
37 #include "core/inspector/InspectorInstrumentation.h" | 37 #include "core/inspector/InspectorInstrumentation.h" |
38 #include "core/loader/FrameLoader.h" | 38 #include "core/loader/FrameLoader.h" |
39 #include "core/loader/FrameLoaderClient.h" | 39 #include "core/loader/FrameLoaderClient.h" |
40 #include "core/loader/UniqueIdentifier.h" | 40 #include "core/loader/UniqueIdentifier.h" |
41 #include "platform/exported/WrappedResourceRequest.h" | 41 #include "platform/exported/WrappedResourceRequest.h" |
42 #include "platform/network/FormData.h" | 42 #include "platform/network/FormData.h" |
43 #include "platform/network/ResourceRequest.h" | 43 #include "platform/network/ResourceRequest.h" |
44 #include "platform/network/ResourceResponse.h" | 44 #include "platform/network/ResourceResponse.h" |
| 45 #include "platform/weborigin/SecurityOrigin.h" |
| 46 #include "platform/weborigin/SecurityPolicy.h" |
45 #include "public/platform/Platform.h" | 47 #include "public/platform/Platform.h" |
46 #include "public/platform/WebURLLoader.h" | 48 #include "public/platform/WebURLLoader.h" |
47 #include "weborigin/SecurityOrigin.h" | |
48 #include "weborigin/SecurityPolicy.h" | |
49 #include "wtf/OwnPtr.h" | 49 #include "wtf/OwnPtr.h" |
50 #include "wtf/UnusedParam.h" | 50 #include "wtf/UnusedParam.h" |
51 | 51 |
52 namespace WebCore { | 52 namespace WebCore { |
53 | 53 |
54 void PingLoader::loadImage(Frame* frame, const KURL& url) | 54 void PingLoader::loadImage(Frame* frame, const KURL& url) |
55 { | 55 { |
56 if (!frame->document()->securityOrigin()->canDisplay(url)) { | 56 if (!frame->document()->securityOrigin()->canDisplay(url)) { |
57 FrameLoader::reportLocalLoadFailed(frame, url.string()); | 57 FrameLoader::reportLocalLoadFailed(frame, url.string()); |
58 return; | 58 return; |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 m_timeout.startOneShot(60000); | 140 m_timeout.startOneShot(60000); |
141 } | 141 } |
142 | 142 |
143 PingLoader::~PingLoader() | 143 PingLoader::~PingLoader() |
144 { | 144 { |
145 if (m_loader) | 145 if (m_loader) |
146 m_loader->cancel(); | 146 m_loader->cancel(); |
147 } | 147 } |
148 | 148 |
149 } | 149 } |
OLD | NEW |