-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move [WKWebViewConfiguration _respectsImageOrientation] to API::PageC…
…onfiguration https://bugs.webkit.org/show_bug.cgi?id=270557 rdar://124115170 Reviewed by Alex Christensen. This flag already exists in WebPreferences, named "shouldRespectImageOrientation", so it's just a matter of using it directly through `API::PageConfiguration::preferences()`. * Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm: (-[WKWebView _setupPageConfiguration:]): The flag is already set when copying the WebPreferences pointer above. * Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm: (-[WKWebViewConfiguration init]): The flag is already initialized to the same platform-dependent value based on Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml (-[WKWebViewConfiguration copyWithZone:]): The flag is already copied as part of _pageConfiguration's preferences above. (-[WKWebViewConfiguration _respectsImageOrientation]): (-[WKWebViewConfiguration _setRespectsImageOrientation:]): Directly access the flag in _pageConfiguration's preferences through self.preferences, which ensures it's lazily created if needed. * Tools/TestWebKitAPI/SourcesCocoa.txt: * Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * Tools/TestWebKitAPI/cocoa/TestWKWebViewConfiguration.mm: Added. (TEST): Canonical link: https://commits.webkit.org/275929@main
- Loading branch information
Showing
5 changed files
with
72 additions
and
13 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * Copyright (C) 2024 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. | ||
| */ | ||
|
|
||
| #import "config.h" | ||
| #import "Test.h" | ||
|
|
||
| #import <WebKit/WKWebViewConfigurationPrivate.h> | ||
| #import <WebKit/WKWebViewPrivateForTesting.h> | ||
|
|
||
| TEST(WKWebViewConfiguration, FlagsThroughWKWebView) | ||
| { | ||
| { | ||
| auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]); | ||
| auto view = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]); | ||
| BOOL defaultRespectsImageOrientation = [configuration _respectsImageOrientation]; | ||
| EXPECT_EQ([[view configuration] _respectsImageOrientation], defaultRespectsImageOrientation); | ||
| } | ||
|
|
||
| { | ||
| auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]); | ||
| BOOL defaultRespectsImageOrientation = [configuration _respectsImageOrientation]; | ||
| auto view = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]); | ||
| EXPECT_EQ([[view configuration] _respectsImageOrientation], defaultRespectsImageOrientation); | ||
| } | ||
|
|
||
| { | ||
| auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]); | ||
| BOOL defaultRespectsImageOrientation = [configuration _respectsImageOrientation]; | ||
| [configuration _setRespectsImageOrientation:!defaultRespectsImageOrientation]; | ||
| auto view = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]); | ||
| EXPECT_EQ([[view configuration] _respectsImageOrientation], !defaultRespectsImageOrientation); | ||
| } | ||
|
|
||
| { | ||
| auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]); | ||
| BOOL defaultRespectsImageOrientation = [configuration _respectsImageOrientation]; | ||
| auto view = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]); | ||
| EXPECT_EQ([[view configuration] _respectsImageOrientation], defaultRespectsImageOrientation); | ||
| // Spooky action at a distance, due to API::PageConfiguration::copy() doing a shallow copy and keeping a reference to the same WebPreferences. | ||
| [configuration _setRespectsImageOrientation:!defaultRespectsImageOrientation]; | ||
| EXPECT_EQ([[view configuration] _respectsImageOrientation], !defaultRespectsImageOrientation); | ||
| } | ||
| } |