Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(299)

Issue 559333002: Revert of Revert of Mixed Content: Move subframe checks into ResourceFetcher. (Closed)

Created:
6 years, 3 months ago by Mike West
Modified:
6 years, 3 months ago
CC:
blink-reviews, gavinp+loader_chromium.org, Nate Chapin
Project:
blink
Visibility:
Public.

Description

Revert of Revert of Mixed Content: Move subframe checks into ResourceFetcher. (patchset #1 id:1 of https://codereview.chromium.org/550083003/) Reason for revert: This wasn't the root cause of the non-V8 context call. Original issue's description: > Revert of Mixed Content: Move subframe checks into ResourceFetcher. (patchset #2 id:40001 of https://codereview.chromium.org/544573002/) > > Reason for revert: > calls V8 from a non-V8 context > > Original issue's description: > > Mixed Content: Move subframe checks into ResourceFetcher. > > > > Currently we're checking for mixed content when loading the main > > resource of subframes in two places: DocumentLoader and ResourceFetcher. > > The former properly checks against the frame's parent frame, while the > > latter bypasses the checks entirely by virtue of the request's > > 'Resource::Type' being 'Main'. > > > > This is both confusing and difficult to replicate when moving to the > > brave new world of request contexts and frame types that Fetch now > > defines. > > > > This patch drops the DocumentLoader check, and moves the relevant > > logic into ResourceFetcher::canRequest and > > ResourceFetcher::checkInsecureContent. > > > > BUG=400087 > > > > Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=181383 > > TBR=mkwst@chromium.org > NOTREECHECKS=true > NOTRY=true > BUG=400087 > > Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=181543 TBR=jochen@chromium.org NOTREECHECKS=true NOTRY=true BUG=400087 Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=181798

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+47 lines, -42 lines) Patch
M Source/core/fetch/ResourceFetcher.h View 1 chunk +2 lines, -2 lines 0 comments Download
M Source/core/fetch/ResourceFetcher.cpp View 9 chunks +45 lines, -32 lines 0 comments Download
M Source/core/loader/DocumentLoader.cpp View 1 chunk +0 lines, -8 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
Mike West
Created Revert of Revert of Mixed Content: Move subframe checks into ResourceFetcher.
6 years, 3 months ago (2014-09-11 07:24:41 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patchset/559333002/1
6 years, 3 months ago (2014-09-11 07:25:01 UTC) #2
commit-bot: I haz the power
6 years, 3 months ago (2014-09-11 07:25:28 UTC) #3
Message was sent while issue was closed.
Committed patchset #1 (id:1) as 181798

Powered by Google App Engine
This is Rietveld 408576698