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

Issue 605453002: Merge 182515 "Revert "Mixed Content: Make MixedContentChecker co..." (Closed)

Created:
6 years, 2 months ago by kareng
Modified:
6 years, 2 months ago
Reviewers:
hshi1
CC:
blink-reviews, tyoshino+watch_chromium.org, yhirano+watch_chromium.org, blink-reviews-html_chromium.org, mkwst+moarreviews_chromium.org, dglazkov+blink, gavinp+loader_chromium.org, Nate Chapin
Project:
blink
Visibility:
Public.

Description

Merge 182515 "Revert "Mixed Content: Make MixedContentChecker co..." > Revert "Mixed Content: Make MixedContentChecker completely static." > > This reverts commit 4482163b6d2d4c5ec078dd1e6834a8852806c199. > > Reason for revert: see http://crbug.com/415253 > > 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 > TBR=mkwst@chromium.org > NOTRY=true > > Review URL: https://codereview.chromium.org/598533003 TBR=hshi@chromium.org Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=182629

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+188 lines, -102 lines) Patch
M LayoutTests/http/tests/navigation/ping-cross-origin-from-https-expected.txt View 1 chunk +2 lines, -1 line 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 +2 lines, -1 line 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-formSubmission-in-main-frame-blocked-expected.txt View 1 chunk +2 lines, -1 line 0 comments Download
M LayoutTests/http/tests/security/mixedContent/insecure-formSubmission-in-main-frame-expected.txt View 1 chunk +2 lines, -1 line 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 +2 lines, -1 line 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
A + LayoutTests/http/tests/security/mixedContent/laxChecking/websocket/insecure-websocket-in-secure-page-allowed-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/http/tests/security/mixedContent/laxChecking/websocket/insecure-websocket-in-secure-page-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/http/tests/security/mixedContent/laxChecking/websocket/insecure-websocket-in-secure-page-worker-allowed-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/http/tests/security/mixedContent/laxChecking/websocket/insecure-websocket-in-secure-page-worker-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-sandbox-in-secure-page-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-secure-page-allowed-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-secure-page-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-secure-page-worker-allowed-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-secure-page-worker-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M Source/core/fetch/ResourceFetcher.cpp View 3 chunks +1 line, -3 lines 0 comments Download
M Source/core/html/HTMLFormElement.cpp View 2 chunks +8 lines, -3 lines 0 comments Download
M Source/core/html/HTMLPlugInElement.cpp View 2 chunks +1 line, -2 lines 0 comments Download
M Source/core/html/parser/XSSAuditor.cpp View 1 chunk +0 lines, -1 line 0 comments Download
M Source/core/loader/FrameLoader.h View 3 chunks +3 lines, -0 lines 0 comments Download
M Source/core/loader/FrameLoader.cpp View 2 chunks +1 line, -1 line 0 comments Download
M Source/core/loader/MixedContentChecker.h View 3 chunks +36 lines, -4 lines 0 comments Download
M Source/core/loader/MixedContentChecker.cpp View 3 chunks +130 lines, -83 lines 0 comments Download
M Source/core/loader/PingLoader.cpp View 2 chunks +1 line, -2 lines 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 +1 line, -2 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
kareng
6 years, 2 months ago (2014-09-24 19:37:15 UTC) #1
kareng
6 years, 2 months ago (2014-09-24 19:37:31 UTC) #2
Message was sent while issue was closed.
Committed patchset #1 (id:1) manually as r182629.

Powered by Google App Engine
This is Rietveld 408576698