Revert 177385 "Block mixed <picture> and <img srcset> by default."

trunk/Source/core/loader/ImageLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 165 matching lines @@
 
     Document& document = m_element->document();
     if (!document.isActive())
         return;
 
     AtomicString attr = m_element->imageSourceURL();
 
     KURL url = imageURL();
     ResourcePtr<ImageResource> newImage = 0;
     if (!url.isNull()) {
-        // Unlike raw <img>, we block mixed content inside of <picture> or <img srcset>.
-        ResourceLoaderOptions resourceLoaderOptions;
-        if (isHTMLPictureElement(element()->parentNode()) || !element()->fastGetAttribute(HTMLNames::srcsetAttr).isEmpty())
-            resourceLoaderOptions.mixedContentBlockingTreatment = TreatAsActiveContent;
-        FetchRequest request(ResourceRequest(url), element()->localName(), resourceLoaderOptions);
+        FetchRequest request(ResourceRequest(url), element()->localName());
         if (bypassMainWorldCSP)
             request.setContentSecurityCheck(DoNotCheckContentSecurityPolicy);
 
         AtomicString crossOriginMode = m_element->fastGetAttribute(HTMLNames::crossoriginAttr);
         if (!crossOriginMode.isNull())
             request.setCrossOriginAccessControl(document.securityOrigin(), crossOriginMode);
 
         if (m_loadManually) {
             bool autoLoadOtherImages = document.fetcher()->autoLoadImages();
             document.fetcher()->setAutoLoadImages(false);
@@ skipping 342 matching lines @@
 }
 
 #if ENABLE(OILPAN)
 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover()
 {
     m_loader.willRemoveClient(m_client);
 }
 #endif
 
 }