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

Issue 566533003: Mixed Content: Make MixedContentChecker completely static. (Closed)

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

Description

Mixed Content: Make MixedContentChecker completely static. This patch completes the transition away from MixedContentChecker as an object with state, into a world where it just provides static methods. This should clear up the interface, and make migration to RemoteFrame a bit simpler. After this patch, we no longer hang a MixedContentChecker object off of FrameLoader, nor does MixedContentChecker need to hold a reference to a frame. Everything we need to do the checks can be done by passing values into the checker methods. Note also that this patch deletes a number of expectation files: these are testharness.js tests, which shouldn't have expectations committed into the repository. Rather than modifying them, this patch removes them. As a drive-by, this also corrects the FormsSubmitted counter. It ought to count all form submissions as "FormsSubmitted", and mixed submissions as a subset thereof (e.g. 5 form submissions, with 2 of them mixed would result in FormsSubmitted: 5, MixedContentFormsSubmitted: 2, as opposed to the current 3 and 2). BUG=411184 Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=181885

Patch Set 1 #

Total comments: 2

Patch Set 2 : Fixing tests. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+111 lines, -256 lines) Patch
M LayoutTests/http/tests/navigation/ping-cross-origin-from-https-expected.txt View 1 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-eventsource-in-main-frame-expected.txt View 1 chunk +1 line, -1 line 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-formSubmission-in-main-frame-allowed-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-formSubmission-in-main-frame-blocked-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-formSubmission-in-main-frame-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-frame-in-data-iframe-in-main-frame-blocked-expected.txt View 1 chunk +1 line, -1 line 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt View 1 chunk +1 line, -2 lines 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked-expected.txt View 1 chunk +1 line, -1 line 0 comments Download
D LayoutTests/http/tests/security/mixedContent/laxChecking/websocket/insecure-websocket-in-secure-page-allowed-expected.txt View 1 chunk +0 lines, -7 lines 0 comments Download
D LayoutTests/http/tests/security/mixedContent/laxChecking/websocket/insecure-websocket-in-secure-page-expected.txt View 1 chunk +0 lines, -7 lines 0 comments Download
D LayoutTests/http/tests/security/mixedContent/laxChecking/websocket/insecure-websocket-in-secure-page-worker-allowed-expected.txt View 1 chunk +0 lines, -7 lines 0 comments Download
D LayoutTests/http/tests/security/mixedContent/laxChecking/websocket/insecure-websocket-in-secure-page-worker-expected.txt View 1 chunk +0 lines, -7 lines 0 comments Download
D LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-sandbox-in-secure-page-expected.txt View 1 chunk +0 lines, -6 lines 0 comments Download
D LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-secure-page-allowed-expected.txt View 1 chunk +0 lines, -7 lines 0 comments Download
D LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-secure-page-expected.txt View 1 chunk +0 lines, -6 lines 0 comments Download
D LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-secure-page-worker-allowed-expected.txt View 1 chunk +0 lines, -7 lines 0 comments Download
D LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-secure-page-worker-expected.txt View 1 chunk +0 lines, -6 lines 0 comments Download
M Source/core/fetch/ResourceFetcher.cpp View 1 3 chunks +3 lines, -1 line 0 comments Download
M Source/core/html/HTMLFormElement.cpp View 2 chunks +3 lines, -8 lines 0 comments Download
M Source/core/html/HTMLPlugInElement.cpp View 2 chunks +2 lines, -1 line 0 comments Download
M Source/core/html/parser/XSSAuditor.cpp View 1 chunk +1 line, -0 lines 0 comments Download
M Source/core/loader/FrameLoader.h View 3 chunks +0 lines, -3 lines 0 comments Download
M Source/core/loader/FrameLoader.cpp View 1 2 chunks +1 line, -1 line 0 comments Download
M Source/core/loader/MixedContentChecker.h View 2 chunks +4 lines, -35 lines 0 comments Download
M Source/core/loader/MixedContentChecker.cpp View 4 chunks +83 lines, -130 lines 0 comments Download
M Source/core/loader/PingLoader.cpp View 2 chunks +2 lines, -1 line 0 comments Download
M Source/modules/websockets/MainThreadWebSocketChannel.cpp View 1 chunk +1 line, -1 line 0 comments Download
M Source/modules/websockets/NewWebSocketChannelImpl.cpp View 1 chunk +1 line, -1 line 0 comments Download
M Source/web/WebLocalFrameImpl.cpp View 2 chunks +2 lines, -1 line 0 comments Download

Messages

Total messages: 12 (4 generated)
Mike West
Since you made the terrible mistake of actually reviewing a mixed content patch, I'm sending ...
6 years, 3 months ago (2014-09-11 11:43:54 UTC) #2
Mike West
+nasko@: FYI. Yay!
6 years, 3 months ago (2014-09-11 11:54:02 UTC) #3
jochen (gone - plz use gerrit)
lgtm https://codereview.chromium.org/566533003/diff/1/Source/core/html/HTMLFormElement.cpp File Source/core/html/HTMLFormElement.cpp (right): https://codereview.chromium.org/566533003/diff/1/Source/core/html/HTMLFormElement.cpp#newcode445 Source/core/html/HTMLFormElement.cpp:445: UseCounter::count(document(), UseCounter::FormsSubmitted); that changes the semantics of this ...
6 years, 3 months ago (2014-09-11 12:53:23 UTC) #4
Mike West
Thanks! https://codereview.chromium.org/566533003/diff/1/Source/core/html/HTMLFormElement.cpp File Source/core/html/HTMLFormElement.cpp (right): https://codereview.chromium.org/566533003/diff/1/Source/core/html/HTMLFormElement.cpp#newcode445 Source/core/html/HTMLFormElement.cpp:445: UseCounter::count(document(), UseCounter::FormsSubmitted); On 2014/09/11 12:53:23, jochen wrote: > ...
6 years, 3 months ago (2014-09-11 13:10:40 UTC) #5
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patchset/566533003/1
6 years, 3 months ago (2014-09-11 13:11:48 UTC) #7
commit-bot: I haz the power
Try jobs failed on following builders: linux_blink_rel on tryserver.blink (http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/24412)
6 years, 3 months ago (2014-09-11 14:11:53 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patchset/566533003/20001
6 years, 3 months ago (2014-09-12 06:46:58 UTC) #11
commit-bot: I haz the power
6 years, 3 months ago (2014-09-12 08:25:58 UTC) #12
Message was sent while issue was closed.
Committed patchset #2 (id:20001) as 181885

Powered by Google App Engine
This is Rietveld 408576698