Revert 128780, 128676, 128645
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Sep 2012 18:18:08 +0000 (18:18 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Sep 2012 18:18:08 +0000 (18:18 +0000)
commitb6530f53c3cb4a6cb8c058651312a1afbbda8c49
tree37920b217e32d2574d440e8d32a4ecc418b73d42
parentf3a1c56ce6cd378e7f311c6e8944f7268b13b7b2
Revert 128780, 128676, 128645
https://bugs.webkit.org/show_bug.cgi?id=97022

Patch by Bo Liu <boliu@chromium.org> on 2012-09-18
Reviewed by Adam Barth.

I made these revisions to add in-place reload behavior to ImagesEnabled setting.
Reverting this for now due to them causing performance regression in
chromium, possibly caused by increased calls to
PermissionClient::imageAllowed.

.:

* Source/autotools/symbols.filter:

Source/WebCore:

* WebCore.exp.in:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::didBeginDocument):
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::willSendRequest):
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::load):
* loader/cache/CachedImage.h:
(WebCore::CachedImage::stillNeedsLoad):
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::didAddClient):
* loader/cache/CachedResource.h:
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::CachedResourceLoader):
(WebCore::CachedResourceLoader::requestImage):
(WebCore::CachedResourceLoader::canRequest):
(WebCore::CachedResourceLoader::determineRevalidationPolicy):
(WebCore::CachedResourceLoader::setAutoLoadImages):
* loader/cache/CachedResourceLoader.h:
(CachedResourceLoader):
* page/Settings.cpp:
(WebCore::setLoadsImagesAutomaticallyInAllFrames):
(WebCore::Settings::Settings):
(WebCore::Settings::setLoadsImagesAutomatically):
(WebCore::Settings::loadsImagesAutomaticallyTimerFired):
(WebCore::Settings::setImagesEnabled):
* page/Settings.h:
(Settings):
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setLangAttributeAwareFormControlUIEnabled):
* testing/InternalSettings.h:
(Backup):
(InternalSettings):
* testing/InternalSettings.idl:

Source/WebKit2:

* win/WebKit2.def:

LayoutTests:

* fast/loader/display-image-unset-allows-cached-image-load-expected.txt: Removed.
* fast/loader/display-image-unset-allows-cached-image-load.html: Removed.
* fast/loader/display-image-unset-can-block-image-and-can-reload-in-place-expected.txt: Removed.
* fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html: Removed.
* fast/loader/images-enabled-unset-can-block-image-and-can-reload-in-place-expected.txt: Removed.
* fast/loader/images-enabled-unset-can-block-image-and-can-reload-in-place.html: Removed.
* fast/loader/resources/image1.html: Removed.
* fast/loader/resources/image2.html: Removed.
* platform/chromium/http/tests/permissionclient/image-permissions-expected.txt:
* platform/chromium/permissionclient/image-permissions-expected.txt:
* platform/chromium/permissionclient/image-permissions.html:
* platform/chromium/permissionclient/resources/image.html:
* platform/wk2/Skipped:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@128914 268f45cc-cd09-0410-ab3c-d52691b4dbfc
33 files changed:
ChangeLog
LayoutTests/ChangeLog
LayoutTests/fast/loader/display-image-unset-allows-cached-image-load-expected.txt [deleted file]
LayoutTests/fast/loader/display-image-unset-allows-cached-image-load.html [deleted file]
LayoutTests/fast/loader/display-image-unset-can-block-image-and-can-reload-in-place-expected.txt [deleted file]
LayoutTests/fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html [deleted file]
LayoutTests/fast/loader/images-enabled-unset-can-block-image-and-can-reload-in-place-expected.txt [deleted file]
LayoutTests/fast/loader/images-enabled-unset-can-block-image-and-can-reload-in-place.html [deleted file]
LayoutTests/fast/loader/resources/image1.html [deleted file]
LayoutTests/fast/loader/resources/image2.html [deleted file]
LayoutTests/platform/chromium/http/tests/permissionclient/image-permissions-expected.txt
LayoutTests/platform/chromium/permissionclient/image-permissions-expected.txt
LayoutTests/platform/chromium/permissionclient/image-permissions.html
LayoutTests/platform/chromium/permissionclient/resources/image.html
LayoutTests/platform/wk2/Skipped
Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/SubresourceLoader.cpp
Source/WebCore/loader/cache/CachedImage.cpp
Source/WebCore/loader/cache/CachedImage.h
Source/WebCore/loader/cache/CachedResource.cpp
Source/WebCore/loader/cache/CachedResource.h
Source/WebCore/loader/cache/CachedResourceLoader.cpp
Source/WebCore/loader/cache/CachedResourceLoader.h
Source/WebCore/page/Settings.cpp
Source/WebCore/page/Settings.h
Source/WebCore/testing/InternalSettings.cpp
Source/WebCore/testing/InternalSettings.h
Source/WebCore/testing/InternalSettings.idl
Source/WebKit2/ChangeLog
Source/WebKit2/win/WebKit2.def
Source/autotools/symbols.filter