Changeset 102300 in webkit


Ignore:
Timestamp:
Dec 7, 2011 6:45:00 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Revert mixed content handling for video fix and follow-up test expectations & Skipped changes.
(r101883, r101918, r101927, r101981, r101986, r101997)
​https://bugs.webkit.org/show_bug.cgi?id=72178

Patch by Aaron Colwell <​acolwell@chromium.org> on 2011-12-07
Reviewed by Adam Barth.

Source/WebCore:

  • loader/SubresourceLoader.cpp:

(WebCore::SubresourceLoader::willSendRequest):

  • loader/cache/CachedRawResource.cpp:
  • loader/cache/CachedRawResource.h:
  • loader/cache/CachedResource.cpp:

(WebCore::defaultPriorityForResourceType):
(WebCore::cachedResourceTypeToTargetType):

  • loader/cache/CachedResource.h:
  • loader/cache/CachedResourceLoader.cpp:

(WebCore::createResource):
(WebCore::CachedResourceLoader::checkInsecureContent):
(WebCore::CachedResourceLoader::canRequest):
(WebCore::CachedResourceLoader::requestResource):

LayoutTests:

  • http/tests/security/mixedContent/insecure-video-in-iframe-expected.txt: Removed.
  • http/tests/security/mixedContent/insecure-video-in-iframe.html: Removed.
  • http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt: Removed.
  • http/tests/security/mixedContent/insecure-video-in-main-frame.html: Removed.
  • http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt: Removed.
  • http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame.html: Removed.
  • http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame-expected.txt: Removed.
  • http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame.html: Removed.
  • http/tests/security/mixedContent/resources/frame-with-insecure-video.html: Removed.
  • http/tests/security/mixedContent/resources/frame-with-redirect-http-to-https-video.html: Removed.
  • http/tests/security/mixedContent/resources/frame-with-redirect-https-to-http-video.html: Removed.
  • platform/chromium-cg-mac-snowleopard/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt: Removed.
  • platform/chromium-cg-mac-snowleopard/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt: Removed.
  • platform/chromium-mac-snowleopard/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt: Removed.
  • platform/chromium-mac-snowleopard/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt: Removed.
  • platform/gtk/Skipped:
  • platform/qt/Skipped:
