Title: [288654] trunk/Source/WebCore
- Revision
- 288654
- Author
- wenson_hs...@apple.com
- Date
- 2022-01-26 16:15:46 -0800 (Wed, 26 Jan 2022)
Log Message
Make some minor adjustments after r288621
https://bugs.webkit.org/show_bug.cgi?id=235598
rdar://88032375
Reviewed by Darin Adler.
Address some post-commit review comments.
* dom/ImageOverlay.cpp:
(WebCore::ImageOverlay::updateSubtree):
* testing/Internals.cpp:
(WebCore::Internals::installImageOverlay):
* testing/Internals.mm:
(WebCore::Internals::fakeDataDetectorResultForTesting):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (288653 => 288654)
--- trunk/Source/WebCore/ChangeLog 2022-01-27 00:07:08 UTC (rev 288653)
+++ trunk/Source/WebCore/ChangeLog 2022-01-27 00:15:46 UTC (rev 288654)
@@ -1,3 +1,20 @@
+2022-01-26 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Make some minor adjustments after r288621
+ https://bugs.webkit.org/show_bug.cgi?id=235598
+ rdar://88032375
+
+ Reviewed by Darin Adler.
+
+ Address some post-commit review comments.
+
+ * dom/ImageOverlay.cpp:
+ (WebCore::ImageOverlay::updateSubtree):
+ * testing/Internals.cpp:
+ (WebCore::Internals::installImageOverlay):
+ * testing/Internals.mm:
+ (WebCore::Internals::fakeDataDetectorResultForTesting):
+
2022-01-26 Alan Bujtas <za...@apple.com>
REGRESSION (r281306): Non-breaking space incorrectly collapsed when webkit-nbsp-mode is set to "space"
Modified: trunk/Source/WebCore/dom/ImageOverlay.cpp (288653 => 288654)
--- trunk/Source/WebCore/dom/ImageOverlay.cpp 2022-01-27 00:07:08 UTC (rev 288653)
+++ trunk/Source/WebCore/dom/ImageOverlay.cpp 2022-01-27 00:15:46 UTC (rev 288654)
@@ -212,13 +212,13 @@
mediaControlsContainer = ([&]() -> RefPtr<HTMLElement> {
RefPtr mediaElement = dynamicDowncast<HTMLMediaElement>(element);
if (!mediaElement)
- return { };
+ return nullptr;
Ref shadowRoot = mediaElement->ensureUserAgentShadowRoot();
RefPtr controlsHost = mediaElement->mediaControlsHost();
if (!controlsHost) {
ASSERT_NOT_REACHED();
- return { };
+ return nullptr;
}
auto& containerClass = controlsHost->mediaControlsContainerClassName();
@@ -227,7 +227,7 @@
return &child;
}
ASSERT_NOT_REACHED();
- return { };
+ return nullptr;
})();
#endif // ENABLE(MODERN_MEDIA_CONTROLS)
Modified: trunk/Source/WebCore/testing/Internals.cpp (288653 => 288654)
--- trunk/Source/WebCore/testing/Internals.cpp 2022-01-27 00:07:08 UTC (rev 288653)
+++ trunk/Source/WebCore/testing/Internals.cpp 2022-01-27 00:15:46 UTC (rev 288654)
@@ -5826,8 +5826,8 @@
return makeDataForLine(line);
})
#if ENABLE(DATA_DETECTION)
- , dataDetectors.map([] (auto& dataDetector) -> TextRecognitionDataDetector {
- return TextRecognitionDataDetector { fakeDataDetectorResultForTesting(), { getQuad(dataDetector) } };
+ , dataDetectors.map([](auto& dataDetector) -> TextRecognitionDataDetector {
+ return { fakeDataDetectorResultForTesting(), { getQuad(dataDetector) } };
})
#endif // ENABLE(DATA_DETECTION)
, blocks.map([] (auto& block) {
Modified: trunk/Source/WebCore/testing/Internals.mm (288653 => 288654)
--- trunk/Source/WebCore/testing/Internals.mm 2022-01-27 00:07:08 UTC (rev 288653)
+++ trunk/Source/WebCore/testing/Internals.mm 2022-01-27 00:15:46 UTC (rev 288654)
@@ -179,19 +179,19 @@
DDScannerResult *Internals::fakeDataDetectorResultForTesting()
{
- static NeverDestroyed result = ([]() -> RetainPtr<DDScannerResult> {
+ static NeverDestroyed result = []() -> RetainPtr<DDScannerResult> {
auto scanner = adoptCF(PAL::softLink_DataDetectorsCore_DDScannerCreate(DDScannerTypeStandard, 0, nullptr));
auto stringToScan = CFSTR("webkit.org");
auto query = adoptCF(PAL::softLink_DataDetectorsCore_DDScanQueryCreateFromString(kCFAllocatorDefault, stringToScan, CFRangeMake(0, CFStringGetLength(stringToScan))));
if (!PAL::softLink_DataDetectorsCore_DDScannerScanQuery(scanner.get(), query.get()))
- return { };
+ return nil;
auto results = adoptCF(PAL::softLink_DataDetectorsCore_DDScannerCopyResultsWithOptions(scanner.get(), DDScannerCopyResultsOptionsNoOverlap));
if (!CFArrayGetCount(results.get()))
- return { };
+ return nil;
return { [[PAL::getDDScannerResultClass() resultsFromCoreResults:results.get()] firstObject] };
- })();
+ }();
return result->get();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
