2011-06-08 Tom Sepez <tsepez@chromium.org>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Jun 2011 20:05:01 +0000 (20:05 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Jun 2011 20:05:01 +0000 (20:05 +0000)
commitd70997d0efd17bd9fd9b32531184bebc5341c2b8
tree54cb4b85639e723e20f41d337264c641f77f5cae
parent0be7c2a32b6689def26bc55fc1adbd59665a8a46
2011-06-08  Tom Sepez  <tsepez@chromium.org>

        Reviewed by Adam Barth.

        Chromium mixed content blocking, ensure that both preferences and web permissions
        control the outcome.  Ensure notify callback gets invoked even with insecure content.
        https://bugs.webkit.org/show_bug.cgi?id=61946

        * http/tests/security/mixedContent/resources/frame-with-insecure-image.html:
        * http/tests/security/mixedContent/resources/frame-with-insecure-script.html:
        * platform/chromium/http/tests/security/mixedContent: Added.
        * platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed-expected.txt: Added.
        * platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed.html: Added.
        * platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-blocked-expected.txt: Added.
        * platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-blocked.html: Added.
        * platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-allowed-expected.txt: Added.
        * platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-allowed.html: Added.
        * platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-blocked-expected.txt: Added.
        * platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-blocked.html: Added.
2011-06-08  Tom Sepez  <tsepez@chromium.org>

        Reviewed by Adam Barth.

        Cause checks for insecure content blocking policy to callback to client.
        https://bugs.webkit.org/show_bug.cgi?id=61946
        Tests: platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed.html
               platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-blocked.html
               platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-allowed.html
               platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-blocked.html

        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::checkIfDisplayInsecureContent):
        (WebCore::FrameLoader::checkIfRunInsecureContent):
        * loader/FrameLoaderClient.h:
        (WebCore::FrameLoaderClient::allowDisplayingInsecureContent):
        (WebCore::FrameLoaderClient::allowRunningInsecureContent):
2011-06-08  Tom Sepez  <tsepez@chromium.org>

        Reviewed by Adam Barth.

        Add new permission callbacks for mixed content blocking.
        https://bugs.webkit.org/show_bug.cgi?id=61946

        * public/WebPermissionClient.h:
        (WebKit::WebPermissionClient::allowDisplayingInsecureContent):
        (WebKit::WebPermissionClient::allowRunningInsecureContent):
        * src/FrameLoaderClientImpl.cpp:
        (WebKit::FrameLoaderClientImpl::allowDisplayingInsecureContent):
        (WebKit::FrameLoaderClientImpl::allowRunningInsecureContent):
        * src/FrameLoaderClientImpl.h:
2011-06-08  Tom Sepez  <tsepez@chromium.org>

        Reviewed by Adam Barth.

        Add web permissions callbacks for mixed content blocking.
        https://bugs.webkit.org/show_bug.cgi?id=61946

        * DumpRenderTree/chromium/LayoutTestController.cpp:
        (LayoutTestController::setAllowDisplayOfInsecureContent):
        (LayoutTestController::setAllowRunningOfInsecureContent):
        (LayoutTestController::overridePreference):
        * DumpRenderTree/chromium/WebPermissions.cpp:
        (WebPermissions::allowDisplayingInsecureContent):
        (WebPermissions::allowRunningInsecureContent):
        (WebPermissions::setDisplayingInsecureContentAllowed):
        (WebPermissions::setRunningInsecureContentAllowed):
        (WebPermissions::reset):
        * DumpRenderTree/chromium/WebPermissions.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@88377 268f45cc-cd09-0410-ab3c-d52691b4dbfc
22 files changed:
LayoutTests/ChangeLog
LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-image.html
LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-script.html
LayoutTests/platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-allowed.html [new file with mode: 0644]
LayoutTests/platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-blocked-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/http/tests/security/mixedContent/insecure-image-in-main-frame-blocked.html [new file with mode: 0644]
LayoutTests/platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-allowed-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-allowed.html [new file with mode: 0644]
LayoutTests/platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-blocked-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/http/tests/security/mixedContent/insecure-script-in-main-frame-blocked.html [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/FrameLoaderClient.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/public/WebPermissionClient.h
Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
Source/WebKit/chromium/src/FrameLoaderClientImpl.h
Tools/ChangeLog
Tools/DumpRenderTree/chromium/LayoutTestController.cpp
Tools/DumpRenderTree/chromium/WebPermissions.cpp
Tools/DumpRenderTree/chromium/WebPermissions.h