Title: [262865] trunk/Source/WebKit
- Revision
- 262865
- Author
- [email protected]
- Date
- 2020-06-10 15:34:33 -0700 (Wed, 10 Jun 2020)
Log Message
[Cocoa] Return early from preference change notification handler if there is no observer
https://bugs.webkit.org/show_bug.cgi?id=213050
Reviewed by Darin Adler.
Currently, the observer member is checked inside the loop iterating over all the keys,
but this check should be moved outside of the loop.
No new tests, since this is not a change in behavior.
* UIProcess/Cocoa/PreferenceObserver.mm:
(-[WKUserDefaults _notifyObserversOfChangeFromValuesForKeys:toValuesForKeys:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (262864 => 262865)
--- trunk/Source/WebKit/ChangeLog 2020-06-10 22:23:35 UTC (rev 262864)
+++ trunk/Source/WebKit/ChangeLog 2020-06-10 22:34:33 UTC (rev 262865)
@@ -1,3 +1,18 @@
+2020-06-10 Per Arne Vollan <[email protected]>
+
+ [Cocoa] Return early from preference change notification handler if there is no observer
+ https://bugs.webkit.org/show_bug.cgi?id=213050
+
+ Reviewed by Darin Adler.
+
+ Currently, the observer member is checked inside the loop iterating over all the keys,
+ but this check should be moved outside of the loop.
+
+ No new tests, since this is not a change in behavior.
+
+ * UIProcess/Cocoa/PreferenceObserver.mm:
+ (-[WKUserDefaults _notifyObserversOfChangeFromValuesForKeys:toValuesForKeys:]):
+
2020-06-10 Brady Eidson <[email protected]>
Crash growing a CFData with incremental PDF loading.
Modified: trunk/Source/WebKit/UIProcess/Cocoa/PreferenceObserver.mm (262864 => 262865)
--- trunk/Source/WebKit/UIProcess/Cocoa/PreferenceObserver.mm 2020-06-10 22:23:35 UTC (rev 262864)
+++ trunk/Source/WebKit/UIProcess/Cocoa/PreferenceObserver.mm 2020-06-10 22:34:33 UTC (rev 262865)
@@ -49,6 +49,9 @@
{
[super _notifyObserversOfChangeFromValuesForKeys:oldValues toValuesForKeys:newValues];
+ if (!m_observer)
+ return;
+
for (NSString *key in oldValues) {
id oldValue = oldValues[key];
id newValue = newValues[key];
@@ -68,9 +71,6 @@
encodedString = [data base64EncodedStringWithOptions:0];
}
- if (!m_observer)
- return;
-
auto globalValue = adoptCF(CFPreferencesCopyValue((__bridge CFStringRef)key, kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost));
auto domainValue = adoptCF(CFPreferencesCopyValue((__bridge CFStringRef)key, (__bridge CFStringRef)m_suiteName, kCFPreferencesCurrentUser, kCFPreferencesAnyHost));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
