Changeset 222666 in webkit

Timestamp:

Sep 29, 2017 2:35:59 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Fix WKWebViewConfigurationPrivate after r222663
​https://bugs.webkit.org/show_bug.cgi?id=177644

Source/WebKit:

• UIProcess/API/Cocoa/WKWebViewConfiguration.mm:

(-[WKWebViewConfiguration init]):
(-[WKWebViewConfiguration copyWithZone:]):

• UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:

Tools:

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/WebKitCocoa/Configuration.mm: Added.

(TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (modified) (2 diffs)
• Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/Configuration.mm (added)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-09-29  Alex Christensen  <achristensen@webkit.org>
+
+        Fix WKWebViewConfigurationPrivate after r222663
+        https://bugs.webkit.org/show_bug.cgi?id=177644
+
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration init]):
+        (-[WKWebViewConfiguration copyWithZone:]):
+        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+
 2017-09-29  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm

@@ -194 +194 @@
 
 #if PLATFORM(MAC)
+    _cpuLimit = 0;
     _printsBackgrounds = NO;
     _respectsImageOrientation = NO;
@@ -340 +341 @@
 #endif
 #if PLATFORM(MAC)
+    configuration->_cpuLimit = self->_cpuLimit;
     configuration->_userInterfaceDirectionPolicy = self->_userInterfaceDirectionPolicy;
     configuration->_showsURLsInToolTips = self->_showsURLsInToolTips;

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h

@@ -79 +79 @@
 @property (nonatomic, setter=_setImageControlsEnabled:) BOOL _imageControlsEnabled WK_API_AVAILABLE(macosx(10.12));
 @property (nonatomic, readwrite, setter=_setRequiresUserActionForEditingControlsManager:) BOOL _requiresUserActionForEditingControlsManager WK_API_AVAILABLE(macosx(10.12));
-@property (nonatomic, readwrite, setter=_setCPULimit:) double _cpuLimit WK_API_AVAILABLE(WK_MAC_TBA);
+@property (nonatomic, readwrite, setter=_setCPULimit:) double _cpuLimit WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 #endif
 

trunk/Tools/ChangeLog

@@ +1 @@
+2017-09-29  Alex Christensen  <achristensen@webkit.org>
+
+        Fix WKWebViewConfigurationPrivate after r222663
+        https://bugs.webkit.org/show_bug.cgi?id=177644
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebKitCocoa/Configuration.mm: Added.
+        (TEST):
+
 2017-09-28  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -229 +229 @@
                 5C2936931D5BF70D00DEAB1E /* CookieAcceptPolicy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C2936911D5BF63E00DEAB1E /* CookieAcceptPolicy.mm */; };
                 5C2936961D5C00ED00DEAB1E /* CookieMessage.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5C2936941D5BFD1900DEAB1E /* CookieMessage.html */; };
+                5C4A84951F7EEFFC00ACFC54 /* Configuration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C4A84941F7EEFD400ACFC54 /* Configuration.mm */; };
                 5C6E65441D5CEFD400F7862E /* URLParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C6E65411D5CEF8500F7862E /* URLParser.cpp */; };
                 5C726D6F1D3EE06E00C5E1A1 /* InstanceMethodSwizzler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C726D6E1D3EE06800C5E1A1 /* InstanceMethodSwizzler.mm */; };
@@ -1343 +1344 @@
                 5C2936911D5BF63E00DEAB1E /* CookieAcceptPolicy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CookieAcceptPolicy.mm; sourceTree = "<group>"; };
                 5C2936941D5BFD1900DEAB1E /* CookieMessage.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = CookieMessage.html; sourceTree = "<group>"; };
+                5C4A84941F7EEFD400ACFC54 /* Configuration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Configuration.mm; sourceTree = "<group>"; };
                 5C5E633D1D0B67940085A025 /* UniqueRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UniqueRef.cpp; sourceTree = "<group>"; };
                 5C6E65411D5CEF8500F7862E /* URLParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = URLParser.cpp; sourceTree = "<group>"; };
@@ -1965 +1967 @@
                                 1AAD19F51C7CE20300831E47 /* Coding.mm */,
                                 7C3DB8E21D12129B00AE8CC3 /* CommandBackForward.mm */,
+                                5C4A84941F7EEFD400ACFC54 /* Configuration.mm */,
                                 A18AA8CC1C3FA218009B2B97 /* ContentFiltering.h */,
                                 A14FC5861B8991B600D107EB /* ContentFiltering.mm */,
@@ -3196 +3199 @@
                                 7C3DB8E41D12129B00AE8CC3 /* CommandBackForward.mm in Sources */,
                                 1C9EB8411E380DA1005C6442 /* ComplexTextController.cpp in Sources */,
+                                5C4A84951F7EEFFC00ACFC54 /* Configuration.mm in Sources */,
                                 7CB184C61AA3F2100066EDFD /* ContentExtensions.cpp in Sources */,
                                 A1146A8D1D2D7115000FE710 /* ContentFiltering.mm in Sources */,