[webkit-changes] [292685] trunk/Source/WebCore
Title: [292685] trunk/Source/WebCore Revision 292685 Author za...@apple.com Date 2022-04-09 19:59:35 -0700 (Sat, 09 Apr 2022) Log Message [Text autosizing] Remove redundant lineCountForTextAutosizing member function https://bugs.webkit.org/show_bug.cgi?id=239034 Reviewed by Antti Koivisto. * rendering/RenderBlockFlow.cpp: (WebCore::RenderBlockFlow::adjustComputedFontSizes): stop walking the list item children when we see multiple lines. (WebCore::RenderBlockFlow::lineCountForTextAutosizing): Deleted. * rendering/RenderBlockFlow.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/RenderBlockFlow.cpp trunk/Source/WebCore/rendering/RenderBlockFlow.h Diff Modified: trunk/Source/WebCore/ChangeLog (292684 => 292685) --- trunk/Source/WebCore/ChangeLog 2022-04-10 02:14:13 UTC (rev 292684) +++ trunk/Source/WebCore/ChangeLog 2022-04-10 02:59:35 UTC (rev 292685) @@ -1,3 +1,15 @@ +2022-04-09 Alan Bujtas + +[Text autosizing] Remove redundant lineCountForTextAutosizing member function +https://bugs.webkit.org/show_bug.cgi?id=239034 + +Reviewed by Antti Koivisto. + +* rendering/RenderBlockFlow.cpp: +(WebCore::RenderBlockFlow::adjustComputedFontSizes): stop walking the list item children when we see multiple lines. +(WebCore::RenderBlockFlow::lineCountForTextAutosizing): Deleted. +* rendering/RenderBlockFlow.h: + 2022-04-09 Khem Raj Include locale.h for LC_MESSAGES definition. Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (292684 => 292685) --- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2022-04-10 02:14:13 UTC (rev 292684) +++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2022-04-10 02:59:35 UTC (rev 292685) @@ -3771,19 +3771,6 @@ return true; } -int RenderBlockFlow::lineCountForTextAutosizing() -{ -if (style().visibility() != Visibility::Visible) -return 0; -if (childrenInline()) -return lineCount(); -// Only descend into list items. -int count = 0; -for (auto& listItem : childrenOfType(*this)) -count += listItem.lineCount(); -return count; -} - static bool isNonBlocksOrNonFixedHeightListItems(const RenderObject& renderer) { if (!renderer.isRenderBlock()) @@ -3815,18 +3802,25 @@ if (visibleWidth >= width()) return; -unsigned lineCount; -if (m_lineCountForTextAutosizing == NOT_SET) { -int count = lineCountForTextAutosizing(); -if (!count) +unsigned lineCount = m_lineCountForTextAutosizing; +if (lineCount == NOT_SET) { +if (style().visibility() != Visibility::Visible) lineCount = NO_LINE; -else if (count == 1) -lineCount = ONE_LINE; -else -lineCount = MULTI_LINE; -} else -lineCount = m_lineCountForTextAutosizing; - +else { +size_t lineCountInBlock = 0; +if (childrenInline()) +lineCountInBlock = this->lineCount(); +else { +for (auto& listItem : childrenOfType(*this)) { +lineCountInBlock += listItem.lineCount(); +if (lineCountInBlock > 1) +break; +} +} +lineCount = !lineCountInBlock ? NO_LINE : lineCountInBlock == 1 ? ONE_LINE : MULTI_LINE; +} +} + ASSERT(lineCount != NOT_SET); if (lineCount == NO_LINE) return; Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (292684 => 292685) --- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2022-04-10 02:14:13 UTC (rev 292684) +++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2022-04-10 02:59:35 UTC (rev 292685) @@ -546,7 +546,6 @@ void materializeRareBlockFlowData(); #if ENABLE(TEXT_AUTOSIZING) -int lineCountForTextAutosizing(); void adjustComputedFontSizes(float size, float visibleWidth); void resetComputedFontSize() { ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [292684] trunk/Source/WebCore
Title: [292684] trunk/Source/WebCore Revision 292684 Author commit-qu...@webkit.org Date 2022-04-09 19:14:13 -0700 (Sat, 09 Apr 2022) Log Message Include locale.h for LC_MESSAGES definition. https://bugs.webkit.org/show_bug.cgi?id=239030 Patch by Khem Raj on 2022-04-09 Reviewed by Michael Catanzaro. * accessibility/atspi/AccessibilityRootAtspi.cpp: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (292683 => 292684) --- trunk/Source/WebCore/ChangeLog 2022-04-09 22:42:11 UTC (rev 292683) +++ trunk/Source/WebCore/ChangeLog 2022-04-10 02:14:13 UTC (rev 292684) @@ -1,3 +1,12 @@ +2022-04-09 Khem Raj + +Include locale.h for LC_MESSAGES definition. +https://bugs.webkit.org/show_bug.cgi?id=239030 + +Reviewed by Michael Catanzaro. + +* accessibility/atspi/AccessibilityRootAtspi.cpp: + 2022-04-09 Simon Fraser Put layer backing store buffers into the per-RemoteRenderingBackend IOSurfacePool Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.cpp (292683 => 292684) --- trunk/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.cpp 2022-04-09 22:42:11 UTC (rev 292683) +++ trunk/Source/WebCore/accessibility/atspi/AccessibilityRootAtspi.cpp 2022-04-10 02:14:13 UTC (rev 292684) @@ -30,6 +30,7 @@ #include "FrameView.h" #include "Page.h" #include +#include namespace WebCore { ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [292683] trunk/Source
Title: [292683] trunk/Source Revision 292683 Author simon.fra...@apple.com Date 2022-04-09 15:42:11 -0700 (Sat, 09 Apr 2022) Log Message Put layer backing store buffers into the per-RemoteRenderingBackend IOSurfacePool https://bugs.webkit.org/show_bug.cgi?id=238972 Reviewed by Tim Horton. Source/WebCore: Add IOSurfacePool::create(). * platform/graphics/cg/IOSurfacePool.cpp: (WebCore::IOSurfacePool::create): * platform/graphics/cg/IOSurfacePool.h: Source/WebKit: Give each RemoteRenderingBackend its own IOSurfacePool. RemoteImageBuffer gets surfaces from this pool, and RemoteRenderingBackend::willDestroyImageBuffer() puts surfaces in, if they are layer backing store surfaces. The low memory handler removes all surfaces from the pool. * GPUProcess/graphics/RemoteImageBuffer.h: (WebKit::RemoteImageBuffer::create): (WebKit::RemoteImageBuffer::~RemoteImageBuffer): * GPUProcess/graphics/RemoteRenderingBackend.cpp: (WebKit::RemoteRenderingBackend::RemoteRenderingBackend): (WebKit::RemoteRenderingBackend::willDestroyImageBuffer): (WebKit::RemoteRenderingBackend::lowMemoryHandler): * GPUProcess/graphics/RemoteRenderingBackend.h: (WebKit::RemoteRenderingBackend::ioSurfacePool const): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/GPUProcess/graphics/RemoteImageBuffer.h trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h Diff Modified: trunk/Source/WebCore/ChangeLog (292682 => 292683) --- trunk/Source/WebCore/ChangeLog 2022-04-09 22:25:24 UTC (rev 292682) +++ trunk/Source/WebCore/ChangeLog 2022-04-09 22:42:11 UTC (rev 292683) @@ -1,3 +1,17 @@ +2022-04-09 Simon Fraser + +Put layer backing store buffers into the per-RemoteRenderingBackend IOSurfacePool +https://bugs.webkit.org/show_bug.cgi?id=238972 + + +Reviewed by Tim Horton. + +Add IOSurfacePool::create(). + +* platform/graphics/cg/IOSurfacePool.cpp: +(WebCore::IOSurfacePool::create): +* platform/graphics/cg/IOSurfacePool.h: + 2022-04-09 Chris Dumez The Youtube plugin replacement should only work for actual Youtube URLs Modified: trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp (292682 => 292683) --- trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp 2022-04-09 22:25:24 UTC (rev 292682) +++ trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp 2022-04-09 22:42:11 UTC (rev 292683) @@ -61,6 +61,11 @@ return pool; } +std::unique_ptr IOSurfacePool::create() +{ +return std::unique_ptr(new IOSurfacePool()); +} + static bool surfaceMatchesParameters(IOSurface& surface, IntSize requestedSize, const DestinationColorSpace& colorSpace, IOSurface::Format format) { if (format != surface.format()) Modified: trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h (292682 => 292683) --- trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h 2022-04-09 22:25:24 UTC (rev 292682) +++ trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h 2022-04-09 22:42:11 UTC (rev 292683) @@ -48,11 +48,12 @@ public: WEBCORE_EXPORT static IOSurfacePool& sharedPool(); +WEBCORE_EXPORT static std::unique_ptr create(); std::unique_ptr takeSurface(IntSize, const DestinationColorSpace&, IOSurface::Format); WEBCORE_EXPORT void addSurface(std::unique_ptr&&); -void discardAllSurfaces(); +WEBCORE_EXPORT void discardAllSurfaces(); WEBCORE_EXPORT void setPoolSize(size_t); Modified: trunk/Source/WebKit/ChangeLog (292682 => 292683) --- trunk/Source/WebKit/ChangeLog 2022-04-09 22:25:24 UTC (rev 292682) +++ trunk/Source/WebKit/ChangeLog 2022-04-09 22:42:11 UTC (rev 292683) @@ -1,3 +1,27 @@ +2022-04-09 Simon Fraser + +Put layer backing store buffers into the per-RemoteRenderingBackend IOSurfacePool +https://bugs.webkit.org/show_bug.cgi?id=238972 + + +Reviewed by Tim Horton. + +Give each RemoteRenderingBackend its own IOSurfacePool. RemoteImageBuffer gets surfaces +from this pool, and RemoteRenderingBackend::willDestroyImageBuffer() puts surfaces in, +if they are layer backing store surfaces. + +The low memory handler removes all surfaces from the pool. + +* GPUProcess/graphics/RemoteImageBuffer.h: +(WebKit::RemoteImageBuffer::create): +(WebKit::RemoteImageBuffer::~RemoteImageBuffer): +* GPUProcess/graphics/RemoteRenderingBackend.cpp: +(WebKit::RemoteRenderingBackend::RemoteRenderingBackend): +(WebKit::RemoteRenderingBackend::willDestroyImageBuffer): +(WebKit::RemoteRenderingBackend::lowMemoryHandler): +* GPUProcess/graphics/RemoteRenderingBackend.h: +(WebKit::RemoteRenderingBackend::ioSurfacePool const): + 2022-04-09 Adrian
[webkit-changes] [292682] trunk/Source/JavaScriptCore
Title: [292682] trunk/Source/_javascript_Core Revision 292682 Author ysuz...@apple.com Date 2022-04-09 15:25:24 -0700 (Sat, 09 Apr 2022) Log Message [JSC] Use Vector with inline capacity in ObjectPropertyConditionSet creation https://bugs.webkit.org/show_bug.cgi?id=239025 Reviewed by Keith Miller. Since we anyway allocate ThreadSafeRefCountedFixedVector in ObjectPropertyConditionSet, which has exact size, generateXXX and mergeWith should not allocate heap Vector just for temporarily collecting ObjectPropertyCondition. We pick 8 in generateXXX function and 16 for mergeWith function. This looks reasonable number and at least covers all cases in Speedometer2. * bytecode/ObjectPropertyConditionSet.cpp: (JSC::ObjectPropertyConditionSet::mergedWith const): (JSC::generateConditionsForPropertyMiss): (JSC::generateConditionsForPropertySetterMiss): (JSC::generateConditionsForPrototypePropertyHit): (JSC::generateConditionsForPrototypePropertyHitCustom): (JSC::generateConditionsForInstanceOf): (JSC::generateConditionsForPrototypeEquivalenceConcurrently): (JSC::generateConditionsForPropertyMissConcurrently): (JSC::generateConditionsForPropertySetterMissConcurrently): * bytecode/ObjectPropertyConditionSet.h: (JSC::ObjectPropertyConditionSet::create): Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/bytecode/ObjectPropertyConditionSet.cpp trunk/Source/_javascript_Core/bytecode/ObjectPropertyConditionSet.h Diff Modified: trunk/Source/_javascript_Core/ChangeLog (292681 => 292682) --- trunk/Source/_javascript_Core/ChangeLog 2022-04-09 20:26:16 UTC (rev 292681) +++ trunk/Source/_javascript_Core/ChangeLog 2022-04-09 22:25:24 UTC (rev 292682) @@ -1,3 +1,27 @@ +2022-04-09 Yusuke Suzuki + +[JSC] Use Vector with inline capacity in ObjectPropertyConditionSet creation +https://bugs.webkit.org/show_bug.cgi?id=239025 + +Reviewed by Keith Miller. + +Since we anyway allocate ThreadSafeRefCountedFixedVector in ObjectPropertyConditionSet, which has exact size, +generateXXX and mergeWith should not allocate heap Vector just for temporarily collecting ObjectPropertyCondition. +We pick 8 in generateXXX function and 16 for mergeWith function. This looks reasonable number and at least covers all cases in Speedometer2. + +* bytecode/ObjectPropertyConditionSet.cpp: +(JSC::ObjectPropertyConditionSet::mergedWith const): +(JSC::generateConditionsForPropertyMiss): +(JSC::generateConditionsForPropertySetterMiss): +(JSC::generateConditionsForPrototypePropertyHit): +(JSC::generateConditionsForPrototypePropertyHitCustom): +(JSC::generateConditionsForInstanceOf): +(JSC::generateConditionsForPrototypeEquivalenceConcurrently): +(JSC::generateConditionsForPropertyMissConcurrently): +(JSC::generateConditionsForPropertySetterMissConcurrently): +* bytecode/ObjectPropertyConditionSet.h: +(JSC::ObjectPropertyConditionSet::create): + 2022-04-09 Adrian Perez de Castro [GTK][WPE] Missing inter-module documentation links Modified: trunk/Source/_javascript_Core/bytecode/ObjectPropertyConditionSet.cpp (292681 => 292682) --- trunk/Source/_javascript_Core/bytecode/ObjectPropertyConditionSet.cpp 2022-04-09 20:26:16 UTC (rev 292681) +++ trunk/Source/_javascript_Core/bytecode/ObjectPropertyConditionSet.cpp 2022-04-09 22:25:24 UTC (rev 292682) @@ -102,7 +102,7 @@ if (!isValid() || !other.isValid()) return invalid(); -Vector result; +Vector result; if (!isEmpty()) result.append(m_data->begin(), m_data->size()); @@ -121,7 +121,7 @@ result.append(newCondition); } -return create(WTFMove(result)); +return ObjectPropertyConditionSet::create(WTFMove(result)); } bool ObjectPropertyConditionSet::structuresEnsureValidity() const @@ -247,7 +247,7 @@ ObjectPropertyConditionSet generateConditions( VM& vm, JSGlobalObject* globalObject, Structure* structure, JSObject* prototype, const Functor& functor) { -Vector conditions; +Vector conditions; for (;;) { if (ObjectPropertyConditionSetInternal::verbose) @@ -315,7 +315,7 @@ { return generateConditions( vm, globalObject, headStructure, nullptr, -[&] (Vector& conditions, JSObject* object) -> bool { +[&](auto& conditions, JSObject* object) -> bool { ObjectPropertyCondition result = generateCondition(vm, owner, object, uid, PropertyCondition::Absence, Concurrency::MainThread); if (!result) @@ -330,7 +330,7 @@ { return generateConditions( vm, globalObject, headStructure, nullptr, -[&] (Vector& conditions, JSObject* object) -> bool { +[&](auto& conditions, JSObject* object) -> bool { ObjectPropertyCondition result = generateCondition(vm, owner, object, uid,
[webkit-changes] [292681] trunk
Title: [292681] trunk Revision 292681 Author mmaxfi...@apple.com Date 2022-04-09 13:26:16 -0700 (Sat, 09 Apr 2022) Log Message [WKTR] Reset minimum font size WKPreference between tests https://bugs.webkit.org/show_bug.cgi?id=239027 Reviewed by Chris Dumez. Tools: Some tests use uiController to set the minimum font size WKPreference. We need to reset it between tests. * WebKitTestRunner/TestController.cpp: (WTR::TestController::resetPreferencesToConsistentValues): LayoutTests: Remove unnecessary ephemeral session. * fast/forms/visual-hebrew-text-field.html: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/fast/forms/visual-hebrew-text-field.html trunk/Tools/ChangeLog trunk/Tools/WebKitTestRunner/TestController.cpp Diff Modified: trunk/LayoutTests/ChangeLog (292680 => 292681) --- trunk/LayoutTests/ChangeLog 2022-04-09 19:05:27 UTC (rev 292680) +++ trunk/LayoutTests/ChangeLog 2022-04-09 20:26:16 UTC (rev 292681) @@ -1,3 +1,15 @@ +2022-04-09 Myles C. Maxfield + +[WKTR] Reset minimum font size WKPreference between tests +https://bugs.webkit.org/show_bug.cgi?id=239027 + + +Reviewed by Chris Dumez. + +Remove unnecessary ephemeral session. + +* fast/forms/visual-hebrew-text-field.html: + 2022-04-09 Alan Bujtas REGRESSION (Safari 15.4): Focused element doesn't render outline when it has an underline Modified: trunk/LayoutTests/fast/forms/visual-hebrew-text-field.html (292680 => 292681) --- trunk/LayoutTests/fast/forms/visual-hebrew-text-field.html 2022-04-09 19:05:27 UTC (rev 292680) +++ trunk/LayoutTests/fast/forms/visual-hebrew-text-field.html 2022-04-09 20:26:16 UTC (rev 292681) @@ -1,5 +1,4 @@ - - + -khtml-rtl-ordering Modified: trunk/Tools/ChangeLog (292680 => 292681) --- trunk/Tools/ChangeLog 2022-04-09 19:05:27 UTC (rev 292680) +++ trunk/Tools/ChangeLog 2022-04-09 20:26:16 UTC (rev 292681) @@ -1,3 +1,16 @@ +2022-04-09 Myles C. Maxfield + +[WKTR] Reset minimum font size WKPreference between tests +https://bugs.webkit.org/show_bug.cgi?id=239027 + + +Reviewed by Chris Dumez. + +Some tests use uiController to set the minimum font size WKPreference. We need to reset it between tests. + +* WebKitTestRunner/TestController.cpp: +(WTR::TestController::resetPreferencesToConsistentValues): + 2022-04-09 Chris Dumez The Youtube plugin replacement should only work for actual Youtube URLs Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (292680 => 292681) --- trunk/Tools/WebKitTestRunner/TestController.cpp 2022-04-09 19:05:27 UTC (rev 292680) +++ trunk/Tools/WebKitTestRunner/TestController.cpp 2022-04-09 20:26:16 UTC (rev 292681) @@ -977,6 +977,7 @@ WKPreferencesSetProcessSwapOnNavigationEnabled(preferences, options.shouldEnableProcessSwapOnNavigation()); WKPreferencesSetStorageBlockingPolicy(preferences, kWKAllowAllStorage); // FIXME: We should be testing the default. +WKPreferencesSetMinimumFontSize(preferences, 0); for (const auto& [key, value] : options.boolWebPreferenceFeatures()) WKPreferencesSetBoolValueForKeyForTesting(preferences, value, toWK(key).get()); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [292680] trunk
Title: [292680] trunk Revision 292680 Author cdu...@apple.com Date 2022-04-09 12:05:27 -0700 (Sat, 09 Apr 2022) Log Message The Youtube plugin replacement should only work for actual Youtube URLs https://bugs.webkit.org/show_bug.cgi?id=239003 Reviewed by Brent Fulgham. Source/WebCore: The Youtube plugin replacement was too permissive and was falling back to using the original URL in cases there the original URL wasn't an expected Youtube URL. This patch hardens the plugin replacement and drops the URL if it is not a valid youtube URL instead. Covered by new API test. * Modules/plugins/YouTubePluginReplacement.cpp: (WebCore::isYouTubeURL): (WebCore::processAndCreateYouTubeURL): (WebCore::YouTubePluginReplacement::youTubeURLFromAbsoluteURL): Tools: Add API test coverage. * TestWebKitAPI/SourcesCocoa.txt: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp: (TestWebKitAPI::test): (TestWebKitAPI::TEST_F): * TestWebKitAPI/Tests/WebKitCocoa/YoutubeReplacementPlugin.mm: Added. (TEST): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/SourcesCocoa.txt trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj trunk/Tools/TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp Added Paths trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/YoutubeReplacementPlugin.mm Diff Modified: trunk/Source/WebCore/ChangeLog (292679 => 292680) --- trunk/Source/WebCore/ChangeLog 2022-04-09 17:55:18 UTC (rev 292679) +++ trunk/Source/WebCore/ChangeLog 2022-04-09 19:05:27 UTC (rev 292680) @@ -1,3 +1,23 @@ +2022-04-09 Chris Dumez + +The Youtube plugin replacement should only work for actual Youtube URLs +https://bugs.webkit.org/show_bug.cgi?id=239003 + + +Reviewed by Brent Fulgham. + +The Youtube plugin replacement was too permissive and was falling back to using +the original URL in cases there the original URL wasn't an expected Youtube +URL. This patch hardens the plugin replacement and drops the URL if it is not +a valid youtube URL instead. + +Covered by new API test. + +* Modules/plugins/YouTubePluginReplacement.cpp: +(WebCore::isYouTubeURL): +(WebCore::processAndCreateYouTubeURL): +(WebCore::YouTubePluginReplacement::youTubeURLFromAbsoluteURL): + 2022-04-09 Alan Bujtas REGRESSION (Safari 15.4): Focused element doesn't render outline when it has an underline Modified: trunk/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp (292679 => 292680) --- trunk/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp 2022-04-09 17:55:18 UTC (rev 292679) +++ trunk/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp 2022-04-09 19:05:27 UTC (rev 292680) @@ -169,6 +169,9 @@ static bool isYouTubeURL(const URL& url) { +if (!url.protocolIsInHTTPFamily()) +return false; + auto hostName = url.host(); return equalLettersIgnoringASCIICase(hostName, "m.youtube.com") || equalLettersIgnoringASCIICase(hostName, "youtu.be") @@ -189,8 +192,7 @@ static URL processAndCreateYouTubeURL(const URL& url, bool& isYouTubeShortenedURL, String& outPathAfterFirstAmpersand) { -if (!url.protocolIsInHTTPFamily()) -return URL(); +ASSERT(isYouTubeURL(url)); // Bail out early if we aren't even on www.youtube.com or youtube.com. if (!isYouTubeURL(url)) @@ -282,10 +284,14 @@ String YouTubePluginReplacement::youTubeURLFromAbsoluteURL(const URL& srcURL, const String& srcString) { +// Validate URL to make sure it is a Youtube URL. +if (!isYouTubeURL(srcURL)) +return emptyString(); + bool isYouTubeShortenedURL = false; String possiblyMalformedQuery; URL youTubeURL = processAndCreateYouTubeURL(srcURL, isYouTubeShortenedURL, possiblyMalformedQuery); -if (srcURL.isEmpty() || youTubeURL.isEmpty()) +if (youTubeURL.isEmpty()) return srcString; // Transform the youtubeURL (youtube:VideoID) to iframe embed url which has the format: http://www.youtube.com/embed/VideoID Modified: trunk/Tools/ChangeLog (292679 => 292680) --- trunk/Tools/ChangeLog 2022-04-09 17:55:18 UTC (rev 292679) +++ trunk/Tools/ChangeLog 2022-04-09 19:05:27 UTC (rev 292680) @@ -1,3 +1,21 @@ +2022-04-09 Chris Dumez + +The Youtube plugin replacement should only work for actual Youtube URLs +https://bugs.webkit.org/show_bug.cgi?id=239003 + + +Reviewed by Brent Fulgham. + +Add API test coverage. + +* TestWebKitAPI/SourcesCocoa.txt: +* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: +* TestWebKitAPI/Tests/WebCore/YouTubePluginReplacement.cpp: +(TestWebKitAPI::test): +(TestWebKitAPI::TEST_F): +*
[webkit-changes] [292679] trunk
Title: [292679] trunk Revision 292679 Author za...@apple.com Date 2022-04-09 10:55:18 -0700 (Sat, 09 Apr 2022) Log Message REGRESSION (Safari 15.4): Focused element doesn't render outline when it has an underline https://bugs.webkit.org/show_bug.cgi?id=238998 Reviewed by Antti Koivisto. Source/WebCore: While outline is supposed to be part of the ink overflow(1), WebKit historically has been treating it as a special "non ink overflow" type of overflow. This patch is in preparation for transitioning the outline to regular ink overflow. First we start treating outline as part of ink overflow within IFC and handle it as special repaint content only at the block (RenderBlockFlow) level. Test: fast/repaint/incorrect-outline-repaint.html (1) https://www.w3.org/TR/css-overflow-3/#ink * layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp: (WebCore::Layout::computeInkOverflowForInlineLevelBox): (WebCore::Layout::InlineDisplayContentBuilder::appendAtomicInlineLevelDisplayBox): (WebCore::Layout::InlineDisplayContentBuilder::appendInlineBoxDisplayBox): (WebCore::Layout::InlineDisplayContentBuilder::appendSpanningInlineBoxDisplayBox): (WebCore::Layout::InlineDisplayContentBuilder::adjustVisualGeometryForDisplayBox): (WebCore::Layout::computeBoxShadowInkOverflow): Deleted. * layout/integration/LayoutIntegrationInlineContent.cpp: (WebCore::LayoutIntegration::InlineContent::hasContent const): * layout/integration/LayoutIntegrationInlineContent.h: (WebCore::LayoutIntegration::InlineContent::hasVisualOverflow const): (WebCore::LayoutIntegration::InlineContent::setHasVisualOverflow): * layout/integration/LayoutIntegrationInlineContentBuilder.cpp: (WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLines const): * rendering/RenderBlockFlow.cpp: (WebCore::RenderBlockFlow::layoutModernLines): This may cause overly inflated repaintTop/Bottom when the ink overflow is not outline based (text stroke only atm) but we will anyway trigger similar repaint rect on that part later when we process ink overflow. LayoutTests: * fast/repaint/incorrect-outline-repaint-expected.txt: Added. * fast/repaint/incorrect-outline-repaint.html: Added. * fast/text/simple-line-layout-text-stroke-width.html: now we produce a slightly different (more accurate) vertical repaint range. However this test is about moving the content horizontally, so let's make this test more robust by focusing on the horizontal part. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/fast/text/simple-line-layout-text-stroke-width-expected.txt trunk/LayoutTests/fast/text/simple-line-layout-text-stroke-width.html trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContent.cpp trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContent.h trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp trunk/Source/WebCore/rendering/RenderBlockFlow.cpp Added Paths trunk/LayoutTests/fast/repaint/incorrect-outline-repaint-expected.txt trunk/LayoutTests/fast/repaint/incorrect-outline-repaint.html Diff Modified: trunk/LayoutTests/ChangeLog (292678 => 292679) --- trunk/LayoutTests/ChangeLog 2022-04-09 08:35:06 UTC (rev 292678) +++ trunk/LayoutTests/ChangeLog 2022-04-09 17:55:18 UTC (rev 292679) @@ -1,3 +1,17 @@ +2022-04-09 Alan Bujtas + +REGRESSION (Safari 15.4): Focused element doesn't render outline when it has an underline +https://bugs.webkit.org/show_bug.cgi?id=238998 + + +Reviewed by Antti Koivisto. + +* fast/repaint/incorrect-outline-repaint-expected.txt: Added. +* fast/repaint/incorrect-outline-repaint.html: Added. +* fast/text/simple-line-layout-text-stroke-width.html: now we produce a slightly different (more accurate) +vertical repaint range. However this test is about moving the content horizontally, so let's make this +test more robust by focusing on the horizontal part. + 2022-04-08 Matteo Flores REBASLINE: [ Monterey wk2 ] 4 http/tests/inspector/paymentrequest/* tests are constant text failures Added: trunk/LayoutTests/fast/repaint/incorrect-outline-repaint-expected.txt (0 => 292679) --- trunk/LayoutTests/fast/repaint/incorrect-outline-repaint-expected.txt (rev 0) +++ trunk/LayoutTests/fast/repaint/incorrect-outline-repaint-expected.txt 2022-04-09 17:55:18 UTC (rev 292679) @@ -0,0 +1,2 @@ +outline +PASS Added: trunk/LayoutTests/fast/repaint/incorrect-outline-repaint.html (0 => 292679) --- trunk/LayoutTests/fast/repaint/incorrect-outline-repaint.html (rev 0) +++ trunk/LayoutTests/fast/repaint/incorrect-outline-repaint.html 2022-04-09 17:55:18 UTC (rev 292679) @@ -0,0 +1,27 @@ + +span { + font-size: 10px; + font-family: Ahem; +} + + +outline + + +if (window.testRunner) { +
[webkit-changes] [292678] trunk
Title: [292678] trunk Revision 292678 Author ape...@igalia.com Date 2022-04-09 01:35:06 -0700 (Sat, 09 Apr 2022) Log Message [GTK][WPE] Missing inter-module documentation links https://bugs.webkit.org/show_bug.cgi?id=239016 Reviewed by Michael Catanzaro. Add JS snippets to be used in the gi-docgen output to setup links to other modules. Take advantage of being able to compute the documentation API version suffix from the currently loaded page URL, which avoids having a number of templates depending on the API version and having to deal with the documentation API version being sometimes different than the actual API version of the library. The URLs for GTK3 vs. GTK4 documentation cannot be handled in the same way, and instead the JS snippet is also a template expanded by CMake to allows using the ${GTK_API_VERSION} variable there. .: * Source/cmake/FindGIDocgen.cmake: Add a new CONTENT_TEMPLATES option to GI_DOCGEN(), which allows setting up files to be expanded as CMake @ONLY templates and then be used as documentation content files. Source/_javascript_Core: * API/glib/docs/jsc.toml.in: Use added urlmap.js file. * API/glib/docs/urlmap.js: Added. Source/WebKit: * PlatformGTK.cmake: Set urlmap.js as documentation content template. * gtk/urlmap.js.in: Added. * gtk/webkit2gtk-webextension.toml.in: Use urlmap.js from added template. * gtk/webkit2gtk.toml.in: Ditto. * wpe/urlmap.js: Added. (const.baseURLApiLevelSuffix): * wpe/wpewebextension.toml.in: Use added urlmap.js file. * wpe/wpewebkit.toml.in: Ditto. Modified Paths trunk/ChangeLog trunk/Source/_javascript_Core/API/glib/docs/jsc.toml.in trunk/Source/_javascript_Core/ChangeLog trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/PlatformGTK.cmake trunk/Source/WebKit/gtk/webkit2gtk-webextension.toml.in trunk/Source/WebKit/gtk/webkit2gtk.toml.in trunk/Source/WebKit/wpe/wpewebextension.toml.in trunk/Source/WebKit/wpe/wpewebkit.toml.in trunk/Source/cmake/FindGIDocgen.cmake Added Paths trunk/Source/_javascript_Core/API/glib/docs/urlmap.js trunk/Source/WebKit/gtk/urlmap.js.in trunk/Source/WebKit/wpe/urlmap.js Diff Modified: trunk/ChangeLog (292677 => 292678) --- trunk/ChangeLog 2022-04-09 08:28:32 UTC (rev 292677) +++ trunk/ChangeLog 2022-04-09 08:35:06 UTC (rev 292678) @@ -1,3 +1,23 @@ +2022-04-09 Adrian Perez de Castro + +[GTK][WPE] Missing inter-module documentation links +https://bugs.webkit.org/show_bug.cgi?id=239016 + +Reviewed by Michael Catanzaro. + +Add JS snippets to be used in the gi-docgen output to setup links to +other modules. Take advantage of being able to compute the documentation +API version suffix from the currently loaded page URL, which avoids having +a number of templates depending on the API version and having to deal with +the documentation API version being sometimes different than the actual API +version of the library. The URLs for GTK3 vs. GTK4 documentation cannot be +handled in the same way, and instead the JS snippet is also a template +expanded by CMake to allows using the ${GTK_API_VERSION} variable there. + +* Source/cmake/FindGIDocgen.cmake: Add a new CONTENT_TEMPLATES option +to GI_DOCGEN(), which allows setting up files to be expanded as CMake +@ONLY templates and then be used as documentation content files. + 2022-04-08 Elliott Williams Unreviewed, reverting r292591. Modified: trunk/Source/_javascript_Core/API/glib/docs/jsc.toml.in (292677 => 292678) --- trunk/Source/_javascript_Core/API/glib/docs/jsc.toml.in 2022-04-09 08:28:32 UTC (rev 292677) +++ trunk/Source/_javascript_Core/API/glib/docs/jsc.toml.in 2022-04-09 08:35:06 UTC (rev 292678) @@ -21,3 +21,6 @@ [source-location] base_url = "https://github.com/WebKit/WebKit/tree/main" + +[extra] +urlmap_file = "urlmap.js" Added: trunk/Source/_javascript_Core/API/glib/docs/urlmap.js (0 => 292678) --- trunk/Source/_javascript_Core/API/glib/docs/urlmap.js (rev 0) +++ trunk/Source/_javascript_Core/API/glib/docs/urlmap.js 2022-04-09 08:35:06 UTC (rev 292678) @@ -0,0 +1,4 @@ +baseURLs = [ + ["GLib", "https://docs.gtk.org/glib/"], + ["GObject", "https://docs.gtk.org/gobject/"], +] Modified: trunk/Source/_javascript_Core/ChangeLog (292677 => 292678) --- trunk/Source/_javascript_Core/ChangeLog 2022-04-09 08:28:32 UTC (rev 292677) +++ trunk/Source/_javascript_Core/ChangeLog 2022-04-09 08:35:06 UTC (rev 292678) @@ -1,3 +1,22 @@ +2022-04-09 Adrian Perez de Castro + +[GTK][WPE] Missing inter-module documentation links +https://bugs.webkit.org/show_bug.cgi?id=239016 + +Reviewed by Michael Catanzaro. + +Add JS snippets to be used in the gi-docgen output to setup links to +other modules. Take advantage of being able to compute the documentation +API version suffix from the currently loaded page URL, which avoids having +a number of templates
[webkit-changes] [292677] trunk/Source
Title: [292677] trunk/Source Revision 292677 Author sihui_...@apple.com Date 2022-04-09 01:28:32 -0700 (Sat, 09 Apr 2022) Log Message Move canAccessStorage() check from SecurityOrigin to ScriptExecutionContext https://bugs.webkit.org/show_bug.cgi?id=238524 Reviewed by Chris Dumez. Source/WebCore: Add canAccessResource() to ScriptExecutionContext because ScriptExecutionContext, instead of SecurityOrigin, should be the place that holds StorageBlockingPolicy (otherwise it's confusing that the origin and top origin disagrees with each other on policy). Also, because ScriptExecutionContext has access to origin and topOrigin, callers don't need to explicitly get them before the access check. * Modules/encryptedmedia/CDM.cpp: (WebCore::CDM::getSupportedConfiguration): * Modules/geolocation/Geolocation.cpp: (WebCore::Geolocation::shouldBlockGeolocationRequests): * Modules/indexeddb/IDBFactory.cpp: (WebCore::shouldThrowSecurityException): (WebCore::IDBFactory::openInternal): (WebCore::IDBFactory::deleteDatabase): * Modules/storage/StorageManager.cpp: (WebCore::connectionInfo): * Modules/webdatabase/DOMWindowWebDatabase.cpp: (WebCore::DOMWindowWebDatabase::openDatabase): * dom/Document.cpp: (WebCore::m_whitespaceCache): (WebCore::Document::cookie): (WebCore::Document::setCookie): (WebCore::Document::storageBlockingStateDidChange): (WebCore::Document::initSecurityContext): (WebCore::Document::applyQuickLookSandbox): * dom/ScriptExecutionContext.cpp: (WebCore::ScriptExecutionContext::domainForCachePartition const): (WebCore::isOriginEquivalentToLocal): (WebCore::ScriptExecutionContext::canAccessResource const): * dom/ScriptExecutionContext.h: (WebCore::ScriptExecutionContext::setStorageBlockingPolicy): * loader/DocumentLoader.cpp: (WebCore::DocumentLoader::loadMainResource): * loader/appcache/ApplicationCacheGroup.cpp: (WebCore::ApplicationCacheGroup::selectCache): (WebCore::ApplicationCacheGroup::selectCacheWithoutManifestURL): (WebCore::ApplicationCacheGroup::update): * loader/appcache/ApplicationCacheHost.cpp: (WebCore::ApplicationCacheHost::isApplicationCacheBlockedForRequest): * page/DOMWindow.cpp: * page/Page.cpp: (WebCore::Page::setupForRemoteWorker): * page/SecurityOrigin.cpp: (WebCore::SecurityOrigin::domainForCachePartition const): (WebCore::SecurityOrigin::canAccessStorage const): Deleted. * page/SecurityOrigin.h: (WebCore::SecurityOrigin::encode const): (WebCore::SecurityOrigin::decode): (WebCore::SecurityOrigin::setStorageBlockingPolicy): Deleted. (WebCore::SecurityOrigin::canAccessDatabase const): Deleted. (WebCore::SecurityOrigin::canAccessSessionStorage const): Deleted. (WebCore::SecurityOrigin::canAccessLocalStorage const): Deleted. (WebCore::SecurityOrigin::canAccessStorageManager const): Deleted. (WebCore::SecurityOrigin::canAccessPluginStorage const): Deleted. (WebCore::SecurityOrigin::canAccessApplicationCache const): Deleted. (WebCore::SecurityOrigin::canAccessCookies const): Deleted. (WebCore::SecurityOrigin::canRequestGeolocation const): Deleted. * storage/StorageNamespaceProvider.cpp: (WebCore::StorageNamespaceProvider::localStorageArea): * workers/WorkerGlobalScope.cpp: (WebCore::m_credentials): * workers/service/ServiceWorkerContainer.cpp: (WebCore::ServiceWorkerContainer::addRegistration): (WebCore::ServiceWorkerContainer::updateRegistration): * workers/service/ServiceWorkerJobData.cpp: (WebCore::ServiceWorkerJobData::isolatedCopy const): * workers/service/ServiceWorkerJobData.h: (WebCore::ServiceWorkerJobData::encode const): (WebCore::ServiceWorkerJobData::decode): * workers/service/server/SWServer.cpp: (WebCore::SWServer::startScriptFetch): * worklets/WorkletGlobalScope.cpp: (WebCore::WorkletGlobalScope::WorkletGlobalScope): Source/WebKit: * WebProcess/Plugins/PluginView.cpp: (WebKit::PluginView::storageBlockingStateChanged): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp trunk/Source/WebCore/Modules/storage/StorageManager.cpp trunk/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.cpp trunk/Source/WebCore/dom/Document.cpp trunk/Source/WebCore/dom/ScriptExecutionContext.cpp trunk/Source/WebCore/dom/ScriptExecutionContext.h trunk/Source/WebCore/loader/DocumentLoader.cpp trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp trunk/Source/WebCore/page/DOMWindow.cpp trunk/Source/WebCore/page/Page.cpp trunk/Source/WebCore/page/SecurityOrigin.cpp trunk/Source/WebCore/page/SecurityOrigin.h trunk/Source/WebCore/storage/StorageNamespaceProvider.cpp trunk/Source/WebCore/workers/WorkerGlobalScope.cpp trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp trunk/Source/WebCore/workers/service/ServiceWorkerJobData.cpp trunk/Source/WebCore/workers/service/ServiceWorkerJobData.h trunk/Source/WebCore/workers/service/server/SWServer.cpp
[webkit-changes] [292676] trunk/Source/WebCore
Title: [292676] trunk/Source/WebCore Revision 292676 Author katherine_che...@apple.com Date 2022-04-08 23:29:20 -0700 (Fri, 08 Apr 2022) Log Message Sharing services picker menu Mail presents in the wrong place when compose web view is scrolled https://bugs.webkit.org/show_bug.cgi?id=238672 Reviewed by Wenson Hsieh. Image menu is offset by the amount the view is scrolled. This patch changes the menu location point by calculating the bottom corner of the picker button then using contentsToWindow which handles the scroll position offset * dom/mac/ImageControlsMac.cpp: (WebCore::ImageControlsMac::handleEvent): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/dom/mac/ImageControlsMac.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (292675 => 292676) --- trunk/Source/WebCore/ChangeLog 2022-04-09 06:18:23 UTC (rev 292675) +++ trunk/Source/WebCore/ChangeLog 2022-04-09 06:29:20 UTC (rev 292676) @@ -1,3 +1,19 @@ +2022-04-08 Kate Cheney + +Sharing services picker menu Mail presents in the wrong place when compose web view is scrolled +https://bugs.webkit.org/show_bug.cgi?id=238672 + + +Reviewed by Wenson Hsieh. + +Image menu is offset by the amount the view is scrolled. This patch +changes the menu location point by calculating the bottom corner of +the picker button then using contentsToWindow which handles +the scroll position offset + +* dom/mac/ImageControlsMac.cpp: +(WebCore::ImageControlsMac::handleEvent): + 2022-04-08 Chris Dumez Drop unused pluginReplacementScriptObject Modified: trunk/Source/WebCore/dom/mac/ImageControlsMac.cpp (292675 => 292676) --- trunk/Source/WebCore/dom/mac/ImageControlsMac.cpp 2022-04-09 06:18:23 UTC (rev 292675) +++ trunk/Source/WebCore/dom/mac/ImageControlsMac.cpp 2022-04-09 06:29:20 UTC (rev 292676) @@ -146,7 +146,17 @@ if (!image) return false; -page->chrome().client().handleImageServiceClick(roundedIntPoint(mouseEvent.absoluteLocation()), *image, *shadowHost); +Ref element = downcast(node); +auto* renderer = element->renderer(); +if (!renderer) +return false; + +RefPtr view = frame->view(); +if (!view) +return false; + +auto point = view->contentsToWindow(renderer->absoluteBoundingBoxRect()).minXMaxYCorner(); +page->chrome().client().handleImageServiceClick(point, *image, *shadowHost); event.setDefaultHandled(); return true; } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [292675] branches/safari-614.1.9-branch/Source
Title: [292675] branches/safari-614.1.9-branch/Source Revision 292675 Author alanc...@apple.com Date 2022-04-08 23:18:23 -0700 (Fri, 08 Apr 2022) Log Message Versioning. WebKit-7614.1.9.2 Modified Paths branches/safari-614.1.9-branch/Source/_javascript_Core/Configurations/Version.xcconfig branches/safari-614.1.9-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig branches/safari-614.1.9-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig branches/safari-614.1.9-branch/Source/WebCore/Configurations/Version.xcconfig branches/safari-614.1.9-branch/Source/WebCore/PAL/Configurations/Version.xcconfig branches/safari-614.1.9-branch/Source/WebGPU/Configurations/Version.xcconfig branches/safari-614.1.9-branch/Source/WebInspectorUI/Configurations/Version.xcconfig branches/safari-614.1.9-branch/Source/WebKit/Configurations/Version.xcconfig branches/safari-614.1.9-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig Diff Modified: branches/safari-614.1.9-branch/Source/_javascript_Core/Configurations/Version.xcconfig (292674 => 292675) --- branches/safari-614.1.9-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2022-04-09 03:12:19 UTC (rev 292674) +++ branches/safari-614.1.9-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2022-04-09 06:18:23 UTC (rev 292675) @@ -24,7 +24,7 @@ MAJOR_VERSION = 614; MINOR_VERSION = 1; TINY_VERSION = 9; -MICRO_VERSION = 1; +MICRO_VERSION = 2; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-614.1.9-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig (292674 => 292675) --- branches/safari-614.1.9-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig 2022-04-09 03:12:19 UTC (rev 292674) +++ branches/safari-614.1.9-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig 2022-04-09 06:18:23 UTC (rev 292675) @@ -24,7 +24,7 @@ MAJOR_VERSION = 614; MINOR_VERSION = 1; TINY_VERSION = 9; -MICRO_VERSION = 1; +MICRO_VERSION = 2; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-614.1.9-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (292674 => 292675) --- branches/safari-614.1.9-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig 2022-04-09 03:12:19 UTC (rev 292674) +++ branches/safari-614.1.9-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig 2022-04-09 06:18:23 UTC (rev 292675) @@ -24,7 +24,7 @@ MAJOR_VERSION = 614; MINOR_VERSION = 1; TINY_VERSION = 9; -MICRO_VERSION = 1; +MICRO_VERSION = 2; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-614.1.9-branch/Source/WebCore/Configurations/Version.xcconfig (292674 => 292675) --- branches/safari-614.1.9-branch/Source/WebCore/Configurations/Version.xcconfig 2022-04-09 03:12:19 UTC (rev 292674) +++ branches/safari-614.1.9-branch/Source/WebCore/Configurations/Version.xcconfig 2022-04-09 06:18:23 UTC (rev 292675) @@ -24,7 +24,7 @@ MAJOR_VERSION = 614; MINOR_VERSION = 1; TINY_VERSION = 9; -MICRO_VERSION = 1; +MICRO_VERSION = 2; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-614.1.9-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (292674 => 292675) --- branches/safari-614.1.9-branch/Source/WebCore/PAL/Configurations/Version.xcconfig 2022-04-09 03:12:19 UTC (rev 292674) +++ branches/safari-614.1.9-branch/Source/WebCore/PAL/Configurations/Version.xcconfig 2022-04-09 06:18:23 UTC (rev 292675) @@ -24,7 +24,7 @@ MAJOR_VERSION = 614; MINOR_VERSION = 1; TINY_VERSION = 9; -MICRO_VERSION = 1; +MICRO_VERSION = 2; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-614.1.9-branch/Source/WebGPU/Configurations/Version.xcconfig (292674 => 292675) --- branches/safari-614.1.9-branch/Source/WebGPU/Configurations/Version.xcconfig 2022-04-09 03:12:19 UTC (rev 292674) +++ branches/safari-614.1.9-branch/Source/WebGPU/Configurations/Version.xcconfig 2022-04-09 06:18:23 UTC (rev 292675) @@ -24,7 +24,7 @@ MAJOR_VERSION = 614; MINOR_VERSION = 1; TINY_VERSION = 9; -MICRO_VERSION = 1; +MICRO_VERSION = 2; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-614.1.9-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (292674 => 292675) --- branches/safari-614.1.9-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2022-04-09 03:12:19 UTC (rev 292674) +++ branches/safari-614.1.9-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2022-04-09 06:18:23 UTC (rev 292675) @@ -1,7 +1,7 @@ MAJOR_VERSION = 614; MINOR_VERSION = 1; TINY_VERSION = 9; -MICRO_VERSION = 1; +MICRO_VERSION = 2;