Diff
Modified: trunk/Source/_javascript_Core/API/tests/Regress141275.mm (287367 => 287368)
--- trunk/Source/_javascript_Core/API/tests/Regress141275.mm 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Source/_javascript_Core/API/tests/Regress141275.mm 2021-12-22 19:39:36 UTC (rev 287368)
@@ -126,11 +126,9 @@
{
self = [self init];
if (self) {
- __block NSError* scriptError = nil;
dispatch_semaphore_t dsema = dispatch_semaphore_create(0);
[self evaluateScript:script
- completion:^(NSError* error) {
- scriptError = error;
+ completion:^(NSError*) {
dispatch_semaphore_signal(dsema);
}];
dispatch_semaphore_wait(dsema, DISPATCH_TIME_FOREVER);
Modified: trunk/Source/_javascript_Core/API/tests/testapi.mm (287367 => 287368)
--- trunk/Source/_javascript_Core/API/tests/testapi.mm 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Source/_javascript_Core/API/tests/testapi.mm 2021-12-22 19:39:36 UTC (rev 287368)
@@ -1884,11 +1884,9 @@
static void checkModuleWasRejected(JSContext *context, JSValue *promise)
{
- __block BOOL promiseWasRejected = false;
[promise invokeMethod:@"then" withArguments:@[^() {
checkResult(@"module was rejected as expected", NO);
}, ^(JSValue *error) {
- promiseWasRejected = true;
NSLog(@"%@", [error toString]);
checkResult(@"module graph was rejected with error", ![error isEqualWithTypeCoercionToObject:[JSValue valueWithNullInContext:context]]);
}]];
Modified: trunk/Source/_javascript_Core/ChangeLog (287367 => 287368)
--- trunk/Source/_javascript_Core/ChangeLog 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-12-22 19:39:36 UTC (rev 287368)
@@ -1,3 +1,15 @@
+2021-12-22 Alex Christensen <achristen...@webkit.org>
+
+ Fix compiling with pickier compiler
+ https://bugs.webkit.org/show_bug.cgi?id=234593
+
+ Reviewed by Brady Eidson.
+
+ * API/tests/Regress141275.mm:
+ (-[JSTEvaluator initWithScript:]):
+ * API/tests/testapi.mm:
+ (checkModuleWasRejected):
+
2021-12-22 Zan Dobersek <zdober...@igalia.com>
[RISCV64] Add RISCV64 support in YARR
Modified: trunk/Source/WebCore/ChangeLog (287367 => 287368)
--- trunk/Source/WebCore/ChangeLog 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Source/WebCore/ChangeLog 2021-12-22 19:39:36 UTC (rev 287368)
@@ -1,3 +1,20 @@
+2021-12-22 Alex Christensen <achristen...@webkit.org>
+
+ Fix compiling with pickier compiler
+ https://bugs.webkit.org/show_bug.cgi?id=234593
+
+ Reviewed by Brady Eidson.
+
+ * editing/cocoa/HTMLConverter.mm:
+ (HTMLConverter::_addMarkersToList):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged):
+ * platform/graphics/cocoa/GraphicsContextGLCocoa.mm:
+ (WebCore::GraphicsContextGLANGLE::checkGPUStatus):
+ * platform/graphics/cocoa/SourceBufferParserWebM.cpp:
+ * platform/graphics/coreimage/FEColorMatrixCoreImageApplier.mm:
+ (WebCore::FEColorMatrixCoreImageApplier::apply const):
+
2021-12-22 Antti Koivisto <an...@apple.com>
[:has() pseudo-class] :has() selector invalidation issue with toggling :checked
Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (287367 => 287368)
--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2021-12-22 19:39:36 UTC (rev 287368)
@@ -1886,7 +1886,6 @@
NSString *string = [_attrStr string];
NSString *stringToInsert;
NSDictionary *attrsToInsert = nil;
- PlatformFont *font;
NSParagraphStyle *paragraphStyle;
NSTextTab *tab = nil;
NSTextTab *tabToRemove;
@@ -1913,7 +1912,6 @@
for (NSUInteger idx = range.location; idx < NSMaxRange(range);) {
paragraphRange = [string paragraphRangeForRange:NSMakeRange(idx, 0)];
paragraphStyle = [_attrStr attribute:NSParagraphStyleAttributeName atIndex:idx effectiveRange:&styleRange];
- font = [_attrStr attribute:NSFontAttributeName atIndex:idx effectiveRange:NULL];
if ([[paragraphStyle textLists] count] == listIndex + 1) {
stringToInsert = [NSString stringWithFormat:@"\t%@\t", [list markerForItemNumber:itemNum++]];
insertLength = [stringToInsert length];
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (287367 => 287368)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2021-12-22 19:39:36 UTC (rev 287368)
@@ -2180,7 +2180,6 @@
setDelayCharacteristicsChangedNotification(true);
- bool haveCCTrack = false;
bool hasCaptions = false;
// This is called whenever the tracks collection changes so cache hasVideo and hasAudio since we are
@@ -2211,9 +2210,7 @@
hasVideo = true;
else if ([mediaType isEqualToString:AVMediaTypeAudio])
hasAudio = true;
- else if ([mediaType isEqualToString:AVMediaTypeClosedCaption]) {
- haveCCTrack = true;
- } else if ([mediaType isEqualToString:AVMediaTypeMetadata]) {
+ else if ([mediaType isEqualToString:AVMediaTypeMetadata]) {
hasMetaData = true;
}
}
Modified: trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm (287367 => 287368)
--- trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm 2021-12-22 19:39:36 UTC (rev 287368)
@@ -523,9 +523,7 @@
m_statusCheckCount = (m_statusCheckCount + 1) % statusCheckThreshold;
- GLint restartStatus = 0;
// FIXME: check via KHR_robustness.
- restartStatus = 0;
}
void GraphicsContextGLCocoa::setContextVisibility(bool isVisible)
Modified: trunk/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp (287367 => 287368)
--- trunk/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp 2021-12-22 19:39:36 UTC (rev 287368)
@@ -391,7 +391,6 @@
RefPtr<SharedBuffer> sharedBuffer = currentSegment.getSharedBuffer();
CMBlockBufferRef rawBlockBuffer = nullptr;
uint64_t lastRead = 0;
- size_t destinationOffset = m_positionWithinSegment;
if (!sharedBuffer) {
// We could potentially allocate more memory than needed if the read is partial.
auto err = PAL::CMBlockBufferCreateWithMemoryBlock(kCFAllocatorDefault, nullptr, numToRead, kCFAllocatorDefault, nullptr, 0, numToRead, kCMBlockBufferAssureMemoryNowFlag, &rawBlockBuffer);
@@ -406,7 +405,6 @@
if (!readResult.has_value())
return segmentReadErrorToWebmStatus(readResult.error());
lastRead = readResult.value();
- destinationOffset = 0;
} else {
// TODO: could we only create a new CMBlockBuffer if the backend memory changed since the previous one?
size_t canRead = std::min<size_t>(numToRead, sharedBuffer->size() - m_positionWithinSegment);
Modified: trunk/Source/WebCore/platform/graphics/coreimage/FEColorMatrixCoreImageApplier.mm (287367 => 287368)
--- trunk/Source/WebCore/platform/graphics/coreimage/FEColorMatrixCoreImageApplier.mm 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Source/WebCore/platform/graphics/coreimage/FEColorMatrixCoreImageApplier.mm 2021-12-22 19:39:36 UTC (rev 287368)
@@ -76,7 +76,7 @@
case FECOLORMATRIX_TYPE_UNKNOWN:
case FECOLORMATRIX_TYPE_LUMINANCETOALPHA: // FIXME: Add Luminance to Alpha Implementation
- return nullptr;
+ return false;
}
auto *colorMatrixFilter = [CIFilter filterWithName:@"CIColorMatrix"];
@@ -102,7 +102,7 @@
case FECOLORMATRIX_TYPE_LUMINANCETOALPHA:
case FECOLORMATRIX_TYPE_UNKNOWN:
- return nullptr;
+ return false;
}
result.setCIImage(colorMatrixFilter.outputImage);
Modified: trunk/Source/WebKit/ChangeLog (287367 => 287368)
--- trunk/Source/WebKit/ChangeLog 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Source/WebKit/ChangeLog 2021-12-22 19:39:36 UTC (rev 287368)
@@ -1,3 +1,15 @@
+2021-12-22 Alex Christensen <achristen...@webkit.org>
+
+ Fix compiling with pickier compiler
+ https://bugs.webkit.org/show_bug.cgi?id=234593
+
+ Reviewed by Brady Eidson.
+
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
+ (WebKit::InjectedBundle::initialize):
+
2021-12-22 Wenson Hsieh <wenson_hs...@apple.com>
[iOS] Scroll view pinch zoom gesture sometimes fails to recognize in WKWebView
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (287367 => 287368)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2021-12-22 19:39:36 UTC (rev 287368)
@@ -369,9 +369,6 @@
#if ENABLE(MEDIA_STREAM)
// Allow microphone access if either preference is set because WebRTC requires microphone access.
bool mediaDevicesEnabled = m_defaultPageGroup->preferences().mediaDevicesEnabled();
- bool webRTCEnabled = m_defaultPageGroup->preferences().peerConnectionEnabled();
- if ([defaults objectForKey:@"ExperimentalPeerConnectionEnabled"])
- webRTCEnabled = [defaults boolForKey:@"ExperimentalPeerConnectionEnabled"];
bool isSafari = false;
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm (287367 => 287368)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm 2021-12-22 19:39:36 UTC (rev 287368)
@@ -146,7 +146,7 @@
NSError *error;
if (![m_platformBundle preflightAndReturnError:&error]) {
NSLog(@"InjectedBundle::load failed - preflightAndReturnError failed, error: %@", error);
- return nil;
+ return false;
}
if (![m_platformBundle loadAndReturnError:&error]) {
NSLog(@"InjectedBundle::load failed - loadAndReturnError failed, error: %@", error);
Modified: trunk/Tools/ChangeLog (287367 => 287368)
--- trunk/Tools/ChangeLog 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Tools/ChangeLog 2021-12-22 19:39:36 UTC (rev 287368)
@@ -1,5 +1,18 @@
2021-12-22 Alex Christensen <achristen...@webkit.org>
+ Fix compiling with pickier compiler
+ https://bugs.webkit.org/show_bug.cgi?id=234593
+
+ Reviewed by Brady Eidson.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/ContentRuleListNotification.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/WebKitCocoa/CreateWebArchive.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm:
+ (TestWebKitAPI::TEST):
+
+2021-12-22 Alex Christensen <achristen...@webkit.org>
+
Re-enable WebpagePreferences.WebsitePoliciesDuringRedirect API test on Monterey
https://bugs.webkit.org/show_bug.cgi?id=234607
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ContentRuleListNotification.mm (287367 => 287368)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ContentRuleListNotification.mm 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ContentRuleListNotification.mm 2021-12-22 19:39:36 UTC (rev 287368)
@@ -498,11 +498,9 @@
TestWebKitAPI::Util::run(&removed);
setupLegacyContentRuleList();
- __block bool foundAvailable = false;
[store getAvailableContentRuleListIdentifiers:^(NSArray<NSString *> *identifiers) {
EXPECT_EQ(identifiers.count, 1u);
EXPECT_WK_STREQ(identifiers[0], @"test");
- foundAvailable = true;
}];
TestWebKitAPI::Util::run(&removed);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CreateWebArchive.mm (287367 => 287368)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CreateWebArchive.mm 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CreateWebArchive.mm 2021-12-22 19:39:36 UTC (rev 287368)
@@ -57,14 +57,11 @@
[schemeHandler setStartURLSchemeTaskHandler:^(WKWebView *, id<WKURLSchemeTask> task) {
const char* bytes = nullptr;
- NSString *mimeType;
- if ([task.request.URL.absoluteString isEqualToString:@"webarchivetest://host/main.html"]) {
+ if ([task.request.URL.absoluteString isEqualToString:@"webarchivetest://host/main.html"])
bytes = mainBytes;
- mimeType = @"text/html";
- } else if ([task.request.URL.absoluteString isEqualToString:@"webarchivetest://host/script.js"]) {
+ else if ([task.request.URL.absoluteString isEqualToString:@"webarchivetest://host/script.js"])
bytes = scriptBytes;
- mimeType = @"application/_javascript_";
- } else
+ else
FAIL();
auto response = adoptNS([[NSURLResponse alloc] initWithURL:task.request.URL MIMEType:@"text/html" expectedContentLength:0 textEncodingName:nil]);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm (287367 => 287368)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm 2021-12-22 19:20:14 UTC (rev 287367)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm 2021-12-22 19:39:36 UTC (rev 287368)
@@ -3058,11 +3058,6 @@
EXPECT_WK_STREQ("<p>FOO<br>BAR</p>", [webView stringByEvaluatingJavaScript:@"document.body.innerHTML"]);
- __block bool itemCallbackFired = false;
- [delegate setItemCallback:^(_WKTextManipulationItem *) {
- itemCallbackFired = true;
- }];
-
[webView objectByEvaluatingJavaScript:@"document.querySelector('p').style.display = 'none'"];
[webView objectByEvaluatingJavaScript:@"document.querySelector('p').style.display = ''"];
[webView stringByEvaluatingJavaScript:@"var element = document.createElement('span');"