Location:
trunk
Files:
15 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r102299 r102300  
     12011-12-07  Aaron Colwell  <acolwell@chromium.org>
     2
     3        Revert mixed content handling for video fix and follow-up test expectations & Skipped changes.
     4        (r101883, r101918, r101927, r101981, r101986, r101997)
     5        https://bugs.webkit.org/show_bug.cgi?id=72178
     6
     7        Reviewed by Adam Barth.
     8
     9        * http/tests/security/mixedContent/insecure-video-in-iframe-expected.txt: Removed.
     10        * http/tests/security/mixedContent/insecure-video-in-iframe.html: Removed.
     11        * http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt: Removed.
     12        * http/tests/security/mixedContent/insecure-video-in-main-frame.html: Removed.
     13        * http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt: Removed.
     14        * http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame.html: Removed.
     15        * http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame-expected.txt: Removed.
     16        * http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame.html: Removed.
     17        * http/tests/security/mixedContent/resources/frame-with-insecure-video.html: Removed.
     18        * http/tests/security/mixedContent/resources/frame-with-redirect-http-to-https-video.html: Removed.
     19        * http/tests/security/mixedContent/resources/frame-with-redirect-https-to-http-video.html: Removed.
     20        * platform/chromium-cg-mac-snowleopard/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt: Removed.
     21        * platform/chromium-cg-mac-snowleopard/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt: Removed.
     22        * platform/chromium-mac-snowleopard/http/tests/security/mixedContent/insecure-video-in-main-frame-expected.txt: Removed.
     23        * platform/chromium-mac-snowleopard/http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame-expected.txt: Removed.
     24        * platform/gtk/Skipped:
     25        * platform/qt/Skipped:
     26
    1272011-12-07  Kent Tamura  <tkent@chromium.org>
    228

  • trunk/LayoutTests/platform/gtk/Skipped

    r102281 r102300  
    15961596fullscreen/video-controls-override.html
    15971597
    1598 # https://bugs.webkit.org/show_bug.cgi?id=73743
    1599 http/tests/security/mixedContent/insecure-video-in-main-frame.html
    1600 http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame.html
    1601 http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame.html
    1602 
    16031598# https://bugs.webkit.org/show_bug.cgi?id=73769
    16041599svg/text/text-style-recalc-crash.html

  • trunk/LayoutTests/platform/qt/Skipped

    r102281 r102300  
    25202520fast/forms/select/listbox-in-multi-column.html
    25212521
    2522 # New test introduced in r101883 fail
    2523 # https://bugs.webkit.org/show_bug.cgi?id=72178
    2524 http/tests/security/mixedContent/insecure-video-in-main-frame.html
    2525 http/tests/security/mixedContent/redirect-http-to-https-video-in-main-frame.html
    2526 http/tests/security/mixedContent/redirect-https-to-http-video-in-main-frame.html
    2527 
    25282522# [Qt] REGRESSION(101967): It made editing/style/iframe-onload-crash-mac.html timeout
    25292523# https://bugs.webkit.org/show_bug.cgi?id=73802

  • trunk/Source/WebCore/ChangeLog

    r102297 r102300  
     12011-12-07  Aaron Colwell  <acolwell@chromium.org>
     2
     3        Revert mixed content handling for video fix and follow-up test expectations & Skipped changes.
     4        (r101883, r101918, r101927, r101981, r101986, r101997)
     5        https://bugs.webkit.org/show_bug.cgi?id=72178
     6
     7        Reviewed by Adam Barth.
     8
     9        * loader/SubresourceLoader.cpp:
     10        (WebCore::SubresourceLoader::willSendRequest):
     11        * loader/cache/CachedRawResource.cpp:
     12        * loader/cache/CachedRawResource.h:
     13        * loader/cache/CachedResource.cpp:
     14        (WebCore::defaultPriorityForResourceType):
     15        (WebCore::cachedResourceTypeToTargetType):
     16        * loader/cache/CachedResource.h:
     17        * loader/cache/CachedResourceLoader.cpp:
     18        (WebCore::createResource):
     19        (WebCore::CachedResourceLoader::checkInsecureContent):
     20        (WebCore::CachedResourceLoader::canRequest):
     21        (WebCore::CachedResourceLoader::requestResource):
     22
    1232011-12-07  Ryuan Choi  <ryuan.choi@samsung.com>
    224

  • trunk/Source/WebCore/loader/SubresourceLoader.cpp

    r102239 r102300  
    129129    // Store the previous URL because the call to ResourceLoader::willSendRequest will modify it.
    130130    KURL previousURL = request().url();
    131     CachedResource::Type requestTypeForCanRequest = m_resource->type();
    132 
    133 #if PLATFORM(CHROMIUM)
    134     if (requestTypeForCanRequest == CachedResource::RawResource)
    135         requestTypeForCanRequest = CachedResource::targetTypeToCachedResourceType(request().targetType());
    136 #endif
    137 
     131   
    138132    ResourceLoader::willSendRequest(newRequest, redirectResponse);
    139133    if (!previousURL.isNull() && !newRequest.isNull() && previousURL != newRequest.url()) {
    140         if (!m_document->cachedResourceLoader()->canRequest(requestTypeForCanRequest, newRequest.url())) {
     134        if (!m_document->cachedResourceLoader()->canRequest(m_resource->type(), newRequest.url())) {
    141135            cancel();
    142136            return;

  • trunk/Source/WebCore/loader/cache/CachedRawResource.cpp

    r101883 r102300  
    3838CachedRawResource::CachedRawResource(ResourceRequest& resourceRequest)
    3939    : CachedResource(resourceRequest, RawResource)
    40     , m_dataLength(0)
    41 {
    42 }
    43 
    44 CachedRawResource::CachedRawResource(ResourceRequest& resourceRequest, Type type)
    45     : CachedResource(resourceRequest, type)
    4640    , m_dataLength(0)
    4741{

  • trunk/Source/WebCore/loader/cache/CachedRawResource.h

    r101883 r102300  
    3131class CachedRawResource : public CachedResource {
    3232public:
    33     explicit CachedRawResource(ResourceRequest&);
    34     CachedRawResource(ResourceRequest&, Type);
     33    CachedRawResource(ResourceRequest&);
    3534
    3635    // FIXME: AssociatedURLLoader shouldn't be a DocumentThreadableLoader and therefore shouldn't

  • trunk/Source/WebCore/loader/cache/CachedResource.cpp

    r102239 r102300  
    7575            return ResourceLoadPriorityVeryLow;
    7676#endif
    77 #if ENABLE(VIDEO)
    78         case CachedResource::MediaResource:
    79             return ResourceLoadPriorityMedium;
    80 #endif
    8177#if ENABLE(VIDEO_TRACK)
    8278        case CachedResource::TextTrackResource:
    … …  
    117113        return ResourceRequest::TargetIsSubresource;
    118114#endif
    119 #if ENABLE(VIDEO)
    120     case CachedResource::MediaResource:
    121         return ResourceRequest::TargetIsMedia;
    122 #endif
    123115#if ENABLE(VIDEO_TRACK)
    124116    case CachedResource::TextTrackResource:
    … …  
    129121    return ResourceRequest::TargetIsSubresource;
    130122}
    131 
    132 CachedResource::Type CachedResource::targetTypeToCachedResourceType(ResourceRequest::TargetType type)
    133 {
    134     switch (type) {
    135     case ResourceRequest::TargetIsStyleSheet:
    136         return CachedResource::CSSStyleSheet;
    137     case ResourceRequest::TargetIsScript:
    138         return CachedResource::Script;
    139     case ResourceRequest::TargetIsFontResource:
    140         return CachedResource::FontResource;
    141     case ResourceRequest::TargetIsImage:
    142     case ResourceRequest::TargetIsFavicon:
    143         return CachedResource::ImageResource;
    144     case ResourceRequest::TargetIsSubresource:
    145         return CachedResource::RawResource;
    146     case ResourceRequest::TargetIsWorker:
    147     case ResourceRequest::TargetIsSharedWorker:
    148         return CachedResource::Script;
    149     case ResourceRequest::TargetIsObject:
    150     case ResourceRequest::TargetIsMainFrame:
    151     case ResourceRequest::TargetIsSubframe:
    152     case ResourceRequest::TargetIsXHR:
    153     case ResourceRequest::TargetIsUnspecified:
    154         return CachedResource::RawResource;
    155 #if ENABLE(LINK_PREFETCH)
    156     case ResourceRequest::TargetIsPrefetch:
    157         return CachedResource::LinkPrefetch;
    158     case ResourceRequest::TargetIsPrerender:
    159         return CachedResource::LinkPrerender;
    160 #endif
    161 #if ENABLE(VIDEO)
    162     case ResourceRequest::TargetIsMedia:
    163         return CachedResource::MediaResource;
    164 #endif
    165 #if ENABLE(VIDEO_TRACK)
    166     case ResourceRequest::TargetIsTextTrack:
    167         return CachedResource::TextTrackResource;
    168 #endif
    169     }
    170     ASSERT_NOT_REACHED();
    171     return CachedResource::RawResource;
    172 }
    173 
    174123#endif
    175124

  • trunk/Source/WebCore/loader/cache/CachedResource.h

    r101883 r102300  
    8080        , ShaderResource
    8181#endif
    82 #if ENABLE(VIDEO)
    83         , MediaResource
    84 #endif
    8582    };
    8683
    … …  
    242239#if PLATFORM(CHROMIUM)
    243240    virtual void didDownloadData(int) { }
    244 
    245     static Type targetTypeToCachedResourceType(ResourceRequest::TargetType);
    246241#endif
    247242

  • trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

    r101883 r102300  
    8989        return new CachedResource(request, CachedResource::LinkSubresource);
    9090#endif
    91 #if ENABLE(VIDEO)
    92     case CachedResource::MediaResource:
    93         return new CachedRawResource(request, CachedResource::MediaResource);
    94 #endif
    9591#if ENABLE(VIDEO_TRACK)
    9692    case CachedResource::TextTrackResource:
    … …  
    258254                return false;
    259255        break;
    260 #if ENABLE(VIDEO)
    261     case CachedResource::MediaResource:
    262 #endif
    263256#if ENABLE(VIDEO_TRACK)
    264257    case CachedResource::TextTrackResource:
    … …  
    312305    case CachedResource::LinkSubresource:
    313306#endif
    314 #if ENABLE(VIDEO)
    315     case CachedResource::MediaResource:
    316 #endif
    317307#if ENABLE(VIDEO_TRACK)
    318308    case CachedResource::TextTrackResource:
    … …  
    380370#endif
    381371        break;
    382 #if ENABLE(VIDEO)
    383     case CachedResource::MediaResource:
    384372#if ENABLE(VIDEO_TRACK)
    385373    case CachedResource::TextTrackResource:
    386 #endif
    387374        // Cues aren't called out in the CPS spec yet, but they only work with a media element
    388375        // so use the media policy.
    … …  
    416403        return 0;
    417404
    418     CachedResource::Type requestTypeForCanRequest = type;
    419 
    420 #if PLATFORM(CHROMIUM)
    421     if (requestTypeForCanRequest == CachedResource::RawResource)
    422         requestTypeForCanRequest = CachedResource::targetTypeToCachedResourceType(request.targetType());
    423 #endif
    424 
    425     if (!canRequest(requestTypeForCanRequest, url, forPreload))
     405    if (!canRequest(type, url, forPreload))
    426406        return 0;
    427407
Note: See TracChangeset for help on using the changeset viewer.