Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
[Mac] Do not try to update the cache model for every WebPreferences c…
…hange https://bugs.webkit.org/show_bug.cgi?id=91302 Patch by Benjamin Poulain <bpoulain@apple.com> on 2012-07-14 Reviewed by Joseph Pecoraro. Source/WebKit/mac: WebView was listening to any change on any WebPreferences in order to update the cache model. This is unneeded in most cases, we can just listen to updates of the CacheModel property. * WebView/WebPreferences.mm: (-[WebPreferences initWithIdentifier:]): (-[WebPreferences _postCacheModelChangedNotification]): (-[WebPreferences setCacheModel:]): * WebView/WebPreferencesPrivate.h: * WebView/WebView.mm: (+[WebView initialize]): (+[WebView _cacheModelChangedNotification:]): Tools: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/mac/SetAndUpdateCacheModel.mm: Added. (TestWebKitAPI): (TestWebKitAPI::TEST): Canonical link: https://commits.webkit.org/109147@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@122675 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
1 parent
b44c81c
commit 125026d
Showing
7 changed files
with
158 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
Tools/TestWebKitAPI/Tests/mac/SetAndUpdateCacheModel.mm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| * Copyright (C) 2012 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | ||
| * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| * THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #include "config.h" | ||
| #include <wtf/RetainPtr.h> | ||
|
|
||
| #import <WebKit/WebView.h> | ||
| #import <WebKit/WebPreferences.h> | ||
|
|
||
| @interface WebView (WebViewOtherInternal) | ||
| + (WebCacheModel)_cacheModel; | ||
| @end | ||
|
|
||
| namespace TestWebKitAPI { | ||
|
|
||
| TEST(WebKit1, SetAndUpdateCacheModelInitialModel) | ||
| { | ||
| EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]); | ||
|
|
||
| RetainPtr<WebView> webView(AdoptNS, [[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]); | ||
|
|
||
| EXPECT_EQ((int)WebCacheModelDocumentBrowser, (int)[WebView _cacheModel]); | ||
| } | ||
|
|
||
| TEST(WebKit1, SetAndUpdateCacheModelStandardPreferenceChange) | ||
| { | ||
| EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]); | ||
|
|
||
| WebPreferences *standardPreferences = [WebPreferences standardPreferences]; | ||
| EXPECT_EQ((int)WebCacheModelDocumentBrowser, (int)[WebView _cacheModel]); | ||
|
|
||
| [standardPreferences setCacheModel:WebCacheModelPrimaryWebBrowser]; | ||
| EXPECT_EQ((int)WebCacheModelPrimaryWebBrowser, (int)[WebView _cacheModel]); | ||
|
|
||
| [standardPreferences setCacheModel:WebCacheModelDocumentViewer]; | ||
| EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]); | ||
| } | ||
|
|
||
| TEST(WebKit1, SetAndUpdateCacheModelPreferencesChangeMix) | ||
| { | ||
| // On change, the cache model always take the highest value of any preference bound to a WebView. | ||
| EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]); | ||
|
|
||
| WebPreferences *standardPreferences = [WebPreferences standardPreferences]; | ||
| RetainPtr<WebPreferences> customPreferences(AdoptNS, [[WebPreferences alloc] initWithIdentifier:@"SetAndUpdateCacheModelPreferencesChangeMix"]); | ||
|
|
||
| // 1) The customPreferences is not set on a view. | ||
| EXPECT_EQ((int)WebCacheModelDocumentBrowser, (int)[WebView _cacheModel]); | ||
|
|
||
| [standardPreferences setCacheModel:WebCacheModelPrimaryWebBrowser]; | ||
| EXPECT_EQ((int)WebCacheModelPrimaryWebBrowser, (int)[WebView _cacheModel]); | ||
|
|
||
| [standardPreferences setCacheModel:WebCacheModelDocumentViewer]; | ||
| EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]); | ||
| [customPreferences.get() setCacheModel:WebCacheModelPrimaryWebBrowser]; | ||
| EXPECT_EQ((int)WebCacheModelPrimaryWebBrowser, (int)[WebView _cacheModel]); | ||
|
|
||
|
|
||
| // 2) The cache model should follow the highest value of cache model between the two preferences. | ||
| RetainPtr<WebView> webView(AdoptNS, [[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]); | ||
| [webView.get() setPreferences:customPreferences.get()]; | ||
| EXPECT_EQ((int)WebCacheModelPrimaryWebBrowser, (int)[WebView _cacheModel]); | ||
|
|
||
| [customPreferences.get() setCacheModel:WebCacheModelDocumentBrowser]; | ||
| EXPECT_EQ((int)WebCacheModelDocumentBrowser, (int)[WebView _cacheModel]); | ||
|
|
||
| [standardPreferences setCacheModel:WebCacheModelPrimaryWebBrowser]; | ||
| EXPECT_EQ((int)WebCacheModelPrimaryWebBrowser, (int)[WebView _cacheModel]); | ||
| [customPreferences.get() setCacheModel:WebCacheModelDocumentViewer]; | ||
| EXPECT_EQ((int)WebCacheModelPrimaryWebBrowser, (int)[WebView _cacheModel]); | ||
|
|
||
| // 3) Resetting the view should fall back to standardPreferences. | ||
| [standardPreferences setCacheModel:WebCacheModelDocumentViewer]; | ||
| [customPreferences.get() setCacheModel:WebCacheModelPrimaryWebBrowser]; | ||
| EXPECT_EQ((int)WebCacheModelPrimaryWebBrowser, (int)[WebView _cacheModel]); | ||
|
|
||
| webView.clear(); | ||
| EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]); | ||
| } | ||
|
|
||
| } // namespace TestWebKitAPI |