diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/loader/SubframeLoader.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/loader/SubframeLoader.cpp')
| -rw-r--r-- | Source/WebCore/loader/SubframeLoader.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Source/WebCore/loader/SubframeLoader.cpp b/Source/WebCore/loader/SubframeLoader.cpp index ae8ce98..8bfd474 100644 --- a/Source/WebCore/loader/SubframeLoader.cpp +++ b/Source/WebCore/loader/SubframeLoader.cpp @@ -46,7 +46,6 @@ #include "RenderEmbeddedObject.h" #include "RenderView.h" #include "Settings.h" -#include "XSSAuditor.h" #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) #include "HTMLMediaElement.h" @@ -103,11 +102,6 @@ bool SubframeLoader::requestObject(HTMLPlugInImageElement* ownerElement, const S { if (url.isEmpty() && mimeType.isEmpty()) return false; - - if (!m_frame->script()->xssAuditor()->canLoadObject(url)) { - // It is unsafe to honor the request for this object. - return false; - } // FIXME: None of this code should use renderers! RenderEmbeddedObject* renderer = ownerElement->renderEmbeddedObject(); @@ -150,9 +144,6 @@ PassRefPtr<Widget> SubframeLoader::loadMediaPlayerProxyPlugin(Node* node, const { ASSERT(node->hasTagName(videoTag) || node->hasTagName(audioTag)); - if (!m_frame->script()->xssAuditor()->canLoadObject(url.string())) - return 0; - KURL completedURL; if (!url.isEmpty()) completedURL = completeURL(url); |