diff options
| author | jianli <jianli@chromium.org> | 2014-12-17 11:16:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-17 19:17:05 +0000 |
| commit | 9ae580a9293de35ec2e97b303967c809192c646c (patch) | |
| tree | 4634ee262c77c4303e58cd414ae8404d30089bee /content/child/web_url_request_util.cc | |
| parent | 8c69fd1c7ae4e5d022a523b6031fd56daca81b93 (diff) | |
| download | chromium_src-9ae580a9293de35ec2e97b303967c809192c646c.zip chromium_src-9ae580a9293de35ec2e97b303967c809192c646c.tar.gz chromium_src-9ae580a9293de35ec2e97b303967c809192c646c.tar.bz2 | |
Revert of Map WebURLRequest::RequestContextPlugin to RESOURCE_TYPE_OBJECT. (patchset #6 id:600001 of https://codereview.chromium.org/630973002/)
Reason for revert:
Speculative revert since it might cause browser test PDFExtensionTest.BasicPlugin to fail.
http://build.chromium.org/p/chromium.webkit/builders/Linux%20Tests%20(dbg)/builds/4962
http://build.chromium.org/p/chromium.webkit/builders/Mac10.8%20Tests/builds/11223
http://build.chromium.org/p/chromium.webkit/builders/Win7%20Tests/builds/7530
Original issue's description:
> Map WebURLRequest::RequestContextPlugin to RESOURCE_TYPE_OBJECT.
>
> The WebRequest API should treat both object requests, and requests made
> from those objects (e.g. Flash requesting an .mp4 resource) as type
> Object. We used to do this, then I broke it. :( Now I'm fixing it. :)
>
> BUG=410382
> R=vabr@chromium.org
>
> Committed: https://crrev.com/c3e50e6354188999da307094c5c037d5933f1bc3
> Cr-Commit-Position: refs/heads/master@{#308787}
TBR=jochen@chromium.org,jam@chromium.org,vabr@chromium.org,mkwst@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=410382
Review URL: https://codereview.chromium.org/809103003
Cr-Commit-Position: refs/heads/master@{#308834}
Diffstat (limited to 'content/child/web_url_request_util.cc')
| -rw-r--r-- | content/child/web_url_request_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/child/web_url_request_util.cc b/content/child/web_url_request_util.cc index 2c07b6d..6f03e99 100644 --- a/content/child/web_url_request_util.cc +++ b/content/child/web_url_request_util.cc @@ -100,7 +100,6 @@ ResourceType WebURLRequestToResourceType(const WebURLRequest& request) { // Object case WebURLRequest::RequestContextEmbed: case WebURLRequest::RequestContextObject: - case WebURLRequest::RequestContextPlugin: return RESOURCE_TYPE_OBJECT; // Ping @@ -127,6 +126,7 @@ ResourceType WebURLRequestToResourceType(const WebURLRequest& request) { case WebURLRequest::RequestContextDownload: case WebURLRequest::RequestContextManifest: case WebURLRequest::RequestContextSubresource: + case WebURLRequest::RequestContextPlugin: return RESOURCE_TYPE_SUB_RESOURCE; // TextTrack |