Diff
Modified: trunk/Source/WebCore/ChangeLog (217519 => 217520)
--- trunk/Source/WebCore/ChangeLog 2017-05-27 03:27:51 UTC (rev 217519)
+++ trunk/Source/WebCore/ChangeLog 2017-05-27 05:25:06 UTC (rev 217520)
@@ -1,3 +1,25 @@
+2017-05-26 Joseph Pecoraro <[email protected]>
+
+ Simply some NSNumber usage
+ https://bugs.webkit.org/show_bug.cgi?id=172677
+
+ Reviewed by Sam Weinig.
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper _addAccessibilityObject:toTextMarkerArray:]):
+ (AXAttributeStringSetFont):
+ (AXAttributeStringSetStyle):
+ * accessibility/mac/AXObjectCacheMac.mm:
+ (WebCore::AXObjectCache::postTextStateChangePlatformNotification):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (AXAttributeStringSetStyle):
+ (AXAttributeStringSetSpelling):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
+ * platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::levelIndicatorFor):
+
2017-05-26 Youenn Fablet <[email protected]>
WebRTC stats should be in milliseconds
Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (217519 => 217520)
--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2017-05-27 03:27:51 UTC (rev 217519)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2017-05-27 05:25:06 UTC (rev 217520)
@@ -2027,7 +2027,7 @@
return YES;
// Explicity set that this is now an element (in case other logic tries to override).
- [wrapper setValue:[NSNumber numberWithBool:YES] forKey:@"isAccessibilityElement"];
+ [wrapper setValue:@YES forKey:@"isAccessibilityElement"];
[array addObject:wrapper];
return YES;
}
@@ -2120,9 +2120,9 @@
if ([size boolValue])
[attrString addAttribute:UIAccessibilityTokenFontSize value:size range:range];
if ([bold boolValue] || (traits & kCTFontTraitBold))
- [attrString addAttribute:UIAccessibilityTokenBold value:[NSNumber numberWithBool:YES] range:range];
+ [attrString addAttribute:UIAccessibilityTokenBold value:@YES range:range];
if (traits & kCTFontTraitItalic)
- [attrString addAttribute:UIAccessibilityTokenItalic value:[NSNumber numberWithBool:YES] range:range];
+ [attrString addAttribute:UIAccessibilityTokenItalic value:@YES range:range];
}
@@ -2143,7 +2143,7 @@
int decor = style.textDecorationsInEffect();
if (decor & TextDecorationUnderline)
- AXAttributeStringSetNumber(attrString, UIAccessibilityTokenUnderline, [NSNumber numberWithBool:YES], range);
+ AXAttributeStringSetNumber(attrString, UIAccessibilityTokenUnderline, @YES, range);
}
static void AXAttributedStringAppendText(NSMutableAttributedString* attrString, Node* node, NSString *text)
Modified: trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (217519 => 217520)
--- trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2017-05-27 03:27:51 UTC (rev 217519)
+++ trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2017-05-27 05:25:06 UTC (rev 217520)
@@ -364,7 +364,7 @@
NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] initWithCapacity:5];
if (m_isSynchronizingSelection)
- [userInfo setObject:[NSNumber numberWithBool:YES] forKey:NSAccessibilityTextStateSyncKey];
+ [userInfo setObject:@YES forKey:NSAccessibilityTextStateSyncKey];
if (intent.type != AXTextStateChangeTypeUnknown) {
[userInfo setObject:@(platformChangeTypeForWebCoreChangeType(intent.type)) forKey:NSAccessibilityTextStateChangeTypeKey];
switch (intent.type) {
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (217519 => 217520)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2017-05-27 03:27:51 UTC (rev 217519)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2017-05-27 05:25:06 UTC (rev 217520)
@@ -824,7 +824,7 @@
// set shadow
if (style.textShadow())
- AXAttributeStringSetNumber(attrString, NSAccessibilityShadowTextAttribute, [NSNumber numberWithBool:YES], range);
+ AXAttributeStringSetNumber(attrString, NSAccessibilityShadowTextAttribute, @YES, range);
else
[attrString removeAttribute:NSAccessibilityShadowTextAttribute range:range];
@@ -845,12 +845,12 @@
auto decorationStyles = TextDecorationPainter::stylesForRenderer(*renderer, decor);
if ((decor & TextDecorationUnderline) != 0) {
- AXAttributeStringSetNumber(attrString, NSAccessibilityUnderlineTextAttribute, [NSNumber numberWithBool:YES], range);
+ AXAttributeStringSetNumber(attrString, NSAccessibilityUnderlineTextAttribute, @YES, range);
AXAttributeStringSetColor(attrString, NSAccessibilityUnderlineColorTextAttribute, nsColor(decorationStyles.underlineColor), range);
}
if ((decor & TextDecorationLineThrough) != 0) {
- AXAttributeStringSetNumber(attrString, NSAccessibilityStrikethroughTextAttribute, [NSNumber numberWithBool:YES], range);
+ AXAttributeStringSetNumber(attrString, NSAccessibilityStrikethroughTextAttribute, @YES, range);
AXAttributeStringSetColor(attrString, NSAccessibilityStrikethroughColorTextAttribute, nsColor(decorationStyles.linethroughColor), range);
}
}
@@ -858,7 +858,7 @@
// Indicate background highlighting.
for (Node* node = renderer->node(); node; node = node->parentNode()) {
if (node->hasTagName(markTag))
- AXAttributeStringSetNumber(attrString, @"AXHighlight", [NSNumber numberWithBool:YES], range);
+ AXAttributeStringSetNumber(attrString, @"AXHighlight", @YES, range);
}
}
@@ -887,12 +887,11 @@
checkTextOfParagraph(*checker, text, TextCheckingTypeSpelling, results, node->document().frame()->selection().selection());
size_t size = results.size();
- NSNumber* trueValue = [NSNumber numberWithBool:YES];
for (unsigned i = 0; i < size; i++) {
const TextCheckingResult& result = results[i];
- AXAttributeStringSetNumber(attrString, NSAccessibilityMisspelledTextAttribute, trueValue, NSMakeRange(result.location + range.location, result.length));
+ AXAttributeStringSetNumber(attrString, NSAccessibilityMisspelledTextAttribute, @YES, NSMakeRange(result.location + range.location, result.length));
#if PLATFORM(MAC)
- AXAttributeStringSetNumber(attrString, NSAccessibilityMarkedMisspelledTextAttribute, trueValue, NSMakeRange(result.location + range.location, result.length));
+ AXAttributeStringSetNumber(attrString, NSAccessibilityMarkedMisspelledTextAttribute, @YES, NSMakeRange(result.location + range.location, result.length));
#endif
}
return;
@@ -906,9 +905,9 @@
break;
NSRange spellRange = NSMakeRange(range.location + currentPosition + misspellingLocation, misspellingLength);
- AXAttributeStringSetNumber(attrString, NSAccessibilityMisspelledTextAttribute, [NSNumber numberWithBool:YES], spellRange);
+ AXAttributeStringSetNumber(attrString, NSAccessibilityMisspelledTextAttribute, @YES, spellRange);
#if PLATFORM(MAC)
- AXAttributeStringSetNumber(attrString, NSAccessibilityMarkedMisspelledTextAttribute, [NSNumber numberWithBool:YES], spellRange);
+ AXAttributeStringSetNumber(attrString, NSAccessibilityMarkedMisspelledTextAttribute, @YES, spellRange);
#endif
currentPosition += misspellingLocation + misspellingLength;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (217519 => 217520)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2017-05-27 03:27:51 UTC (rev 217519)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2017-05-27 05:25:06 UTC (rev 217520)
@@ -932,7 +932,7 @@
[options.get() setObject:headerFields.get() forKey:@"AVURLAssetHTTPHeaderFieldsKey"];
if (player()->doesHaveAttribute("x-itunes-inherit-uri-query-component"))
- [options.get() setObject: [NSNumber numberWithBool: TRUE] forKey: AVURLAssetInheritURIQueryComponentFromReferencingURIKey];
+ [options.get() setObject:@YES forKey: AVURLAssetInheritURIQueryComponentFromReferencingURIKey];
#if PLATFORM(IOS)
// FIXME: rdar://problem/20354688
Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm (217519 => 217520)
--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm 2017-05-27 03:27:51 UTC (rev 217519)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm 2017-05-27 05:25:06 UTC (rev 217520)
@@ -158,7 +158,7 @@
[filter setValue:[NSNumber numberWithFloat:floatValueForLength(blurOperation.stdDeviation(), 0)] forKey:@"inputRadius"];
#if ENABLE(FILTERS_LEVEL_2)
if ([layer isKindOfClass:[CABackdropLayer class]])
- [filter setValue:[NSNumber numberWithBool:YES] forKey:@"inputNormalizeEdges"];
+ [filter setValue:@YES forKey:@"inputNormalizeEdges"];
#endif
[filter setName:filterName];
[array.get() addObject:filter];
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (217519 => 217520)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2017-05-27 03:27:51 UTC (rev 217519)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2017-05-27 05:25:06 UTC (rev 217520)
@@ -1077,8 +1077,7 @@
[cell setBaseWritingDirection:style.isLeftToRightDirection() ? NSWritingDirectionLeftToRight : NSWritingDirectionRightToLeft];
[cell setMinValue:element->min()];
[cell setMaxValue:element->max()];
- RetainPtr<NSNumber> valueObject = [NSNumber numberWithDouble:value];
- [cell setObjectValue:valueObject.get()];
+ [cell setObjectValue:@(value)];
return cell;
}
Modified: trunk/Source/WebKit2/ChangeLog (217519 => 217520)
--- trunk/Source/WebKit2/ChangeLog 2017-05-27 03:27:51 UTC (rev 217519)
+++ trunk/Source/WebKit2/ChangeLog 2017-05-27 05:25:06 UTC (rev 217520)
@@ -1,3 +1,17 @@
+2017-05-26 Joseph Pecoraro <[email protected]>
+
+ Simply some NSNumber usage
+ https://bugs.webkit.org/show_bug.cgi?id=172677
+
+ Reviewed by Sam Weinig.
+
+ * PluginProcess/mac/PluginControllerProxyMac.mm:
+ (WebKit::PluginControllerProxy::platformGeometryDidChange):
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::registerUserDefaultsIfNeeded):
+ * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
+ (-[WKAccessibilityWebPageObject accessibilityAttributeValue:]):
+
2017-05-26 Brent Fulgham <[email protected]>
[WK2] Address thread safety issues with ResourceLoadStatistics
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm (217519 => 217520)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2017-05-27 03:27:51 UTC (rev 217519)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2017-05-27 05:25:06 UTC (rev 217520)
@@ -85,7 +85,7 @@
// We don't want to animate to the new size so we disable actions for this transaction.
[CATransaction begin];
- [CATransaction setValue:[NSNumber numberWithBool:YES] forKey:kCATransactionDisableActions];
+ [CATransaction setValue:@YES forKey:kCATransactionDisableActions];
[pluginLayer setFrame:CGRectMake(0, 0, m_pluginSize.width(), m_pluginSize.height())];
[CATransaction commit];
}
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (217519 => 217520)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-05-27 03:27:51 UTC (rev 217519)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-05-27 05:25:06 UTC (rev 217520)
@@ -105,12 +105,12 @@
didRegister = true;
NSMutableDictionary *registrationDictionary = [NSMutableDictionary dictionary];
- [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitJSCJITEnabledDefaultsKey];
- [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitJSCFTLJITEnabledDefaultsKey];
+ [registrationDictionary setObject:@YES forKey:WebKitJSCJITEnabledDefaultsKey];
+ [registrationDictionary setObject:@YES forKey:WebKitJSCFTLJITEnabledDefaultsKey];
#if ENABLE(NETWORK_CACHE)
- [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitNetworkCacheEnabledDefaultsKey];
- [registrationDictionary setObject:[NSNumber numberWithBool:NO] forKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
+ [registrationDictionary setObject:@YES forKey:WebKitNetworkCacheEnabledDefaultsKey];
+ [registrationDictionary setObject:@NO forKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
#endif
[[NSUserDefaults standardUserDefaults] registerDefaults:registrationDictionary];
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm (217519 => 217520)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm 2017-05-27 03:27:51 UTC (rev 217519)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm 2017-05-27 05:25:06 UTC (rev 217520)
@@ -137,7 +137,7 @@
return NSAccessibilityRoleDescription(NSAccessibilityGroupRole, nil);
if ([attribute isEqualToString:NSAccessibilityFocusedAttribute])
- return [NSNumber numberWithBool:NO];
+ return @NO;
if (!m_page)
return nil;
