[webkit-changes] [294141] trunk

2022-05-12 Thread rego
Title: [294141] trunk








Revision 294141
Author r...@igalia.com
Date 2022-05-12 22:04:23 -0700 (Thu, 12 May 2022)


Log Message
ARIA reflection for FrozenArray attributes
https://bugs.webkit.org/show_bug.cgi?id=239853


Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

Update expectations with the new PASS lines.

* web-platform-tests/dom/nodes/aria-element-reflection.tentative-expected.txt:

Source/WebCore:

Implement ARIA reflection for attributes that refer to a list of Elements:
aria-controls, aria-describedby, aria-details, aria-flowto,
aria-labelledby and aria-owns.
For the properties names this patch uses "Elements" suffix:
ariaControlsElements, ariaDescribedByElements, ariaDescribedByElements,
ariaFlowToElements, ariaLabelledByElements, ariaOwnsElements
this matches Chromium implementation and AOM explainer, but not AOM spec:
https://github.com/w3c/aria/issues/1732

* accessibility/AriaAttributes.idl: Add the new properties under
AriaReflectionForElementReferencesEnabled runtime flag.
* bindings/scripts/CodeGenerator.pm:
(GetterExpression): Add function for FrozenArray properties.
(SetterExpression): Ditto.
* bindings/scripts/test/JS/JSTestObj.cpp: Add tests.
(WebCore::JSTestObjDOMConstructor::construct):
(WebCore::jsTestObj_reflectedElementsArrayAttrGetter):
(WebCore::JSC_DEFINE_CUSTOM_GETTER):
(WebCore::setJSTestObj_reflectedElementsArrayAttrSetter):
(WebCore::JSC_DEFINE_CUSTOM_SETTER):
* bindings/scripts/test/TestObj.idl: Add example attribute.
* dom/Element.cpp:
(WebCore::isElementsArrayReflectionAttribute): New utility method to
identify the attributes that refer to a list of Elements.
(WebCore::Element::attributeChanged): Include check for elements
array.
(WebCore::Element::getElementsArrayAttribute const): Implement getter.
(WebCore::Element::setElementsArrayAttribute): Implement setter.
* dom/Element.h: Remove FIXME in ExplicitlySetAttrElementsMap as now
it stores more than one element. Add headers for getter and setter.

LayoutTests:

Update test so it identifies the FrozenArray attributes.

* accessibility/ARIA-reflection-expected.txt:
* accessibility/ARIA-reflection.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/accessibility/ARIA-reflection-expected.txt
trunk/LayoutTests/accessibility/ARIA-reflection.html
trunk/LayoutTests/imported/w3c/ChangeLog
trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/aria-element-reflection.tentative-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/AriaAttributes.idl
trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
trunk/Source/WebCore/bindings/scripts/test/TestObj.idl
trunk/Source/WebCore/dom/Element.cpp
trunk/Source/WebCore/dom/Element.h




Diff

Modified: trunk/LayoutTests/ChangeLog (294140 => 294141)

--- trunk/LayoutTests/ChangeLog	2022-05-13 03:38:28 UTC (rev 294140)
+++ trunk/LayoutTests/ChangeLog	2022-05-13 05:04:23 UTC (rev 294141)
@@ -1,3 +1,16 @@
+2022-05-12  Manuel Rego Casasnovas  
+
+ARIA reflection for FrozenArray attributes
+https://bugs.webkit.org/show_bug.cgi?id=239853
+
+
+Reviewed by Chris Dumez.
+
+Update test so it identifies the FrozenArray attributes.
+
+* accessibility/ARIA-reflection-expected.txt:
+* accessibility/ARIA-reflection.html:
+
 2022-05-12  Diego Pino Garcia  
 
 [GTK] Unreviewed test gardening, update tests expected to fail but passed


Modified: trunk/LayoutTests/accessibility/ARIA-reflection-expected.txt (294140 => 294141)

--- trunk/LayoutTests/accessibility/ARIA-reflection-expected.txt	2022-05-13 03:38:28 UTC (rev 294140)
+++ trunk/LayoutTests/accessibility/ARIA-reflection-expected.txt	2022-05-13 05:04:23 UTC (rev 294141)
@@ -67,6 +67,13 @@
 element.setAttribute("aria-colspan", otherData);
 PASS element[currentProperty] is otherDataProperty
 
+Test ariaControlsElements < - > aria-controls
+PASS element[currentProperty] is null
+PASS element.getAttribute(currentAttribute) is null
+PASS element.getAttribute(currentAttribute) is dataAttribute
+element.setAttribute("aria-controls", otherData);
+PASS element[currentProperty] is otherDataProperty
+
 Test ariaCurrent < - > aria-current
 PASS element[currentProperty] is null
 PASS element.getAttribute(currentAttribute) is null
@@ -74,6 +81,20 @@
 element.setAttribute("aria-current", otherData);
 PASS element[currentProperty] is otherDataProperty
 
+Test ariaDescribedByElements < - > aria-describedby
+PASS element[currentProperty] is null
+PASS element.getAttribute(currentAttribute) is null
+PASS element.getAttribute(currentAttribute) is dataAttribute
+element.setAttribute("aria-describedby", otherData);
+PASS element[currentProperty] is otherDataProperty
+
+Test ariaDetailsElements < - > aria-details
+PASS element[currentProperty] is null
+PASS element.getAttribute(currentAttribute) is null
+PASS element.getAttribute(currentAttribute) is dataAttribute

[webkit-changes] [294140] trunk/LayoutTests

2022-05-12 Thread dpino
Title: [294140] trunk/LayoutTests








Revision 294140
Author dp...@igalia.com
Date 2022-05-12 20:38:28 -0700 (Thu, 12 May 2022)


Log Message
[GTK] Unreviewed test gardening, update tests expected to fail but passed

* platform/glib/TestExpectations:
* platform/gtk/TestExpectations:
* platform/gtk/imported/w3c/web-platform-tests/mathml/presentation-markup/tables/table-002-expected.txt: Removed.
* platform/gtk/imported/w3c/web-platform-tests/mathml/relations/css-styling/ignored-properties-001-expected.txt: Removed.
* platform/gtk/imported/w3c/web-platform-tests/mathml/relations/css-styling/not-participating-to-parent-layout-expected.txt: Removed.
* platform/gtk/imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-002-expected.txt: Removed.
* platform/wpe/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/glib/TestExpectations
trunk/LayoutTests/platform/gtk/TestExpectations
trunk/LayoutTests/platform/wpe/TestExpectations


Removed Paths

trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/mathml/presentation-markup/tables/
trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/mathml/relations/css-styling/ignored-properties-001-expected.txt
trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/mathml/relations/css-styling/not-participating-to-parent-layout-expected.txt
trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-002-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (294139 => 294140)

--- trunk/LayoutTests/ChangeLog	2022-05-13 02:12:49 UTC (rev 294139)
+++ trunk/LayoutTests/ChangeLog	2022-05-13 03:38:28 UTC (rev 294140)
@@ -1,3 +1,15 @@
+2022-05-12  Diego Pino Garcia  
+
+[GTK] Unreviewed test gardening, update tests expected to fail but passed
+
+* platform/glib/TestExpectations:
+* platform/gtk/TestExpectations:
+* platform/gtk/imported/w3c/web-platform-tests/mathml/presentation-markup/tables/table-002-expected.txt: Removed.
+* platform/gtk/imported/w3c/web-platform-tests/mathml/relations/css-styling/ignored-properties-001-expected.txt: Removed.
+* platform/gtk/imported/w3c/web-platform-tests/mathml/relations/css-styling/not-participating-to-parent-layout-expected.txt: Removed.
+* platform/gtk/imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-002-expected.txt: Removed.
+* platform/wpe/TestExpectations:
+
 2022-05-12  Karl Rackler  
 
 [ iOS ] imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-videoDetectorTest.html is a consistent failure


Modified: trunk/LayoutTests/platform/glib/TestExpectations (294139 => 294140)

--- trunk/LayoutTests/platform/glib/TestExpectations	2022-05-13 02:12:49 UTC (rev 294139)
+++ trunk/LayoutTests/platform/glib/TestExpectations	2022-05-13 03:38:28 UTC (rev 294140)
@@ -666,7 +666,6 @@
 webkit.org/b/237502 fast/multicol/newmulticol/hide-box-vertical-lr.html [ ImageOnlyFailure ]
 webkit.org/b/237502 imported/blink/fast/multicol/vertical-lr/float-big-line.html [ ImageOnlyFailure ]
 webkit.org/b/237502 imported/blink/fast/multicol/vertical-lr/float-break.html [ ImageOnlyFailure ]
-webkit.org/b/237502 imported/blink/fast/multicol/vertical-lr/float-content-break.html [ ImageOnlyFailure ]
 webkit.org/b/237502 imported/blink/fast/multicol/vertical-lr/float-edge.html [ ImageOnlyFailure ]
 webkit.org/b/237502 imported/blink/fast/pagination/div-x-vertical-lr-ltr.html [ ImageOnlyFailure ]
 webkit.org/b/237502 imported/blink/fast/pagination/div-x-vertical-lr-rtl.html [ ImageOnlyFailure ]
@@ -905,12 +904,10 @@
 webkit.org/b/235885 fast/mediastream/RTCPeerConnection-page-cache.html [ Crash ]
 webkit.org/b/235885 fast/mediastream/RTCPeerConnection-remotely-assigned-transceiver-mid.html [ Pass Failure Timeout ]
 webkit.org/b/235885 fast/mediastream/RTCPeerConnection-setLocalDescription-offer.html [ Failure ]
-webkit.org/b/235885 fast/mediastream/RTCPeerConnection-setRemoteDescription-offer.html [ Crash ]
 webkit.org/b/235885 http/wpt/webrtc/third-party-frame-ice-candidate-filtering.html [ Failure ]
 webkit.org/b/235885 imported/w3c/web-platform-tests/webrtc-extensions/RTCRtpParameters-maxFramerate.html [ Failure ]
 webkit.org/b/235885 imported/w3c/web-platform-tests/webrtc-extensions/RTCRtpSynchronizationSource-captureTimestamp.html [ Failure ]
 webkit.org/b/235885 imported/w3c/web-platform-tests/webrtc-priority/RTCRtpParameters-encodings.html [ Failure ]
-webkit.org/b/235885 inspector/page/overrideSetting-ICECandidateFilteringEnabled.html [ Timeout ]
 webkit.org/b/235885 imported/w3c/web-platform-tests/media-capabilities/decodingInfo.webrtc.html [ Failure ]
 webkit.org/b/235885 imported/w3c/web-platform-tests/media-capabilities/encodingInfo.webrtc.html [ Failure ]
 webkit.org/b/235885 webrtc/addTransceiver-then-addTrack.html [ Failure ]
@@ -925,7 +922,6 @@
 webkit.org/b/235885 

[webkit-changes] [294139] trunk/Source/WTF

2022-05-12 Thread commit-queue
Title: [294139] trunk/Source/WTF








Revision 294139
Author commit-qu...@webkit.org
Date 2022-05-12 19:12:49 -0700 (Thu, 12 May 2022)


Log Message
-Wattributes warnings from AtomString.cpp and WTFString.cpp
https://bugs.webkit.org/show_bug.cgi?id=240358

Patch by Michael Catanzaro  on 2022-05-12
Reviewed by Yusuke Suzuki.

* Source/WTF/wtf/text/AtomString.cpp:
* Source/WTF/wtf/text/WTFString.cpp:

Canonical link: https://commits.webkit.org/250509@main

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/text/AtomString.cpp
trunk/Source/WTF/wtf/text/WTFString.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (294138 => 294139)

--- trunk/Source/WTF/ChangeLog	2022-05-13 01:49:32 UTC (rev 294138)
+++ trunk/Source/WTF/ChangeLog	2022-05-13 02:12:49 UTC (rev 294139)
@@ -1,3 +1,13 @@
+2022-05-12  Michael Catanzaro  
+
+-Wattributes warnings from AtomString.cpp and WTFString.cpp
+https://bugs.webkit.org/show_bug.cgi?id=240358
+
+Reviewed by Yusuke Suzuki.
+
+* wtf/text/AtomString.cpp:
+* wtf/text/WTFString.cpp:
+
 2022-05-11  Kate Cheney  
 
 Mail compose: right clicking an image attachment selects it


Modified: trunk/Source/WTF/wtf/text/AtomString.cpp (294138 => 294139)

--- trunk/Source/WTF/wtf/text/AtomString.cpp	2022-05-13 01:49:32 UTC (rev 294138)
+++ trunk/Source/WTF/wtf/text/AtomString.cpp	2022-05-13 02:12:49 UTC (rev 294139)
@@ -32,8 +32,8 @@
 
 namespace WTF {
 
-WTF_EXPORT_PRIVATE const StaticAtomString nullAtomData { nullptr };
-WTF_EXPORT_PRIVATE const StaticAtomString emptyAtomData { ::s_emptyAtomString };
+const StaticAtomString nullAtomData { nullptr };
+const StaticAtomString emptyAtomData { ::s_emptyAtomString };
 
 template
 ALWAYS_INLINE AtomString AtomString::convertASCIICase() const


Modified: trunk/Source/WTF/wtf/text/WTFString.cpp (294138 => 294139)

--- trunk/Source/WTF/wtf/text/WTFString.cpp	2022-05-13 01:49:32 UTC (rev 294138)
+++ trunk/Source/WTF/wtf/text/WTFString.cpp	2022-05-13 02:12:49 UTC (rev 294139)
@@ -635,8 +635,8 @@
 return static_cast(toDoubleType(data, length, nullptr, parsedLength));
 }
 
-WTF_EXPORT_PRIVATE const StaticString nullStringData { nullptr };
-WTF_EXPORT_PRIVATE const StaticString emptyStringData { ::s_emptyAtomString };
+const StaticString nullStringData { nullptr };
+const StaticString emptyStringData { ::s_emptyAtomString };
 
 } // namespace WTF
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294138] trunk/Source/WebCore

2022-05-12 Thread mattwoodrow
Title: [294138] trunk/Source/WebCore








Revision 294138
Author mattwood...@apple.com
Date 2022-05-12 18:49:32 -0700 (Thu, 12 May 2022)


Log Message
Quirk Flightaware.com to use the older number serialization path.
https://bugs.webkit.org/show_bug.cgi?id=240320

Reviewed by Simon Fraser.

Ensures that serialization of matrix() CSS properties uses the older serialization (which
matches ECMA script serialization) since this site expects these to be comparable as strings.

No new tests, since this is a site-specific quirk.

* css/CSSFunctionValue.cpp:
(WebCore::CSSFunctionValue::customCSSText const):
* css/CSSFunctionValue.h:
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::formatNumberValue const):
(WebCore::CSSPrimitiveValue::customCSSText const):
* css/CSSPrimitiveValue.h:
* css/CSSValue.cpp:
(WebCore::CSSValue::cssText const):
* css/CSSValue.h:
(WebCore::CSSValue::CSSValue):
* css/CSSValueList.cpp:
(WebCore::CSSValueList::customCSSText const):
* css/CSSValueList.h:
* css/PropertySetCSSStyleDeclaration.cpp:
(WebCore::PropertySetCSSStyleDeclaration::getPropertyValueInternal):
* css/StyleProperties.cpp:
(WebCore::StyleProperties::getPropertyValue const):
* css/StyleProperties.h:
* page/Quirks.cpp:
(WebCore::Quirks::needsFlightAwareSerializationQuirk const):
* page/Quirks.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSFunctionValue.cpp
trunk/Source/WebCore/css/CSSFunctionValue.h
trunk/Source/WebCore/css/CSSPrimitiveValue.cpp
trunk/Source/WebCore/css/CSSPrimitiveValue.h
trunk/Source/WebCore/css/CSSValue.cpp
trunk/Source/WebCore/css/CSSValue.h
trunk/Source/WebCore/css/CSSValueList.cpp
trunk/Source/WebCore/css/CSSValueList.h
trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp
trunk/Source/WebCore/css/StyleProperties.cpp
trunk/Source/WebCore/css/StyleProperties.h
trunk/Source/WebCore/page/Quirks.cpp
trunk/Source/WebCore/page/Quirks.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (294137 => 294138)

--- trunk/Source/WebCore/ChangeLog	2022-05-13 01:41:21 UTC (rev 294137)
+++ trunk/Source/WebCore/ChangeLog	2022-05-13 01:49:32 UTC (rev 294138)
@@ -1,3 +1,38 @@
+2022-05-12  Matt Woodrow  
+
+Quirk Flightaware.com to use the older number serialization path.
+https://bugs.webkit.org/show_bug.cgi?id=240320
+
+Reviewed by Simon Fraser.
+
+Ensures that serialization of matrix() CSS properties uses the older serialization (which
+matches ECMA script serialization) since this site expects these to be comparable as strings.
+
+No new tests, since this is a site-specific quirk.
+
+* css/CSSFunctionValue.cpp:
+(WebCore::CSSFunctionValue::customCSSText const):
+* css/CSSFunctionValue.h:
+* css/CSSPrimitiveValue.cpp:
+(WebCore::CSSPrimitiveValue::formatNumberValue const):
+(WebCore::CSSPrimitiveValue::customCSSText const):
+* css/CSSPrimitiveValue.h:
+* css/CSSValue.cpp:
+(WebCore::CSSValue::cssText const):
+* css/CSSValue.h:
+(WebCore::CSSValue::CSSValue):
+* css/CSSValueList.cpp:
+(WebCore::CSSValueList::customCSSText const):
+* css/CSSValueList.h:
+* css/PropertySetCSSStyleDeclaration.cpp:
+(WebCore::PropertySetCSSStyleDeclaration::getPropertyValueInternal):
+* css/StyleProperties.cpp:
+(WebCore::StyleProperties::getPropertyValue const):
+* css/StyleProperties.h:
+* page/Quirks.cpp:
+(WebCore::Quirks::needsFlightAwareSerializationQuirk const):
+* page/Quirks.h:
+
 2022-05-12  J Pascoe  
 
 [WebAuthn] Remove document focus requirement for conditional mediation requests


Modified: trunk/Source/WebCore/css/CSSFunctionValue.cpp (294137 => 294138)

--- trunk/Source/WebCore/css/CSSFunctionValue.cpp	2022-05-13 01:41:21 UTC (rev 294137)
+++ trunk/Source/WebCore/css/CSSFunctionValue.cpp	2022-05-13 01:49:32 UTC (rev 294138)
@@ -30,12 +30,12 @@
 
 namespace WebCore {
 
-String CSSFunctionValue::customCSSText() const
+String CSSFunctionValue::customCSSText(Document* document) const
 {
 StringBuilder result;
 result.append(getValueName(m_name));
 result.append('(');
-result.append(CSSValueList::customCSSText());
+result.append(CSSValueList::customCSSText(document));
 result.append(')');
 return result.toString();
 }


Modified: trunk/Source/WebCore/css/CSSFunctionValue.h (294137 => 294138)

--- trunk/Source/WebCore/css/CSSFunctionValue.h	2022-05-13 01:41:21 UTC (rev 294137)
+++ trunk/Source/WebCore/css/CSSFunctionValue.h	2022-05-13 01:49:32 UTC (rev 294138)
@@ -37,7 +37,7 @@
 return adoptRef(*new CSSFunctionValue(name));
 }
 
-String customCSSText() const;
+String customCSSText(Document* = nullptr) const;
 
 CSSValueID name() const { return m_name; }
 


Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (294137 => 294138)

--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp	2022-05-13 

[webkit-changes] [294137] trunk/Source/WebKit

2022-05-12 Thread commit-queue
Title: [294137] trunk/Source/WebKit








Revision 294137
Author commit-qu...@webkit.org
Date 2022-05-12 18:41:21 -0700 (Thu, 12 May 2022)


Log Message
-Wunused-result in WebCoreSupport/WebContextMenuClient.cpp
https://bugs.webkit.org/show_bug.cgi?id=240364

Patch by Michael Catanzaro  on 2022-05-12
Reviewed by Chris Dumez.

* Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
(WebKit::WebContextMenuClient::searchWithGoogle):

Canonical link: https://commits.webkit.org/250507@main

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.cpp




Diff

Modified: trunk/Source/WebKit/ChangeLog (294136 => 294137)

--- trunk/Source/WebKit/ChangeLog	2022-05-13 01:09:08 UTC (rev 294136)
+++ trunk/Source/WebKit/ChangeLog	2022-05-13 01:41:21 UTC (rev 294137)
@@ -1,3 +1,17 @@
+2022-05-12  Michael Catanzaro  
+
+-Wunused-result in WebCoreSupport/WebContextMenuClient.cpp
+https://bugs.webkit.org/show_bug.cgi?id=240364
+
+Reviewed by Chris Dumez.
+
+Fix this code: it's trying but failing to strip whitespace from the string. No new test
+because this code is not built on macOS and not exposed in GTK API, and those are the only
+platforms which seem to have context menu tests.
+
+* WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
+(WebKit::WebContextMenuClient::searchWithGoogle):
+
 2022-05-12  Alex Christensen  
 
 Revert r293861


Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.cpp (294136 => 294137)

--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.cpp	2022-05-13 01:09:08 UTC (rev 294136)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.cpp	2022-05-13 01:41:21 UTC (rev 294137)
@@ -58,8 +58,7 @@
 if (!page)
 return;
 
-auto searchString = frame->editor().selectedText();
-searchString.stripWhiteSpace();
+auto searchString = frame->editor().selectedText().stripWhiteSpace();
 searchString = makeStringByReplacingAll(encodeWithURLEscapeSequences(searchString), "%20"_s, "+"_s);
 auto searchURL = URL { "https://www.google.com/search?q=" + searchString + "=UTF-8=UTF-8" };
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294136] branches/safari-7614.1.13-branch/Source

2022-05-12 Thread alancoon
Title: [294136] branches/safari-7614.1.13-branch/Source








Revision 294136
Author alanc...@apple.com
Date 2022-05-12 18:09:08 -0700 (Thu, 12 May 2022)


Log Message
Cherry-pick r293994. rdar://problem/87157773

[iOS] Adjust some viewport behaviors when multitasking mode is enabled
https://bugs.webkit.org/show_bug.cgi?id=240151
rdar://87157773

Reviewed by Tim Horton.

Add a new ViewportConfiguration flag to prefer horizontal scrolling over shrinking to fit when the view layout
size falls under the current "default desktop webpage" of 980pt. See WebKit changes for more details.

* page/ViewportConfiguration.cpp:
(WebCore::ViewportConfiguration::initialScaleFromSize const):
(WebCore::ViewportConfiguration::webpageParameters):
(WebCore::ViewportConfiguration::imageDocumentParameters):

Pull the magic value representing the "assumed width of most desktop webpages" (980) out into a named constant,
`defaultDesktopViewportWidth`, so that we can consult it when computing the initial scale.

(WebCore::ViewportConfiguration::description const):
* page/ViewportConfiguration.h:
(WebCore::ViewportConfiguration::setPrefersHorizontalScrollingBelowDesktopViewportWidths):
[iOS] Adjust some viewport behaviors when multitasking mode is enabled
https://bugs.webkit.org/show_bug.cgi?id=240151
rdar://87157773

Reviewed by Tim Horton.

Make some adjustments to viewport behaviors when multitasking mode is enabled. See the comments below for more
details. There are no changes in behavior when multitasking mode is disabled; tests for the new behaviors in
multitasking mode will be added in a subsequent patch.

* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode const):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:

Add plumbing to inform the web process when "multitasking mode" state changes; we use this bit in WebPage to
determine whether or not we should use multitasking mode viewport behaviors (see below).

* UIProcess/API/ios/WKWebViewIOS.mm:
(-[WKWebView _registerForNotifications]):
(-[WKWebView didMoveToWindow]):
(-[WKWebView _multitaskingModeDidChange:]):

Send IPC to WebPage in these two places, to keep "multitasking mode" state in sync with the native view.

(-[WKWebView _beginAnimatedResizeWithUpdates:]):

Make a minor adjustment here to ignore `oldWebViewWidthInContentViewCoordinates` when computing a target scale
to zoom to when performing animated resize, in multitasking mode. This is required to prevent us from zooming
in excessively when the width of the view increases, since we'd otherwise attempt to keep the same content in
the page visible by zooming in (for instance, if an image covers most of the visual viewport at a lower view
width, this `min()` logic would cause us to zoom in, such that the image would still cover most of the viewport
at a larger width). This behavior is undesirable in multitasking mode.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::creationParameters):
(WebKit::WebPageProxy::setIsInMultitaskingMode):
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didCommitLoad):
(WebKit::WebPage::setIsInMultitaskingMode):

Add plumbing to set the `m_isInMultitaskingMode` flag on WebPage, and update the viewport configuration flag to
prefer horizontal scrolling below 980pt.

* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::scaleAfterViewportWidthChange):

Refactor a bit of code here (without changing any behaviors), to make it a bit clearer:

-   Rename `userHasChangedPageScaleFactor` to `scaleToFitContent` to better describe how this flag affects the
adjusted target scale during dynamic resize.

-   Make the log messages specific to both branches, and also log the adjusted viewport scale instead of the
(currently unused) given `scale` in the non-`scaleToFitContent` codepath.

(WebKit::WebPage::dynamicViewportSizeUpdate):

Make another "multitasking mode viewport behavior" adjustment here by maintaining the initial scale (only if the
viewport was already at initial scale) when performing dynamic viewport size updates. By default, we currently
adjust the scale such that the same content is still visible at the new viewport size; however, when allowing
horizontal scrolling, this causes us to zoom in excessively when making the window width larger. Instead, when
multitasking mode is enabled, we should try to preserve initial scale when changing window size, such that only
the horizontal scroll amount changes.

(WebKit::WebPage::usesMultitaskingModeViewportBehaviors const):

Add a helper method to encapsulate whether or not multitasking mode viewport 

[webkit-changes] [294135] trunk/Source/WebCore

2022-05-12 Thread j_pascoe
Title: [294135] trunk/Source/WebCore








Revision 294135
Author j_pas...@apple.com
Date 2022-05-12 18:02:49 -0700 (Thu, 12 May 2022)


Log Message
[WebAuthn] Remove document focus requirement for conditional mediation requests
https://bugs.webkit.org/show_bug.cgi?id=240361
rdar://problem/93201070

Reviewed by Brent Fulgham.

This is necessary so conditional mediation requests work when you open a page in
a new tab. Conditional mediation requests do not support security keys and the
request will be aborted if conditional mediation is not available.

* Modules/credentialmanagement/CredentialsContainer.cpp:
(WebCore::CredentialsContainer::get):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (294134 => 294135)

--- trunk/Source/WebCore/ChangeLog	2022-05-13 00:55:25 UTC (rev 294134)
+++ trunk/Source/WebCore/ChangeLog	2022-05-13 01:02:49 UTC (rev 294135)
@@ -1,3 +1,18 @@
+2022-05-12  J Pascoe  
+
+[WebAuthn] Remove document focus requirement for conditional mediation requests
+https://bugs.webkit.org/show_bug.cgi?id=240361
+rdar://problem/93201070
+
+Reviewed by Brent Fulgham.
+
+This is necessary so conditional mediation requests work when you open a page in
+a new tab. Conditional mediation requests do not support security keys and the
+request will be aborted if conditional mediation is not available.
+
+* Modules/credentialmanagement/CredentialsContainer.cpp:
+(WebCore::CredentialsContainer::get):
+
 2022-05-12  Alan Bujtas  
 
 TextBoxPainter::paintForeground: painting text with no marking/decoration should be simple


Modified: trunk/Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp (294134 => 294135)

--- trunk/Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp	2022-05-13 00:55:25 UTC (rev 294134)
+++ trunk/Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp	2022-05-13 01:02:49 UTC (rev 294135)
@@ -92,8 +92,8 @@
 return;
 }
 
-// Extra.
-if (!m_document->hasFocus()) {
+// The request will be aborted in WebAuthenticatorCoordinatorProxy if conditional mediation is not available.
+if (options.mediation != CredentialRequestOptions::MediationRequirement::Conditional && !m_document->hasFocus()) {
 promise.reject(Exception { NotAllowedError, "The document is not focused."_s });
 return;
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294134] branches/safari-7614.1.13-branch/Source

2022-05-12 Thread alancoon
Title: [294134] branches/safari-7614.1.13-branch/Source








Revision 294134
Author alanc...@apple.com
Date 2022-05-12 17:55:25 -0700 (Thu, 12 May 2022)


Log Message
Cherry-pick r294122. rdar://problem/93191958

[WebAuthn] Include backup state in authenticatorData
https://bugs.webkit.org/show_bug.cgi?id=240353
rdar://problem/93191958

Reviewed by Brent Fulgham.

Source/WebCore:

Add flags for credential backup state: https://github.com/w3c/webauthn/pull/1695

* Modules/webauthn/WebAuthenticationConstants.h:

Source/WebKit:

This patch adds support for backup state flags, which will be added to
the Web Authentication spec soon via https://github.com/w3c/webauthn/pull/1695

These flags are set whenever a credential is "backup eligible" and "backed up"
hinting to RPs that the credential is "durable" and may persist through device
restores. This is useful for RPs that may choose to offer to remove the user
password if a credental is in this state.

* UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:
(WebKit::LocalAuthenticatorInternal::authDataFlags):
(WebKit::LocalAuthenticator::continueMakeCredentialAfterUserVerification):
(WebKit::LocalAuthenticator::continueGetAssertionAfterUserVerification):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294122 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

branches/safari-7614.1.13-branch/Source/WebCore/ChangeLog
branches/safari-7614.1.13-branch/Source/WebCore/Modules/webauthn/WebAuthenticationConstants.h
branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog
branches/safari-7614.1.13-branch/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm




Diff

Modified: branches/safari-7614.1.13-branch/Source/WebCore/ChangeLog (294133 => 294134)

--- branches/safari-7614.1.13-branch/Source/WebCore/ChangeLog	2022-05-13 00:55:22 UTC (rev 294133)
+++ branches/safari-7614.1.13-branch/Source/WebCore/ChangeLog	2022-05-13 00:55:25 UTC (rev 294134)
@@ -1,5 +1,51 @@
 2022-05-12  Russell Epstein  
 
+Cherry-pick r294122. rdar://problem/93191958
+
+[WebAuthn] Include backup state in authenticatorData
+https://bugs.webkit.org/show_bug.cgi?id=240353
+rdar://problem/93191958
+
+Reviewed by Brent Fulgham.
+
+Source/WebCore:
+
+Add flags for credential backup state: https://github.com/w3c/webauthn/pull/1695
+
+* Modules/webauthn/WebAuthenticationConstants.h:
+
+Source/WebKit:
+
+This patch adds support for backup state flags, which will be added to
+the Web Authentication spec soon via https://github.com/w3c/webauthn/pull/1695
+
+These flags are set whenever a credential is "backup eligible" and "backed up"
+hinting to RPs that the credential is "durable" and may persist through device
+restores. This is useful for RPs that may choose to offer to remove the user
+password if a credental is in this state.
+
+* UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:
+(WebKit::LocalAuthenticatorInternal::authDataFlags):
+(WebKit::LocalAuthenticator::continueMakeCredentialAfterUserVerification):
+(WebKit::LocalAuthenticator::continueGetAssertionAfterUserVerification):
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294122 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2022-05-12  J Pascoe  
+
+[WebAuthn] Include backup state in authenticatorData
+https://bugs.webkit.org/show_bug.cgi?id=240353
+rdar://problem/93191958
+
+Reviewed by Brent Fulgham.
+
+Add flags for credential backup state: https://github.com/w3c/webauthn/pull/1695
+
+* Modules/webauthn/WebAuthenticationConstants.h:
+
+2022-05-12  Russell Epstein  
+
 Cherry-pick r294088. rdar://problem/93134975
 
 ImageAnalysisQueue should extract and analyze images inside of subframes


Modified: branches/safari-7614.1.13-branch/Source/WebCore/Modules/webauthn/WebAuthenticationConstants.h (294133 => 294134)

--- branches/safari-7614.1.13-branch/Source/WebCore/Modules/webauthn/WebAuthenticationConstants.h	2022-05-13 00:55:22 UTC (rev 294133)
+++ branches/safari-7614.1.13-branch/Source/WebCore/Modules/webauthn/WebAuthenticationConstants.h	2022-05-13 00:55:25 UTC (rev 294134)
@@ -110,5 +110,8 @@
 constexpr uint8_t userPresenceFlag = 0b0001;
 constexpr uint8_t userVerifiedFlag = 0b0100;
 constexpr uint8_t attestedCredentialDataIncludedFlag = 0b0100;
+// https://github.com/w3c/webauthn/pull/1695
+constexpr uint8_t backupEligibilityFlag = 0b1000;
+constexpr uint8_t backupStateFlag = 0b0001;
 
 } // namespace WebAuthn


Modified: branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog (294133 => 294134)

--- branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog	2022-05-13 00:55:22 UTC (rev 294133)
+++ branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog	2022-05-13 00:55:25 UTC (rev 

[webkit-changes] [294133] branches/safari-7614.1.13-branch

2022-05-12 Thread alancoon
Title: [294133] branches/safari-7614.1.13-branch








Revision 294133
Author alanc...@apple.com
Date 2022-05-12 17:55:22 -0700 (Thu, 12 May 2022)


Log Message
Cherry-pick r294088. rdar://problem/93134975

ImageAnalysisQueue should extract and analyze images inside of subframes
https://bugs.webkit.org/show_bug.cgi?id=240328
rdar://93134975

Reviewed by Tim Horton.

Teach `ImageAnalysisQueue` to recursively find all images on the page (including images in of subframe content)
and queue them for analysis. To do this, we refactor `enqueueAllImages` to call into a new recursive helper
method, `enqueueAllImagesRecursive`, to look for more candidate image elements that exist inside frame owner
elements (e.g. `iframe`).

Test: ImageAnalysisTests.AnalyzeImagesInSubframes

* page/ImageAnalysisQueue.cpp:
(WebCore::ImageAnalysisQueue::enqueueAllImages):
(WebCore::ImageAnalysisQueue::enqueueAllImagesRecursive):
* page/ImageAnalysisQueue.h:
ImageAnalysisQueue should extract and analyze images inside of subframes
https://bugs.webkit.org/show_bug.cgi?id=240328
rdar://93134975

Reviewed by Tim Horton.

Add an API test to verify that we extract and analyze images inside of subframes, in addition to images in the
main frame.

* TestWebKitAPI/Tests/WebKitCocoa/ImageAnalysisTests.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKitCocoa/multiple-images.html:

Canonical link: https://commits.webkit.org/250478@main

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294088 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

branches/safari-7614.1.13-branch/Source/WebCore/ChangeLog
branches/safari-7614.1.13-branch/Source/WebCore/page/ImageAnalysisQueue.cpp
branches/safari-7614.1.13-branch/Source/WebCore/page/ImageAnalysisQueue.h
branches/safari-7614.1.13-branch/Tools/ChangeLog
branches/safari-7614.1.13-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ImageAnalysisTests.mm
branches/safari-7614.1.13-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/multiple-images.html




Diff

Modified: branches/safari-7614.1.13-branch/Source/WebCore/ChangeLog (294132 => 294133)

--- branches/safari-7614.1.13-branch/Source/WebCore/ChangeLog	2022-05-13 00:55:18 UTC (rev 294132)
+++ branches/safari-7614.1.13-branch/Source/WebCore/ChangeLog	2022-05-13 00:55:22 UTC (rev 294133)
@@ -1,5 +1,64 @@
 2022-05-12  Russell Epstein  
 
+Cherry-pick r294088. rdar://problem/93134975
+
+ImageAnalysisQueue should extract and analyze images inside of subframes
+https://bugs.webkit.org/show_bug.cgi?id=240328
+rdar://93134975
+
+Reviewed by Tim Horton.
+
+Teach `ImageAnalysisQueue` to recursively find all images on the page (including images in of subframe content)
+and queue them for analysis. To do this, we refactor `enqueueAllImages` to call into a new recursive helper
+method, `enqueueAllImagesRecursive`, to look for more candidate image elements that exist inside frame owner
+elements (e.g. `iframe`).
+
+Test: ImageAnalysisTests.AnalyzeImagesInSubframes
+
+* page/ImageAnalysisQueue.cpp:
+(WebCore::ImageAnalysisQueue::enqueueAllImages):
+(WebCore::ImageAnalysisQueue::enqueueAllImagesRecursive):
+* page/ImageAnalysisQueue.h:
+ImageAnalysisQueue should extract and analyze images inside of subframes
+https://bugs.webkit.org/show_bug.cgi?id=240328
+rdar://93134975
+
+Reviewed by Tim Horton.
+
+Add an API test to verify that we extract and analyze images inside of subframes, in addition to images in the
+main frame.
+
+* TestWebKitAPI/Tests/WebKitCocoa/ImageAnalysisTests.mm:
+(TestWebKitAPI::TEST):
+* TestWebKitAPI/Tests/WebKitCocoa/multiple-images.html:
+
+Canonical link: https://commits.webkit.org/250478@main
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294088 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2022-05-11  Wenson Hsieh  
+
+ImageAnalysisQueue should extract and analyze images inside of subframes
+https://bugs.webkit.org/show_bug.cgi?id=240328
+rdar://93134975
+
+Reviewed by Tim Horton.
+
+Teach `ImageAnalysisQueue` to recursively find all images on the page (including images in of subframe content)
+and queue them for analysis. To do this, we refactor `enqueueAllImages` to call into a new recursive helper
+method, `enqueueAllImagesRecursive`, to look for more candidate image elements that exist inside frame owner
+elements (e.g. `iframe`).
+
+Test: ImageAnalysisTests.AnalyzeImagesInSubframes
+
+* page/ImageAnalysisQueue.cpp:
+(WebCore::ImageAnalysisQueue::enqueueAllImages):
+(WebCore::ImageAnalysisQueue::enqueueAllImagesRecursive):
+* page/ImageAnalysisQueue.h:
+
+2022-05-12  Russell Epstein  
+
 Cherry-pick r293968. 

[webkit-changes] [294131] branches/safari-7614.1.13-branch/Source

2022-05-12 Thread alancoon
Title: [294131] branches/safari-7614.1.13-branch/Source








Revision 294131
Author alanc...@apple.com
Date 2022-05-12 17:55:13 -0700 (Thu, 12 May 2022)


Log Message
Cherry-pick r293968. rdar://problem/92892014

[macOS] REGRESSION (r293825): Find highlight snapshots are incorrectly scaled
https://bugs.webkit.org/show_bug.cgi?id=240203
rdar://92892014

Reviewed by Tim Horton.

Source/WebCore:

takeSnapshots() depends on the snapshot ImageBuffer::resolutionScale() to
set the size of the TextIndicatorData image. r293825 scaled the size of
the ImageBuffer before creation and moved the scaling to the GraphicsContext.
So we have correct scaled pixels but the resolutionScale is 1. So we get
enlarged incorrect image.

The fix is to revert r293825 and fix the iOS snapshot without having to
change snapshotFrameRectWithClip().

* page/FrameSnapshotting.cpp:
(WebCore::snapshotFrameRectWithClip):

Source/WebKit:

In getShareableBitmapForImageBufferWithQualifiedIdentifier(), we used to
pass the backendSize as the srcRect and the backendSize as the destRect
to GraphicsContext::drawImageBuffer(). The backendSize is the logicalSize
scaled by the resolutionScale. But in ImageBufferCGBackend::draw() we
scale the srcRect by the resolutionScale one more time. This double-
scaled srcRect draws a srcRect whose size = backendSize * resolutionScale
to a destRect whose size = backendSize. And this results in shrinking the
desired snapshot image by 1 / resolutionScale.

* GPUProcess/graphics/RemoteRenderingBackend.cpp:
(WebKit::RemoteRenderingBackend::getShareableBitmapForImageBufferWithQualifiedIdentifier):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293968 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

branches/safari-7614.1.13-branch/Source/WebCore/ChangeLog
branches/safari-7614.1.13-branch/Source/WebCore/page/FrameSnapshotting.cpp
branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog
branches/safari-7614.1.13-branch/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp




Diff

Modified: branches/safari-7614.1.13-branch/Source/WebCore/ChangeLog (294130 => 294131)

--- branches/safari-7614.1.13-branch/Source/WebCore/ChangeLog	2022-05-13 00:55:10 UTC (rev 294130)
+++ branches/safari-7614.1.13-branch/Source/WebCore/ChangeLog	2022-05-13 00:55:13 UTC (rev 294131)
@@ -1,5 +1,66 @@
 2022-05-12  Russell Epstein  
 
+Cherry-pick r293968. rdar://problem/92892014
+
+[macOS] REGRESSION (r293825): Find highlight snapshots are incorrectly scaled
+https://bugs.webkit.org/show_bug.cgi?id=240203
+rdar://92892014
+
+Reviewed by Tim Horton.
+
+Source/WebCore:
+
+takeSnapshots() depends on the snapshot ImageBuffer::resolutionScale() to
+set the size of the TextIndicatorData image. r293825 scaled the size of
+the ImageBuffer before creation and moved the scaling to the GraphicsContext.
+So we have correct scaled pixels but the resolutionScale is 1. So we get
+enlarged incorrect image.
+
+The fix is to revert r293825 and fix the iOS snapshot without having to
+change snapshotFrameRectWithClip().
+
+* page/FrameSnapshotting.cpp:
+(WebCore::snapshotFrameRectWithClip):
+
+Source/WebKit:
+
+In getShareableBitmapForImageBufferWithQualifiedIdentifier(), we used to
+pass the backendSize as the srcRect and the backendSize as the destRect
+to GraphicsContext::drawImageBuffer(). The backendSize is the logicalSize
+scaled by the resolutionScale. But in ImageBufferCGBackend::draw() we
+scale the srcRect by the resolutionScale one more time. This double-
+scaled srcRect draws a srcRect whose size = backendSize * resolutionScale
+to a destRect whose size = backendSize. And this results in shrinking the
+desired snapshot image by 1 / resolutionScale.
+
+* GPUProcess/graphics/RemoteRenderingBackend.cpp:
+(WebKit::RemoteRenderingBackend::getShareableBitmapForImageBufferWithQualifiedIdentifier):
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293968 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2022-05-08  Said Abou-Hallawa  
+
+[macOS] REGRESSION (r293825): Find highlight snapshots are incorrectly scaled
+https://bugs.webkit.org/show_bug.cgi?id=240203
+rdar://92892014
+
+Reviewed by Tim Horton.
+
+takeSnapshots() depends on the snapshot ImageBuffer::resolutionScale() to
+set the size of the TextIndicatorData image. r293825 scaled the size of
+the ImageBuffer before creation and moved the scaling to the GraphicsContext.
+So we have correct scaled pixels but the resolutionScale is 1. So we get
+enlarged incorrect image.
+
+The fix is to revert r293825 and fix the iOS snapshot without having to
+change snapshotFrameRectWithClip().
+
+

[webkit-changes] [294130] branches/safari-7614.1.13-branch/Source/WebKit

2022-05-12 Thread alancoon
Title: [294130] branches/safari-7614.1.13-branch/Source/WebKit








Revision 294130
Author alanc...@apple.com
Date 2022-05-12 17:55:10 -0700 (Thu, 12 May 2022)


Log Message
Cherry-pick r293954. rdar://problem/92885915

Do WebKitAdditions header replacement only when a specific environment variable is set
https://bugs.webkit.org/show_bug.cgi?id=240210


Reviewed by Tim Horton.

* Source/WebKit/Configurations/WebKit.xcconfig:
* Source/WebKit/mac/replace-webkit-additions-includes.py:
(check_should_do_replacement):
(main):
(is_supported_os): Deleted.

Canonical link: https://commits.webkit.org/250400@main

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293954 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

branches/safari-7614.1.13-branch/Source/WebKit/Configurations/WebKit.xcconfig
branches/safari-7614.1.13-branch/Source/WebKit/mac/replace-webkit-additions-includes.py




Diff

Modified: branches/safari-7614.1.13-branch/Source/WebKit/Configurations/WebKit.xcconfig (294129 => 294130)

--- branches/safari-7614.1.13-branch/Source/WebKit/Configurations/WebKit.xcconfig	2022-05-13 00:55:06 UTC (rev 294129)
+++ branches/safari-7614.1.13-branch/Source/WebKit/Configurations/WebKit.xcconfig	2022-05-13 00:55:10 UTC (rev 294130)
@@ -23,6 +23,7 @@
 
 #include "BaseTarget.xcconfig"
 #include "WebKitTargetConditionals.xcconfig"
+#include? "/AppleInternal/XcodeConfig/AppleFeatures.xcconfig"
 
 PRODUCT_NAME = WebKit;
 PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);


Modified: branches/safari-7614.1.13-branch/Source/WebKit/mac/replace-webkit-additions-includes.py (294129 => 294130)

--- branches/safari-7614.1.13-branch/Source/WebKit/mac/replace-webkit-additions-includes.py	2022-05-13 00:55:06 UTC (rev 294129)
+++ branches/safari-7614.1.13-branch/Source/WebKit/mac/replace-webkit-additions-includes.py	2022-05-13 00:55:10 UTC (rev 294130)
@@ -42,24 +42,9 @@
 return ""
 
 
-def is_supported_os():
-os_version_string = os.environ.get("MACOSX_DEPLOYMENT_TARGET")
-if os_version_string is not None:
-os_version = float('.'.join(os_version_string.split('.')[:2]))
-return os_version >= 13.0
-os_version_string = os.environ.get("IPHONEOS_DEPLOYMENT_TARGET")
-if os_version_string is not None:
-os_version = float('.'.join(os_version_string.split('.')[:2]))
-return os_version >= 16.0
-os_version_string = os.environ.get("WATCHOS_DEPLOYMENT_TARGET")
-if os_version_string is not None:
-os_version = float('.'.join(os_version_string.split('.')[:2]))
-return os_version >= 9.0
-os_version_string = os.environ.get("TVOS_DEPLOYMENT_TARGET")
-if os_version_string is not None:
-os_version = float('.'.join(os_version_string.split('.')[:2]))
-return os_version >= 16.0
-return True
+def check_should_do_replacement(built_products_directory, sdk_root_directory):
+feature_name = read_content_from_webkit_additions(built_products_directory, sdk_root_directory, 'FeatureNeededForHeaderReplacement').strip()
+return os.environ.get(feature_name) == '1'
 
 
 def main(argv=None):
@@ -81,8 +66,7 @@
 print("(%s): SDK root directory unspecified" % argv[0], file=sys.stderr)
 return 1
 
-# We currently only support WebKitAdditions in Framework headers on macOS 13+ and iOS 16+.
-should_do_replacement = is_supported_os()
+should_do_replacement = check_should_do_replacement(built_products_directory, sdk_root_directory)
 
 additions_import_pattern = re.compile(r"\#if 0 // API_WEBKIT_ADDITIONS_REPLACEMENT\n#import \n#endif")
 header_contents = sys.stdin.read()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294129] branches/safari-7614.1.13-branch

2022-05-12 Thread alancoon
Title: [294129] branches/safari-7614.1.13-branch








Revision 294129
Author alanc...@apple.com
Date 2022-05-12 17:55:06 -0700 (Thu, 12 May 2022)


Log Message
Cherry-pick r293951. rdar://problem/92635604

Don't propagate GraphicsContextState change bits into TextPainter's glyph display list recorder
https://bugs.webkit.org/show_bug.cgi?id=239952


Source/WebCore:

Reviewed by Said Abou-Hallawa and Antti Koivisto.

In FontCascade::displayListForTextRun, we create a
DisplayList::Recorder, then call drawGlyphBuffer. We initialize the
DisplayList::Recorder with the GraphicsContextState of the
GraphicsContext we're drawing to. Just before this, we will have set the
current fill color on that GraphicsContext.

When GPUP DOM rendering is disabled, GraphicsContextCG responds to
setFillColor etc. by updating GraphicsContextState, including setting
the Change flag, then immediately updating the CGContext, and clearing
the Change flag.

But when GPUP DOM rendering is enabled, the GraphicsContext is a
DisplayList::Recorder for the layer we're painting in to. Because
DisplayList::Recorder applies its state changes lazily, it can be in the
situation where its GraphicsContextState has had the fill brush changed,
and the Change flag is still set. So DisplayList::Recorder starts off
with a GraphicsContextState with unapplied changes in it. We end up in
DisplayList::Recorder::drawGlyphsAndCacheFont, which calls
appendStateChangeItemIfNecessary, which sees that the Change bit is set,
and generates a SetInlineFillColor display list item, which is
recorded and then replayed the next time the same text is painted.
This recorded fill color then may be wrong for the next TextPainter
that wants to reuse the cached glyph display list.

Display list recorders should never be initialized with a
GraphicsContextState that has change flags set on it. We can assert
this, then make FontCascade explicitly clear those flags on the state
object it passes in to the DisplayList::Recorder.

Test: fast/text/glyph-display-list-color.html

* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::displayListForTextRun const):
* platform/graphics/GraphicsContextState.cpp:
(WebCore::GraphicsContextState::cloneForRecording const):
* platform/graphics/GraphicsContextState.h:
* platform/graphics/displaylists/DisplayListRecorder.cpp:
(WebCore::DisplayList::Recorder::Recorder):

Add setForceUseGlyphDisplayListForTesting and
cachedGlyphDisplayListsForTextNode functions on Internal for the
test to use:

* rendering/GlyphDisplayListCache.h:
(WebCore::GlyphDisplayListCache::getIfExists):
* rendering/TextPainter.cpp:
(WebCore::TextPainter::shouldUseGlyphDisplayList):
(WebCore::TextPainter::setForceUseGlyphDisplayListForTesting):
(WebCore::TextPainter::cachedGlyphDisplayListsForTextNodeAsText):
* rendering/TextPainter.h:
(WebCore::TextPainter::glyphDisplayListIfExists):
* testing/Internals.cpp:
(WebCore::Internals::setForceUseGlyphDisplayListForTesting):
(WebCore::Internals::cachedGlyphDisplayListsForTextNode):
* testing/Internals.h:
* testing/Internals.idl:

LayoutTests:

Reviewed by Antti Koivisto.

* fast/text/glyph-display-list-color-expected.txt: Added.
* fast/text/glyph-display-list-color.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293951 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

branches/safari-7614.1.13-branch/LayoutTests/ChangeLog
branches/safari-7614.1.13-branch/LayoutTests/TestExpectations
branches/safari-7614.1.13-branch/Source/WebCore/ChangeLog
branches/safari-7614.1.13-branch/Source/WebCore/platform/graphics/FontCascade.cpp
branches/safari-7614.1.13-branch/Source/WebCore/platform/graphics/GraphicsContextState.cpp
branches/safari-7614.1.13-branch/Source/WebCore/platform/graphics/GraphicsContextState.h
branches/safari-7614.1.13-branch/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp
branches/safari-7614.1.13-branch/Source/WebCore/rendering/GlyphDisplayListCache.h
branches/safari-7614.1.13-branch/Source/WebCore/rendering/TextPainter.cpp
branches/safari-7614.1.13-branch/Source/WebCore/rendering/TextPainter.h
branches/safari-7614.1.13-branch/Source/WebCore/testing/Internals.cpp
branches/safari-7614.1.13-branch/Source/WebCore/testing/Internals.h
branches/safari-7614.1.13-branch/Source/WebCore/testing/Internals.idl


Added Paths

branches/safari-7614.1.13-branch/LayoutTests/fast/text/glyph-display-list-color-expected.txt
branches/safari-7614.1.13-branch/LayoutTests/fast/text/glyph-display-list-color.html




Diff

Modified: branches/safari-7614.1.13-branch/LayoutTests/ChangeLog (294128 => 294129)

--- branches/safari-7614.1.13-branch/LayoutTests/ChangeLog	2022-05-13 00:31:33 UTC (rev 294128)
+++ branches/safari-7614.1.13-branch/LayoutTests/ChangeLog	

[webkit-changes] [294132] branches/safari-7614.1.13-branch

2022-05-12 Thread alancoon
Title: [294132] branches/safari-7614.1.13-branch








Revision 294132
Author alanc...@apple.com
Date 2022-05-12 17:55:18 -0700 (Thu, 12 May 2022)


Log Message
Cherry-pick r294084. rdar://problem/93036066

Re-send connection configuration if webpushd dies
https://bugs.webkit.org/show_bug.cgi?id=240286

Reviewed by Geoffrey Garen.

If webpushd dies, all future communication with it from NetworkProcess fails because we
don't re-send the connection configuration to the daemon after the connection is
interrupted. This manifests itself as an "invalid sender" AbortError from various
PushManager methods because webpushd doesn't know the bundle identifier of the UIProcess it
is working on behalf of.

To fix this, I moved the responsibility for sending the configuration from
NetworkNotificationManager to WebPushD::Connection, and WebPushD::Connection re-sends the
configuration every time a new XPC connection is created.

Covered by a new API test.

Source/WebKit:

* NetworkProcess/NetworkSession.cpp:
(WebKit::NetworkSession::NetworkSession):
* NetworkProcess/NetworkSession.h:
(WebKit::NetworkSession::webPushDaemonUsesMockBundlesForTesting const): Deleted.
* NetworkProcess/Notifications/Cocoa/WebPushDaemonConnectionCocoa.mm:
(WebKit::WebPushD::Connection::newConnectionWasInitialized const):
* NetworkProcess/Notifications/NetworkNotificationManager.cpp:
(WebKit::NetworkNotificationManager::NetworkNotificationManager):
(WebKit::NetworkNotificationManager::sendMessage const):
(WebKit::NetworkNotificationManager::sendMessageWithReply const):
(WebKit::NetworkNotificationManager::maybeSendConnectionConfiguration const): Deleted.
* NetworkProcess/Notifications/NetworkNotificationManager.h:
* NetworkProcess/Notifications/WebPushDaemonConnection.cpp:
(WebKit::WebPushD::Connection::Connection):
* NetworkProcess/Notifications/WebPushDaemonConnection.h:
* NetworkProcess/cocoa/NetworkSessionCocoa.h:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::NetworkSessionCocoa::NetworkSessionCocoa):

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm:
(TestWebKitAPI::testWebPushDaemonPList):
(TestWebKitAPI::setUpTestWebPushD):
(TestWebKitAPI::restartTestWebPushD):
(TestWebKitAPI::WebPushDTest::WebPushDTest):
* TestWebKitAPI/cocoa/DaemonTestUtilities.h:
* TestWebKitAPI/cocoa/DaemonTestUtilities.mm:
(TestWebKitAPI::restartService):

Canonical link: https://commits.webkit.org/250475@main

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog
branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/NetworkSession.cpp
branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/NetworkSession.h
branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/Notifications/Cocoa/WebPushDaemonConnectionCocoa.mm
branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/Notifications/NetworkNotificationManager.cpp
branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/Notifications/NetworkNotificationManager.h
branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/Notifications/WebPushDaemonConnection.cpp
branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/Notifications/WebPushDaemonConnection.h
branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h
branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
branches/safari-7614.1.13-branch/Tools/ChangeLog
branches/safari-7614.1.13-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm
branches/safari-7614.1.13-branch/Tools/TestWebKitAPI/cocoa/DaemonTestUtilities.h
branches/safari-7614.1.13-branch/Tools/TestWebKitAPI/cocoa/DaemonTestUtilities.mm




Diff

Modified: branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog (294131 => 294132)

--- branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog	2022-05-13 00:55:13 UTC (rev 294131)
+++ branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog	2022-05-13 00:55:18 UTC (rev 294132)
@@ -1,5 +1,101 @@
 2022-05-12  Russell Epstein  
 
+Cherry-pick r294084. rdar://problem/93036066
+
+Re-send connection configuration if webpushd dies
+https://bugs.webkit.org/show_bug.cgi?id=240286
+
+Reviewed by Geoffrey Garen.
+
+If webpushd dies, all future communication with it from NetworkProcess fails because we
+don't re-send the connection configuration to the daemon after the connection is
+interrupted. This manifests itself as an "invalid sender" AbortError from various
+PushManager methods because webpushd doesn't know the bundle identifier of the UIProcess it
+is working on behalf of.
+
+To fix this, I moved the responsibility for sending the configuration from
+NetworkNotificationManager to 

[webkit-changes] [294128] trunk/Source/WebCore

2022-05-12 Thread zalan
Title: [294128] trunk/Source/WebCore








Revision 294128
Author za...@apple.com
Date 2022-05-12 17:31:33 -0700 (Thu, 12 May 2022)


Log Message
TextBoxPainter::paintForeground: painting text with no marking/decoration should be simple
https://bugs.webkit.org/show_bug.cgi?id=240319

Reviewed by Simon Fraser.

Let's have a fast codepath for regular, simple text painting.

* rendering/StyledMarkedText.cpp:
(WebCore::StyledMarkedText::computeStyleForUnmarkedMarkedText):
(WebCore::computeStyleForUnmarkedMarkedText): Deleted.
* rendering/StyledMarkedText.h:
(WebCore::StyledMarkedText::StyledMarkedText):
(WebCore::StyledMarkedText::style):
* rendering/TextBoxPainter.cpp:
(WebCore::TextBoxPainter::paintBackground):
(WebCore::TextBoxPainter::paintForegroundAndDecorations):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/StyledMarkedText.cpp
trunk/Source/WebCore/rendering/StyledMarkedText.h
trunk/Source/WebCore/rendering/TextBoxPainter.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (294127 => 294128)

--- trunk/Source/WebCore/ChangeLog	2022-05-13 00:05:53 UTC (rev 294127)
+++ trunk/Source/WebCore/ChangeLog	2022-05-13 00:31:33 UTC (rev 294128)
@@ -1,3 +1,22 @@
+2022-05-12  Alan Bujtas  
+
+TextBoxPainter::paintForeground: painting text with no marking/decoration should be simple
+https://bugs.webkit.org/show_bug.cgi?id=240319
+
+Reviewed by Simon Fraser.
+
+Let's have a fast codepath for regular, simple text painting.
+
+* rendering/StyledMarkedText.cpp:
+(WebCore::StyledMarkedText::computeStyleForUnmarkedMarkedText):
+(WebCore::computeStyleForUnmarkedMarkedText): Deleted.
+* rendering/StyledMarkedText.h:
+(WebCore::StyledMarkedText::StyledMarkedText):
+(WebCore::StyledMarkedText::style):
+* rendering/TextBoxPainter.cpp:
+(WebCore::TextBoxPainter::paintBackground):
+(WebCore::TextBoxPainter::paintForegroundAndDecorations):
+
 2022-05-12  Sihui Liu  
 
 StorageMap::removeItem may fail to remove item from map


Modified: trunk/Source/WebCore/rendering/StyledMarkedText.cpp (294127 => 294128)

--- trunk/Source/WebCore/rendering/StyledMarkedText.cpp	2022-05-13 00:05:53 UTC (rev 294127)
+++ trunk/Source/WebCore/rendering/StyledMarkedText.cpp	2022-05-13 00:31:33 UTC (rev 294128)
@@ -110,7 +110,7 @@
 return styledMarkedText;
 }
 
-static StyledMarkedText::Style computeStyleForUnmarkedMarkedText(const RenderText& renderer, const RenderStyle& lineStyle, bool isFirstLine, const PaintInfo& paintInfo)
+StyledMarkedText::Style StyledMarkedText::computeStyleForUnmarkedMarkedText(const RenderText& renderer, const RenderStyle& lineStyle, bool isFirstLine, const PaintInfo& paintInfo)
 {
 StyledMarkedText::Style style;
 style.textDecorationStyles = TextDecorationPainter::stylesForRenderer(renderer, lineStyle.textDecorationsInEffect(), isFirstLine);


Modified: trunk/Source/WebCore/rendering/StyledMarkedText.h (294127 => 294128)

--- trunk/Source/WebCore/rendering/StyledMarkedText.h	2022-05-13 00:05:53 UTC (rev 294127)
+++ trunk/Source/WebCore/rendering/StyledMarkedText.h	2022-05-13 00:31:33 UTC (rev 294128)
@@ -36,11 +36,6 @@
 class RenderedDocumentMarker;
 
 struct StyledMarkedText : MarkedText {
-StyledMarkedText(const MarkedText& marker)
-: MarkedText { marker }
-{
-}
-
 struct Style {
 Color backgroundColor;
 TextPaintStyle textStyles;
@@ -49,6 +44,17 @@
 float alpha { 1 };
 };
 
+StyledMarkedText(const MarkedText& marker)
+: MarkedText { marker }
+{
+}
+
+StyledMarkedText(const MarkedText& marker, Style style)
+: MarkedText { marker }
+, style(style)
+{
+}
+
 Style style;
 
 static Vector subdivideAndResolve(const Vector&, const RenderText&, bool isFirstLine, const PaintInfo&);
@@ -55,6 +61,7 @@
 static Vector coalesceAdjacentWithEqualBackground(const Vector&);
 static Vector coalesceAdjacentWithEqualForeground(const Vector&);
 static Vector coalesceAdjacentWithEqualDecorations(const Vector&);
+static Style computeStyleForUnmarkedMarkedText(const RenderText&, const RenderStyle&, bool isFirstLine, const PaintInfo&);
 };
 
 }


Modified: trunk/Source/WebCore/rendering/TextBoxPainter.cpp (294127 => 294128)

--- trunk/Source/WebCore/rendering/TextBoxPainter.cpp	2022-05-13 00:05:53 UTC (rev 294127)
+++ trunk/Source/WebCore/rendering/TextBoxPainter.cpp	2022-05-13 00:31:33 UTC (rev 294128)
@@ -171,7 +171,29 @@
 
 void TextBoxPainter::paintForegroundAndDecorations()
 {
-bool shouldPaintSelectionForeground = m_haveSelection && !m_useCustomUnderlines;
+auto shouldPaintSelectionForeground = m_haveSelection && !m_useCustomUnderlines;
+auto hasTextDecoration = !m_style.textDecorationsInEffect().isEmpty();
+auto hasHighlightDecoration = m_document.hasHighlight() && !MarkedText::collectForHighlights(m_renderer, m_selectableRange, 

[webkit-changes] [294127] branches/safari-7614.1.13-branch/Source/WebKit

2022-05-12 Thread alancoon
Title: [294127] branches/safari-7614.1.13-branch/Source/WebKit








Revision 294127
Author alanc...@apple.com
Date 2022-05-12 17:05:53 -0700 (Thu, 12 May 2022)


Log Message
Cherry-pick r294126. rdar://problem/93208265

Revert r293861
https://bugs.webkit.org/show_bug.cgi?id=239977


Apparently it is still needed on trunk

* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
(WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::NetworkSessionCocoa::createWebSocketTask):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294126 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog
branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm




Diff

Modified: branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog (294126 => 294127)

--- branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog	2022-05-12 23:43:37 UTC (rev 294126)
+++ branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog	2022-05-13 00:05:53 UTC (rev 294127)
@@ -1,5 +1,37 @@
 2022-05-12  Alan Coon  
 
+Cherry-pick r294126. rdar://problem/93208265
+
+Revert r293861
+https://bugs.webkit.org/show_bug.cgi?id=239977
+
+
+Apparently it is still needed on trunk
+
+* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+(WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
+* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+(WebKit::NetworkSessionCocoa::createWebSocketTask):
+
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294126 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2022-05-12  Alex Christensen  
+
+Revert r293861
+https://bugs.webkit.org/show_bug.cgi?id=239977
+
+
+Apparently it is still needed on trunk
+
+* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+(WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
+* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+(WebKit::NetworkSessionCocoa::createWebSocketTask):
+
+2022-05-12  Alan Coon  
+
 Apply patch. rdar://problem/92617943
 
 2022-05-12  Tim Horton  


Modified: branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (294126 => 294127)

--- branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	2022-05-12 23:43:37 UTC (rev 294126)
+++ branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	2022-05-13 00:05:53 UTC (rev 294127)
@@ -340,14 +340,6 @@
 RetainPtr nsRequest = request.nsURLRequest(WebCore::HTTPBodyUpdatePolicy::UpdateHTTPBody);
 RetainPtr mutableRequest = adoptNS([nsRequest.get() mutableCopy]);
 
-if (parameters.isMainFrameNavigation
-|| parameters.hadMainFrameMainResourcePrivateRelayed
-|| !parameters.topOrigin
-|| request.url().host() == parameters.topOrigin->host()) {
-if ([mutableRequest respondsToSelector:@selector(_setPrivacyProxyFailClosedForUnreachableNonMainHosts:)])
-[mutableRequest _setPrivacyProxyFailClosedForUnreachableNonMainHosts:YES];
-}
-
 #if ENABLE(APP_PRIVACY_REPORT)
 mutableRequest.get().attribution = request.isAppInitiated() ? NSURLRequestAttributionDeveloper : NSURLRequestAttributionUser;
 #endif


Modified: branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (294126 => 294127)

--- branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2022-05-12 23:43:37 UTC (rev 294126)
+++ branches/safari-7614.1.13-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2022-05-13 00:05:53 UTC (rev 294127)
@@ -1713,17 +1713,6 @@
 appPrivacyReportTestingData().didLoadAppInitiatedRequest(nsRequest.get().attribution == NSURLRequestAttributionDeveloper);
 #endif
 
-// FIXME: This function can make up to 3 copies of a request.
-// Reduce that to one if the protocol is null, the request isn't app initiated,
-// or the main frame main resource was private relayed, then set all properties
-// on the one copy.
-if (hadMainFrameMainResourcePrivateRelayed || request.url().host() == clientOrigin.topOrigin.host) {
-RetainPtr mutableRequest = adoptNS([nsRequest.get() mutableCopy]);
-if ([mutableRequest respondsToSelector:@selector(_setPrivacyProxyFailClosedForUnreachableNonMainHosts:)])
-[mutableRequest _setPrivacyProxyFailClosedForUnreachableNonMainHosts:YES];
-nsRequest = WTFMove(mutableRequest);
-}
-
 auto& sessionSet = sessionSetForPage(webPageProxyID);
 RetainPtr task = [sessionSet.sessionWithCredentialStorage.session webSocketTaskWithRequest:nsRequest.get()];
 







[webkit-changes] [294126] trunk/Source/WebKit

2022-05-12 Thread achristensen
Title: [294126] trunk/Source/WebKit








Revision 294126
Author achristen...@apple.com
Date 2022-05-12 16:43:37 -0700 (Thu, 12 May 2022)


Log Message
Revert r293861
https://bugs.webkit.org/show_bug.cgi?id=239977


Apparently it is still needed on trunk

* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
(WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::NetworkSessionCocoa::createWebSocketTask):

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm




Diff

Modified: trunk/Source/WebKit/ChangeLog (294125 => 294126)

--- trunk/Source/WebKit/ChangeLog	2022-05-12 22:32:09 UTC (rev 294125)
+++ trunk/Source/WebKit/ChangeLog	2022-05-12 23:43:37 UTC (rev 294126)
@@ -1,3 +1,16 @@
+2022-05-12  Alex Christensen  
+
+Revert r293861
+https://bugs.webkit.org/show_bug.cgi?id=239977
+
+
+Apparently it is still needed on trunk
+
+* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+(WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
+* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+(WebKit::NetworkSessionCocoa::createWebSocketTask):
+
 2022-05-12  J Pascoe  
 
 [WebAuthn] Include backup state in authenticatorData


Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (294125 => 294126)

--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	2022-05-12 22:32:09 UTC (rev 294125)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	2022-05-12 23:43:37 UTC (rev 294126)
@@ -340,14 +340,6 @@
 RetainPtr nsRequest = request.nsURLRequest(WebCore::HTTPBodyUpdatePolicy::UpdateHTTPBody);
 RetainPtr mutableRequest = adoptNS([nsRequest.get() mutableCopy]);
 
-if (parameters.isMainFrameNavigation
-|| parameters.hadMainFrameMainResourcePrivateRelayed
-|| !parameters.topOrigin
-|| request.url().host() == parameters.topOrigin->host()) {
-if ([mutableRequest respondsToSelector:@selector(_setPrivacyProxyFailClosedForUnreachableNonMainHosts:)])
-[mutableRequest _setPrivacyProxyFailClosedForUnreachableNonMainHosts:YES];
-}
-
 #if ENABLE(APP_PRIVACY_REPORT)
 mutableRequest.get().attribution = request.isAppInitiated() ? NSURLRequestAttributionDeveloper : NSURLRequestAttributionUser;
 #endif


Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (294125 => 294126)

--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2022-05-12 22:32:09 UTC (rev 294125)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2022-05-12 23:43:37 UTC (rev 294126)
@@ -1712,17 +1712,6 @@
 appPrivacyReportTestingData().didLoadAppInitiatedRequest(nsRequest.get().attribution == NSURLRequestAttributionDeveloper);
 #endif
 
-// FIXME: This function can make up to 3 copies of a request.
-// Reduce that to one if the protocol is null, the request isn't app initiated,
-// or the main frame main resource was private relayed, then set all properties
-// on the one copy.
-if (hadMainFrameMainResourcePrivateRelayed || request.url().host() == clientOrigin.topOrigin.host) {
-RetainPtr mutableRequest = adoptNS([nsRequest.get() mutableCopy]);
-if ([mutableRequest respondsToSelector:@selector(_setPrivacyProxyFailClosedForUnreachableNonMainHosts:)])
-[mutableRequest _setPrivacyProxyFailClosedForUnreachableNonMainHosts:YES];
-nsRequest = WTFMove(mutableRequest);
-}
-
 auto& sessionSet = sessionSetForPage(webPageProxyID);
 RetainPtr task = [sessionSet.sessionWithCredentialStorage.session webSocketTaskWithRequest:nsRequest.get()];
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294125] trunk

2022-05-12 Thread cdumez
Title: [294125] trunk








Revision 294125
Author cdu...@apple.com
Date 2022-05-12 15:32:09 -0700 (Thu, 12 May 2022)


Log Message
Unreviewed, revert r284894 as it caused issues with printing and reader mode
https://bugs.webkit.org/show_bug.cgi?id=240355


Revert r284894 as it caused issues with printing and reader mode.

Canonical link: https://commits.webkit.org/250503@main

Modified Paths

trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/adoption-expected.txt
trunk/Source/WebCore/html/HTMLImageElement.cpp




Diff

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/adoption-expected.txt (294124 => 294125)

--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/adoption-expected.txt	2022-05-12 21:57:09 UTC (rev 294124)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/adoption-expected.txt	2022-05-12 22:32:09 UTC (rev 294125)
@@ -1,11 +1,13 @@
 
-PASS img (src only)
+Harness Error (TIMEOUT), message = null
+
+TIMEOUT img (src only) Test timed out
 PASS img (src only), parent is picture
 PASS img (src only), previous sibling is source
-PASS img (srcset 1 cand)
+TIMEOUT img (srcset 1 cand) Test timed out
 PASS img (srcset 1 cand), parent is picture
 PASS img (srcset 1 cand), previous sibling is source
-PASS adopt a cloned img in template
+FAIL adopt a cloned img in template assert_equals: expected "http://localhost:8800/images/green-1x1.png" but got "/images/green-1x1.png"
 PASS adoption is from appendChild
 
 


Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (294124 => 294125)

--- trunk/Source/WebCore/html/HTMLImageElement.cpp	2022-05-12 21:57:09 UTC (rev 294124)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp	2022-05-12 22:32:09 UTC (rev 294125)
@@ -710,8 +710,6 @@
 HTMLElement::didMoveToNewDocument(oldDocument, newDocument);
 if (RefPtr element = pictureElement())
 element->sourcesChanged();
-else if (hasAttribute(srcAttr) || hasAttribute(srcsetAttr))
-selectImageSource(RelevantMutation::Yes);
 }
 
 bool HTMLImageElement::isServerMap() const






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294124] trunk/Source/WebCore

2022-05-12 Thread sihui_liu
Title: [294124] trunk/Source/WebCore








Revision 294124
Author sihui_...@apple.com
Date 2022-05-12 14:57:09 -0700 (Thu, 12 May 2022)


Log Message
StorageMap::removeItem may fail to remove item from map
https://bugs.webkit.org/show_bug.cgi?id=239982
rdar://80891555

* storage/StorageMap.cpp:
(WebCore::StorageMap::removeItem):
Address post-landing review comment from Darin.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/storage/StorageMap.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (294123 => 294124)

--- trunk/Source/WebCore/ChangeLog	2022-05-12 21:56:45 UTC (rev 294123)
+++ trunk/Source/WebCore/ChangeLog	2022-05-12 21:57:09 UTC (rev 294124)
@@ -1,3 +1,13 @@
+2022-05-12  Sihui Liu  
+
+StorageMap::removeItem may fail to remove item from map
+https://bugs.webkit.org/show_bug.cgi?id=239982
+rdar://80891555
+
+* storage/StorageMap.cpp:
+(WebCore::StorageMap::removeItem): 
+Address post-landing review comment from Darin.
+
 2022-05-12  J Pascoe  
 
 [WebAuthn] Include backup state in authenticatorData


Modified: trunk/Source/WebCore/storage/StorageMap.cpp (294123 => 294124)

--- trunk/Source/WebCore/storage/StorageMap.cpp	2022-05-12 21:56:45 UTC (rev 294123)
+++ trunk/Source/WebCore/storage/StorageMap.cpp	2022-05-12 21:57:09 UTC (rev 294124)
@@ -134,11 +134,14 @@
 oldValue = iter->value;
 newSize = newSize - iter->key.sizeInBytes() - oldValue.sizeInBytes();
 
-// Implement copy-on-write semantics.
-if (m_impl->refCount() > 1)
+if (m_impl->hasOneRef())
+m_impl->map.remove(iter);
+else {
+// Implement copy-on-write semantics.
 m_impl = m_impl->copy();
+m_impl->map.remove(key);
+}
 
-m_impl->map.remove(key);
 m_impl->currentSize = newSize;
 invalidateIterator();
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294123] releases/WebKitGTK/webkit-2.36/Source/WebCore

2022-05-12 Thread aperez
Title: [294123] releases/WebKitGTK/webkit-2.36/Source/WebCore








Revision 294123
Author ape...@igalia.com
Date 2022-05-12 14:56:45 -0700 (Thu, 12 May 2022)


Log Message
Merge r293971 - [Nicosia] Canvas animations don't work with threaded rendering
https://bugs.webkit.org/show_bug.cgi?id=227760


Reviewed by Adrian Perez de Castro.

Implement Nicosia::CairoOperationRecorder::draImageBuffer(), which is required in order to paint
canvas contents into a GraphicsContext.

* platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp:
(Nicosia::CairoOperationRecorder::drawImageBuffer):

Modified Paths

releases/WebKitGTK/webkit-2.36/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.36/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.36/Source/WebCore/ChangeLog (294122 => 294123)

--- releases/WebKitGTK/webkit-2.36/Source/WebCore/ChangeLog	2022-05-12 21:51:58 UTC (rev 294122)
+++ releases/WebKitGTK/webkit-2.36/Source/WebCore/ChangeLog	2022-05-12 21:56:45 UTC (rev 294123)
@@ -1,3 +1,17 @@
+2022-05-09  Miguel Gomez  
+
+[Nicosia] Canvas animations don't work with threaded rendering
+https://bugs.webkit.org/show_bug.cgi?id=227760
+
+
+Reviewed by Adrian Perez de Castro.
+
+Implement Nicosia::CairoOperationRecorder::draImageBuffer(), which is required in order to paint
+canvas contents into a GraphicsContext.
+
+* platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp:
+(Nicosia::CairoOperationRecorder::drawImageBuffer):
+
 2022-03-01  Fujii Hironori  
 
 Fix deprecations for ERB.new in GenerateSettings.rb


Modified: releases/WebKitGTK/webkit-2.36/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp (294122 => 294123)

--- releases/WebKitGTK/webkit-2.36/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp	2022-05-12 21:51:58 UTC (rev 294122)
+++ releases/WebKitGTK/webkit-2.36/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp	2022-05-12 21:56:45 UTC (rev 294123)
@@ -538,9 +538,32 @@
 state.strokeThickness, state.shadowOffset, state.shadowColor, fontSmoothing));
 }
 
-void CairoOperationRecorder::drawImageBuffer(ImageBuffer&, const FloatRect&, const FloatRect&, const ImagePaintingOptions&)
+void CairoOperationRecorder::drawImageBuffer(ImageBuffer& buffer, const FloatRect& destRect, const FloatRect& srcRect, const ImagePaintingOptions& options)
 {
-// FIXME: Not implemented.
+struct DrawImageBuffer final : PaintingOperation, OperationData, FloatRect, FloatRect, ImagePaintingOptions, float, Cairo::ShadowState> {
+virtual ~DrawImageBuffer() = default;
+
+void execute(PaintingOperationReplay& replayer) override
+{
+Cairo::drawPlatformImage(contextForReplay(replayer), arg<0>().get(), arg<1>(), arg<2>(), arg<3>(), arg<4>(), arg<5>());
+}
+
+void dump(TextStream& ts) override
+{
+ts << indent << "DrawImageBuffer<>\n";
+}
+};
+
+RefPtr image = buffer.copyImage(DontCopyBackingStore);
+if (!image)
+return;
+
+auto nativeImage = image->nativeImageForCurrentFrame();
+if (!nativeImage)
+return;
+
+auto& state = this->state();
+append(createCommand(nativeImage->platformImage(), destRect, srcRect, ImagePaintingOptions(options, state.imageInterpolationQuality), state.alpha, Cairo::ShadowState(state)));
 }
 
 void CairoOperationRecorder::drawFilteredImageBuffer(ImageBuffer* srcImage, const FloatRect& srcRect, Filter& filter, FilterResults& results)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294122] trunk/Source

2022-05-12 Thread j_pascoe
Title: [294122] trunk/Source








Revision 294122
Author j_pas...@apple.com
Date 2022-05-12 14:51:58 -0700 (Thu, 12 May 2022)


Log Message
[WebAuthn] Include backup state in authenticatorData
https://bugs.webkit.org/show_bug.cgi?id=240353
rdar://problem/93191958

Reviewed by Brent Fulgham.

Source/WebCore:

Add flags for credential backup state: https://github.com/w3c/webauthn/pull/1695

* Modules/webauthn/WebAuthenticationConstants.h:

Source/WebKit:

This patch adds support for backup state flags, which will be added to
the Web Authentication spec soon via https://github.com/w3c/webauthn/pull/1695

These flags are set whenever a credential is "backup eligible" and "backed up"
hinting to RPs that the credential is "durable" and may persist through device
restores. This is useful for RPs that may choose to offer to remove the user
password if a credental is in this state.

* UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:
(WebKit::LocalAuthenticatorInternal::authDataFlags):
(WebKit::LocalAuthenticator::continueMakeCredentialAfterUserVerification):
(WebKit::LocalAuthenticator::continueGetAssertionAfterUserVerification):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/webauthn/WebAuthenticationConstants.h
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (294121 => 294122)

--- trunk/Source/WebCore/ChangeLog	2022-05-12 21:30:42 UTC (rev 294121)
+++ trunk/Source/WebCore/ChangeLog	2022-05-12 21:51:58 UTC (rev 294122)
@@ -1,3 +1,15 @@
+2022-05-12  J Pascoe  
+
+[WebAuthn] Include backup state in authenticatorData
+https://bugs.webkit.org/show_bug.cgi?id=240353
+rdar://problem/93191958
+
+Reviewed by Brent Fulgham.
+
+Add flags for credential backup state: https://github.com/w3c/webauthn/pull/1695
+
+* Modules/webauthn/WebAuthenticationConstants.h:
+
 2022-05-12  Brent Fulgham  
 
 REGRESSION (r281791): [iOS] WKWebView cannot load local .log file


Modified: trunk/Source/WebCore/Modules/webauthn/WebAuthenticationConstants.h (294121 => 294122)

--- trunk/Source/WebCore/Modules/webauthn/WebAuthenticationConstants.h	2022-05-12 21:30:42 UTC (rev 294121)
+++ trunk/Source/WebCore/Modules/webauthn/WebAuthenticationConstants.h	2022-05-12 21:51:58 UTC (rev 294122)
@@ -110,5 +110,8 @@
 constexpr uint8_t userPresenceFlag = 0b0001;
 constexpr uint8_t userVerifiedFlag = 0b0100;
 constexpr uint8_t attestedCredentialDataIncludedFlag = 0b0100;
+// https://github.com/w3c/webauthn/pull/1695
+constexpr uint8_t backupEligibilityFlag = 0b1000;
+constexpr uint8_t backupStateFlag = 0b0001;
 
 } // namespace WebAuthn


Modified: trunk/Source/WebKit/ChangeLog (294121 => 294122)

--- trunk/Source/WebKit/ChangeLog	2022-05-12 21:30:42 UTC (rev 294121)
+++ trunk/Source/WebKit/ChangeLog	2022-05-12 21:51:58 UTC (rev 294122)
@@ -1,3 +1,24 @@
+2022-05-12  J Pascoe  
+
+[WebAuthn] Include backup state in authenticatorData
+https://bugs.webkit.org/show_bug.cgi?id=240353
+rdar://problem/93191958
+
+Reviewed by Brent Fulgham.
+
+This patch adds support for backup state flags, which will be added to
+the Web Authentication spec soon via https://github.com/w3c/webauthn/pull/1695
+
+These flags are set whenever a credential is "backup eligible" and "backed up"
+hinting to RPs that the credential is "durable" and may persist through device
+restores. This is useful for RPs that may choose to offer to remove the user
+password if a credental is in this state.
+
+* UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:
+(WebKit::LocalAuthenticatorInternal::authDataFlags):
+(WebKit::LocalAuthenticator::continueMakeCredentialAfterUserVerification):
+(WebKit::LocalAuthenticator::continueGetAssertionAfterUserVerification):
+
 2022-05-12  Tim Horton  
 
 Don't install WebKit feature flags plist on macOS


Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm (294121 => 294122)

--- trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm	2022-05-12 21:30:42 UTC (rev 294121)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm	2022-05-12 21:51:58 UTC (rev 294122)
@@ -75,11 +75,6 @@
 
 namespace LocalAuthenticatorInternal {
 
-// See https://www.w3.org/TR/webauthn/#flags.
-const uint8_t makeCredentialFlags = userPresenceFlag | userVerifiedFlag | attestedCredentialDataIncludedFlag; // UP, UV and AT are set.
-const uint8_t otherMakeCredentialFlags = userPresenceFlag | attestedCredentialDataIncludedFlag; // UP and AT are set.
-const uint8_t getAssertionFlags = userPresenceFlag | userVerifiedFlag; // UP and UV are set.
-const uint8_t otherGetAssertionFlags = userPresenceFlag; // UP is set.
 // Credential ID is currently SHA-1 of the corresponding 

[webkit-changes] [294121] trunk

2022-05-12 Thread jfernandez
Title: [294121] trunk








Revision 294121
Author jfernan...@igalia.com
Date 2022-05-12 14:30:42 -0700 (Thu, 12 May 2022)


Log Message
Add GitHub account to contributors.json and update expertise field
https://bugs.webkit.org/show_bug.cgi?id=240360

Unreviewed.


* metadata/contributors.json:

Modified Paths

trunk/ChangeLog
trunk/metadata/contributors.json




Diff

Modified: trunk/ChangeLog (294120 => 294121)

--- trunk/ChangeLog	2022-05-12 21:14:06 UTC (rev 294120)
+++ trunk/ChangeLog	2022-05-12 21:30:42 UTC (rev 294121)
@@ -1,3 +1,12 @@
+2022-05-12  Javier Fernandez  
+
+Add GitHub account to contributors.json and update expertise field
+https://bugs.webkit.org/show_bug.cgi?id=240360
+
+Unreviewed.
+
+* metadata/contributors.json:
+
 2022-05-11  Yury Semikhatsky  
 
 [WinCairo] Support file downloads


Modified: trunk/metadata/contributors.json (294120 => 294121)

--- trunk/metadata/contributors.json	2022-05-12 21:14:06 UTC (rev 294120)
+++ trunk/metadata/contributors.json	2022-05-12 21:30:42 UTC (rev 294121)
@@ -3296,6 +3296,8 @@
   "emails" : [
  "jfernan...@igalia.com"
   ],
+  "expertise" : "Layout, CSS",
+  "github" : "javifernandez",
   "name" : "Javier Fernandez",
   "nicks" : [
  "lajava"






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294120] tags/WebKit-7614.1.12.3/

2022-05-12 Thread alancoon
Title: [294120] tags/WebKit-7614.1.12.3/








Revision 294120
Author alanc...@apple.com
Date 2022-05-12 14:14:06 -0700 (Thu, 12 May 2022)


Log Message
Tag WebKit-7614.1.12.3.

Added Paths

tags/WebKit-7614.1.12.3/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294119] branches/safari-7614.1.13-branch/Source

2022-05-12 Thread alancoon
Title: [294119] branches/safari-7614.1.13-branch/Source








Revision 294119
Author alanc...@apple.com
Date 2022-05-12 14:06:56 -0700 (Thu, 12 May 2022)


Log Message
Versioning.

WebKit-7614.1.13.5

Modified Paths

branches/safari-7614.1.13-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/WebCore/PAL/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/WebGPU/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/WebKit/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig




Diff

Modified: branches/safari-7614.1.13-branch/Source/_javascript_Core/Configurations/Version.xcconfig (294118 => 294119)

--- branches/safari-7614.1.13-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2022-05-12 20:58:18 UTC (rev 294118)
+++ branches/safari-7614.1.13-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2022-05-12 21:06:56 UTC (rev 294119)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 614;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 4;
+MICRO_VERSION = 5;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-7614.1.13-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig (294118 => 294119)

--- branches/safari-7614.1.13-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig	2022-05-12 20:58:18 UTC (rev 294118)
+++ branches/safari-7614.1.13-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig	2022-05-12 21:06:56 UTC (rev 294119)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 614;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 4;
+MICRO_VERSION = 5;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-7614.1.13-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (294118 => 294119)

--- branches/safari-7614.1.13-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2022-05-12 20:58:18 UTC (rev 294118)
+++ branches/safari-7614.1.13-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2022-05-12 21:06:56 UTC (rev 294119)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 614;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 4;
+MICRO_VERSION = 5;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-7614.1.13-branch/Source/WebCore/Configurations/Version.xcconfig (294118 => 294119)

--- branches/safari-7614.1.13-branch/Source/WebCore/Configurations/Version.xcconfig	2022-05-12 20:58:18 UTC (rev 294118)
+++ branches/safari-7614.1.13-branch/Source/WebCore/Configurations/Version.xcconfig	2022-05-12 21:06:56 UTC (rev 294119)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 614;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 4;
+MICRO_VERSION = 5;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-7614.1.13-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (294118 => 294119)

--- branches/safari-7614.1.13-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2022-05-12 20:58:18 UTC (rev 294118)
+++ branches/safari-7614.1.13-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2022-05-12 21:06:56 UTC (rev 294119)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 614;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 4;
+MICRO_VERSION = 5;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-7614.1.13-branch/Source/WebGPU/Configurations/Version.xcconfig (294118 => 294119)

--- branches/safari-7614.1.13-branch/Source/WebGPU/Configurations/Version.xcconfig	2022-05-12 20:58:18 UTC (rev 294118)
+++ branches/safari-7614.1.13-branch/Source/WebGPU/Configurations/Version.xcconfig	2022-05-12 21:06:56 UTC (rev 294119)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 614;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 4;
+MICRO_VERSION = 5;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-7614.1.13-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (294118 => 294119)

--- branches/safari-7614.1.13-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2022-05-12 20:58:18 UTC (rev 294118)
+++ branches/safari-7614.1.13-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2022-05-12 21:06:56 UTC (rev 294119)
@@ -1,7 +1,7 @@
 MAJOR_VERSION = 614;
 

[webkit-changes] [294118] trunk/Source/WebCore

2022-05-12 Thread bfulgham
Title: [294118] trunk/Source/WebCore








Revision 294118
Author bfulg...@apple.com
Date 2022-05-12 13:58:18 -0700 (Thu, 12 May 2022)


Log Message
REGRESSION (r281791): [iOS] WKWebView cannot load local .log file
https://bugs.webkit.org/show_bug.cgi?id=239591


Reviewed by Geoffrey Garen.

The refactoring in Bug 229414 did not retain the old behavior on iOS where local
files (which do not get a MIME type assigned by CFNetwork) passed through the
same 'preferredMIMETypeForFileExtensionFromUTType' logic we use on macOS.

* platform/network/ios/WebCoreURLResponseIOS.mm:
(WebCore::adjustMIMETypeIfNecessary):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (294117 => 294118)

--- trunk/Source/WebCore/ChangeLog	2022-05-12 20:15:42 UTC (rev 294117)
+++ trunk/Source/WebCore/ChangeLog	2022-05-12 20:58:18 UTC (rev 294118)
@@ -1,3 +1,18 @@
+2022-05-12  Brent Fulgham  
+
+REGRESSION (r281791): [iOS] WKWebView cannot load local .log file
+https://bugs.webkit.org/show_bug.cgi?id=239591
+
+
+Reviewed by Geoffrey Garen.
+
+The refactoring in Bug 229414 did not retain the old behavior on iOS where local
+files (which do not get a MIME type assigned by CFNetwork) passed through the
+same 'preferredMIMETypeForFileExtensionFromUTType' logic we use on macOS.
+
+* platform/network/ios/WebCoreURLResponseIOS.mm:
+(WebCore::adjustMIMETypeIfNecessary):
+
 2022-05-12  Alex Christensen  
 
 Make if-domain and unless-domain regexes only look at URL hosts


Modified: trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm (294117 => 294118)

--- trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm	2022-05-12 20:15:42 UTC (rev 294117)
+++ trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm	2022-05-12 20:58:18 UTC (rev 294118)
@@ -49,8 +49,6 @@
 return;
 }
 }
-CFURLResponseSetMIMEType(response, CFSTR("application/octet-stream"));
-return;
 }
 
 #if !USE(QUICK_LOOK)
@@ -67,8 +65,11 @@
 updatedType = preferredMIMETypeForFileExtensionFromUTType(extension.get());
 if (updatedType && (!type || CFStringCompare(type, updatedType.get(), kCFCompareCaseInsensitive) != kCFCompareEqualTo))
 CFURLResponseSetMIMEType(response, updatedType.get());
+return;
 }
 #endif // USE(QUICK_LOOK)
+if (!type)
+CFURLResponseSetMIMEType(response, CFSTR("application/octet-stream"));
 }
 
 } // namespace WebCore






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294117] trunk

2022-05-12 Thread commit-queue
Title: [294117] trunk








Revision 294117
Author commit-qu...@webkit.org
Date 2022-05-12 13:15:42 -0700 (Thu, 12 May 2022)


Log Message
Make if-domain and unless-domain regexes only look at URL hosts
https://bugs.webkit.org/show_bug.cgi?id=240199

Patch by Alex Christensen  on 2022-05-12
Reviewed by John Wilander.

Source/WebCore:

In bug 234126 I moved how if-domain and unless-domain are done by translating them into a regex.
I overlooked that a domain can be in the path.  If we get to '/' then we are at the end of the host.
Covered by an API test.

* contentextensions/ContentExtensionParser.cpp:
(WebCore::ContentExtensions::getDomainList):

Tools:

* TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
(TestWebKitAPI::TEST_F):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (294116 => 294117)

--- trunk/Source/WebCore/ChangeLog	2022-05-12 20:08:08 UTC (rev 294116)
+++ trunk/Source/WebCore/ChangeLog	2022-05-12 20:15:42 UTC (rev 294117)
@@ -1,3 +1,17 @@
+2022-05-12  Alex Christensen  
+
+Make if-domain and unless-domain regexes only look at URL hosts
+https://bugs.webkit.org/show_bug.cgi?id=240199
+
+Reviewed by John Wilander.
+
+In bug 234126 I moved how if-domain and unless-domain are done by translating them into a regex.
+I overlooked that a domain can be in the path.  If we get to '/' then we are at the end of the host.
+Covered by an API test.
+
+* contentextensions/ContentExtensionParser.cpp:
+(WebCore::ContentExtensions::getDomainList):
+
 2022-05-11  Kate Cheney  
 
 Mail compose: right clicking an image attachment selects it


Modified: trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp (294116 => 294117)

--- trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp	2022-05-12 20:08:08 UTC (rev 294116)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp	2022-05-12 20:15:42 UTC (rev 294117)
@@ -97,7 +97,7 @@
 domain = makeStringByReplacingAll(domain, pair.first, pair.second);
 
 const char* protocolRegex = "[a-z][a-z+.-]*:\\/\\/";
-const char* allowSubdomainsRegex = "(.*\\.)*";
+const char* allowSubdomainsRegex = "([^/]*\\.)*";
 regexes.uncheckedAppend(makeString(protocolRegex, allowSubdomains ? allowSubdomainsRegex : "", domain, "[:/]"));
 }
 return regexes;


Modified: trunk/Tools/ChangeLog (294116 => 294117)

--- trunk/Tools/ChangeLog	2022-05-12 20:08:08 UTC (rev 294116)
+++ trunk/Tools/ChangeLog	2022-05-12 20:15:42 UTC (rev 294117)
@@ -1,3 +1,13 @@
+2022-05-12  Alex Christensen  
+
+Make if-domain and unless-domain regexes only look at URL hosts
+https://bugs.webkit.org/show_bug.cgi?id=240199
+
+Reviewed by John Wilander.
+
+* TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+(TestWebKitAPI::TEST_F):
+
 2022-05-11  Kate Cheney  
 
 Mail compose: right clicking an image attachment selects it


Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (294116 => 294117)

--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp	2022-05-12 20:08:08 UTC (rev 294116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp	2022-05-12 20:15:42 UTC (rev 294117)
@@ -648,7 +648,8 @@
 testRequest(ifDomainStarBackend, mainDocumentRequest("http://webkit.organization/test.htm"_s), { });
 testRequest(ifDomainStarBackend, mainDocumentRequest("http://not_webkit.org/test.html"_s), { });
 testRequest(ifDomainStarBackend, mainDocumentRequest("http://webkit.organization/test.html"_s), { });
-
+testRequest(ifDomainStarBackend, mainDocumentRequest("http://example.com/.webkit.org/in/path/test.html"_s), { });
+
 auto unlessDomainStarBackend = makeBackend("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"test.html\", \"unless-domain\":[\"*webkit.org\"]}}]"_s);
 testRequest(unlessDomainStarBackend, mainDocumentRequest("http://webkit.org/test.htm"_s), { });
 testRequest(unlessDomainStarBackend, mainDocumentRequest("http://bugs.webkit.org/test.htm"_s), { });






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294116] trunk/Tools/CISupport/build-webkit-org/steps.py

2022-05-12 Thread aakash_jain
Title: [294116] trunk/Tools/CISupport/build-webkit-org/steps.py








Revision 294116
Author aakash_j...@apple.com
Date 2022-05-12 13:08:08 -0700 (Thu, 12 May 2022)


Log Message
[build.webkit.org] Upload minified archives while building custom revision
https://bugs.webkit.org/show_bug.cgi?id=240354

Reviewed by Ryan Haddad.

* Tools/CISupport/build-webkit-org/steps.py:
(CompileWebKit.evaluateCommand):
(TransferToS3.__init__):
(TransferToS3.finished):

Canonical link: https://commits.webkit.org/250497@main

Modified Paths

trunk/Tools/CISupport/build-webkit-org/steps.py




Diff

Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (294115 => 294116)

--- trunk/Tools/CISupport/build-webkit-org/steps.py	2022-05-12 20:03:18 UTC (rev 294115)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py	2022-05-12 20:08:08 UTC (rev 294116)
@@ -347,7 +347,13 @@
 log = yield self.addLog(logName)
 log.addStdout(message)
 
+def evaluateCommand(self, cmd):
+rc = shell.ShellCommand.evaluateCommand(self, cmd)
+if rc in (SUCCESS, WARNINGS) and self.getProperty('user_provided_git_hash'):
+self.build.addStepsAfterCurrentStep([ArchiveMinifiedBuiltProduct(), UploadMinifiedBuiltProduct(), TransferToS3(terminate_build=True)])
+return rc
 
+
 class CompileLLINTCLoop(CompileWebKit):
 command = ["perl", "Tools/Scripts/build-jsc", "--cloop", WithProperties("--%(configuration)s")]
 
@@ -1174,9 +1180,10 @@
 command = ["python3", "../Shared/transfer-archive-to-s3", "--revision", revision, "--identifier", identifier, "--archive", archive]
 haltOnFailure = True
 
-def __init__(self, **kwargs):
+def __init__(self, terminate_build=False, **kwargs):
 kwargs['command'] = self.command
 kwargs['logEnviron'] = False
+self.terminate_build = terminate_build
 master.MasterShellCommand.__init__(self, **kwargs)
 
 def start(self):
@@ -1183,7 +1190,10 @@
 return master.MasterShellCommand.start(self)
 
 def finished(self, result):
-return master.MasterShellCommand.finished(self, result)
+rc = master.MasterShellCommand.finished(self, result)
+if self.terminate_build and self.getProperty('user_provided_git_hash'):
+self.build.buildFinished([f"Uploaded archive with hash {self.getProperty('user_provided_git_hash', '')[:8]}"], SUCCESS)
+return rc
 
 def doStepIf(self, step):
 return CURRENT_HOSTNAME == BUILD_WEBKIT_HOSTNAME






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294115] trunk/Tools/CISupport/build-webkit-org

2022-05-12 Thread aakash_jain
Title: [294115] trunk/Tools/CISupport/build-webkit-org








Revision 294115
Author aakash_j...@apple.com
Date 2022-05-12 13:03:18 -0700 (Thu, 12 May 2022)


Log Message
[build.webkit.org] Upload steps should be properly named
https://bugs.webkit.org/show_bug.cgi?id=240351

Reviewed by Ryan Haddad.

* Tools/CISupport/build-webkit-org/factories_unittest.py:
(TestExpectedBuildSteps):
* Tools/CISupport/build-webkit-org/steps.py:
(ArchiveMinifiedBuiltProduct):
(UploadBuiltProduct):
(UploadMinifiedBuiltProduct):

Canonical link: https://commits.webkit.org/250496@main

Modified Paths

trunk/Tools/CISupport/build-webkit-org/factories_unittest.py
trunk/Tools/CISupport/build-webkit-org/steps.py




Diff

Modified: trunk/Tools/CISupport/build-webkit-org/factories_unittest.py (294114 => 294115)

--- trunk/Tools/CISupport/build-webkit-org/factories_unittest.py	2022-05-12 18:51:32 UTC (rev 294114)
+++ trunk/Tools/CISupport/build-webkit-org/factories_unittest.py	2022-05-12 20:03:18 UTC (rev 294115)
@@ -39,9 +39,9 @@
 'delete-stale-build-files',
 'compile-webkit',
 'archive-built-product',
-'upload',
-'archive-built-product',
-'upload',
+'upload-built-product',
+'archive-minified-built-product',
+'upload-minified-built-product',
 'transfer-to-s3',
 'trigger'
 ],
@@ -186,9 +186,9 @@
 'delete-stale-build-files',
 'compile-webkit',
 'archive-built-product',
-'upload',
-'archive-built-product',
-'upload',
+'upload-built-product',
+'archive-minified-built-product',
+'upload-minified-built-product',
 'transfer-to-s3',
 'trigger'
 ],
@@ -346,9 +346,9 @@
 'delete-stale-build-files',
 'compile-webkit',
 'archive-built-product',
-'upload',
-'archive-built-product',
-'upload',
+'upload-built-product',
+'archive-minified-built-product',
+'upload-minified-built-product',
 'transfer-to-s3',
 'trigger'
 ],
@@ -531,9 +531,9 @@
 'delete-stale-build-files',
 'compile-webkit',
 'archive-built-product',
-'upload',
-'archive-built-product',
-'upload',
+'upload-built-product',
+'archive-minified-built-product',
+'upload-minified-built-product',
 'transfer-to-s3',
 'trigger'
 ],
@@ -713,9 +713,9 @@
 'delete-stale-build-files',
 'compile-webkit',
 'archive-built-product',
-'upload',
-'archive-built-product',
-'upload',
+'upload-built-product',
+'archive-minified-built-product',
+'upload-minified-built-product',
 'transfer-to-s3',
 'trigger'
 ],
@@ -730,9 +730,9 @@
 'delete-stale-build-files',
 'compile-webkit',
 'archive-built-product',
-'upload',
-'archive-built-product',
-'upload',
+'upload-built-product',
+'archive-minified-built-product',
+'upload-minified-built-product',
 'transfer-to-s3',
 'trigger'
 ],
@@ -942,7 +942,7 @@
 'compile',
 'compile-webkit',
 'archive-built-product',
-'upload',
+'upload-built-product',
 'transfer-to-s3',
 'trigger'
 ],
@@ -958,7 +958,7 @@
 'compile',
 'compile-webkit',
 'archive-built-product',
-'upload',
+'upload-built-product',
 'transfer-to-s3',
 'trigger'
 ],
@@ -1024,7 +1024,7 @@
 'generate-jsc-bundle',
 'install-built-product',
 'archive-built-product',
-'upload',
+'upload-built-product',
 'transfer-to-s3',
 'trigger'
 ],
@@ -1106,7 +1106,7 @@
 'compile-webkit',
 'install-built-product',
 'archive-built-product',
-'upload',
+'upload-built-product',
 'transfer-to-s3',
 'trigger'
 ],
@@ -1305,7 +1305,7 @@
 'delete-stale-build-files',
 'compile-webkit',
 'archive-built-product',
-'upload',
+'upload-built-product',
 'transfer-to-s3',
 'trigger'
 ],
@@ -1356,7 +1356,7 @@
 'delete-stale-build-files',
 'compile-webkit',
 'archive-built-product',
-'upload',
+'upload-built-product',
 'transfer-to-s3',
 'trigger'
 ],
@@ -1474,7 +1474,7 @@

[webkit-changes] [294114] trunk/Source/WebKit

2022-05-12 Thread timothy_horton
Title: [294114] trunk/Source/WebKit








Revision 294114
Author timothy_hor...@apple.com
Date 2022-05-12 11:51:32 -0700 (Thu, 12 May 2022)


Log Message
Don't install WebKit feature flags plist on macOS
https://bugs.webkit.org/show_bug.cgi?id=240350


Reviewed by Wenson Hsieh.

* WebKit.xcodeproj/project.pbxproj:
We don't need it on macOS (and won't need it at all soon), and
the script is currently installing to the wrong place for some kinds
of macOS builds. So, just skip it.

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/WebKit/ChangeLog (294113 => 294114)

--- trunk/Source/WebKit/ChangeLog	2022-05-12 18:22:57 UTC (rev 294113)
+++ trunk/Source/WebKit/ChangeLog	2022-05-12 18:51:32 UTC (rev 294114)
@@ -1,3 +1,16 @@
+2022-05-12  Tim Horton  
+
+Don't install WebKit feature flags plist on macOS
+https://bugs.webkit.org/show_bug.cgi?id=240350
+
+
+Reviewed by Wenson Hsieh.
+
+* WebKit.xcodeproj/project.pbxproj:
+We don't need it on macOS (and won't need it at all soon), and
+the script is currently installing to the wrong place for some kinds
+of macOS builds. So, just skip it.
+
 2022-05-12  Yury Semikhatsky  
 
 [GTK][WPE] Do not return pointer to disposed timezone string


Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (294113 => 294114)

--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-05-12 18:22:57 UTC (rev 294113)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-05-12 18:51:32 UTC (rev 294114)
@@ -16147,7 +16147,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
-			shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == maccatalyst || \"${WK_PLATFORM_NAME}\" == iosmac ]]; then\nexit 0\nfi\n\nFEATURE_FLAGS_PLIST_SOURCE=\"${SRCROOT}/FeatureFlags/WebKit.plist\"\nFEATURE_FLAGS_PLIST_DESTINATION=\"${DSTROOT}/System/Library/FeatureFlags/Domain/WebKit.plist\"\necho \"copying feature flags plist\"\nmkdir -p \"$(dirname \"${FEATURE_FLAGS_PLIST_DESTINATION}\")\"\necho plutil -convert binary1 -o \"${FEATURE_FLAGS_PLIST_DESTINATION}\" \"${FEATURE_FLAGS_PLIST_SOURCE}\"\nplutil -convert binary1 -o \"${FEATURE_FLAGS_PLIST_DESTINATION}\" \"${FEATURE_FLAGS_PLIST_SOURCE}\"\n";
+			shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == maccatalyst || \"${WK_PLATFORM_NAME}\" == iosmac || \"${WK_PLATFORM_NAME}\" == macosx ]]; then\nexit 0\nfi\n\nFEATURE_FLAGS_PLIST_SOURCE=\"${SRCROOT}/FeatureFlags/WebKit.plist\"\nFEATURE_FLAGS_PLIST_DESTINATION=\"${DSTROOT}/System/Library/FeatureFlags/Domain/WebKit.plist\"\necho \"copying feature flags plist\"\nmkdir -p \"$(dirname \"${FEATURE_FLAGS_PLIST_DESTINATION}\")\"\necho plutil -convert binary1 -o \"${FEATURE_FLAGS_PLIST_DESTINATION}\" \"${FEATURE_FLAGS_PLIST_SOURCE}\"\nplutil -convert binary1 -o \"${FEATURE_FLAGS_PLIST_DESTINATION}\" \"${FEATURE_FLAGS_PLIST_SOURCE}\"\n";
 		};
 		2E16B6F42019BC25008996D6 /* Copy Additional Resources */ = {
 			isa = PBXShellScriptBuildPhase;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294113] trunk

2022-05-12 Thread katherine_cheney
Title: [294113] trunk








Revision 294113
Author katherine_che...@apple.com
Date 2022-05-12 11:22:57 -0700 (Thu, 12 May 2022)


Log Message
Mail compose: right clicking an image attachment selects it
https://bugs.webkit.org/show_bug.cgi?id=240315
rdar://45454933

Reviewed by Wenson Hsieh.

* wtf/cocoa/RuntimeApplicationChecksCocoa.h:
Mail compose: right clicking an image attachment selects it
https://bugs.webkit.org/show_bug.cgi?id=240315
rdar://45454933

Reviewed by Wenson Hsieh.

If the page is editable, don't select if the element is an image.

* page/EventHandler.cpp:
(WebCore::EventHandler::sendContextMenuEvent):
Mail compose: right clicking an image attachment selects it
https://bugs.webkit.org/show_bug.cgi?id=240315
rdar://45454933

Reviewed by Wenson Hsieh.

API test coverage.

* TestWebKitAPI/Tests/mac/ContextMenuTests.mm:
(TestWebKitAPI::rightClick):
(TestWebKitAPI::TEST):

Canonical link: https://commits.webkit.org/250494@main

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/EventHandler.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuTests.mm




Diff

Modified: trunk/Source/WTF/ChangeLog (294112 => 294113)

--- trunk/Source/WTF/ChangeLog	2022-05-12 18:14:51 UTC (rev 294112)
+++ trunk/Source/WTF/ChangeLog	2022-05-12 18:22:57 UTC (rev 294113)
@@ -1,3 +1,13 @@
+2022-05-11  Kate Cheney  
+
+Mail compose: right clicking an image attachment selects it
+https://bugs.webkit.org/show_bug.cgi?id=240315
+rdar://45454933
+
+Reviewed by Wenson Hsieh.
+
+* wtf/cocoa/RuntimeApplicationChecksCocoa.h:
+
 2022-05-10  Brent Fulgham  
 
 Remove abandoned CSSDeferredParser implementation and feature flag


Modified: trunk/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h (294112 => 294113)

--- trunk/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h	2022-05-12 18:14:51 UTC (rev 294112)
+++ trunk/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h	2022-05-12 18:22:57 UTC (rev 294113)
@@ -72,6 +72,7 @@
 NullOriginForNonSpecialSchemedURLs,
 ObservesClassProperty,
 PictureInPictureMediaPlayback,
+PreventImageSelectionOnContextualMenuClickInEditablePage,
 ProcessSwapOnCrossSiteNavigation,
 RequiresUserGestureToLoadVideo,
 RestrictsBaseURLSchemes,


Modified: trunk/Source/WebCore/ChangeLog (294112 => 294113)

--- trunk/Source/WebCore/ChangeLog	2022-05-12 18:14:51 UTC (rev 294112)
+++ trunk/Source/WebCore/ChangeLog	2022-05-12 18:22:57 UTC (rev 294113)
@@ -1,3 +1,16 @@
+2022-05-11  Kate Cheney  
+
+Mail compose: right clicking an image attachment selects it
+https://bugs.webkit.org/show_bug.cgi?id=240315
+rdar://45454933
+
+Reviewed by Wenson Hsieh.
+
+If the page is editable, don't select if the element is an image.
+
+* page/EventHandler.cpp:
+(WebCore::EventHandler::sendContextMenuEvent):
+
 2022-05-12  Eric Carlson  
 
 [macOS] Remove support for deprecated ScreenCaptureKit API


Modified: trunk/Source/WebCore/page/EventHandler.cpp (294112 => 294113)

--- trunk/Source/WebCore/page/EventHandler.cpp	2022-05-12 18:14:51 UTC (rev 294112)
+++ trunk/Source/WebCore/page/EventHandler.cpp	2022-05-12 18:22:57 UTC (rev 294113)
@@ -127,6 +127,10 @@
 #include 
 #include 
 
+#if PLATFORM(COCOA)
+#include 
+#endif
+
 #if ENABLE(IOS_TOUCH_EVENTS)
 #include "PlatformTouchEventIOS.h"
 #endif
@@ -3277,8 +3281,17 @@
 if (mouseEvent.scrollbar() || view->scrollbarAtPoint(event.position()))
 return false;
 
+bool allowSelection = true;
+#if PLATFORM(COCOA)
+if (linkedOnOrAfterSDKWithBehavior(SDKAlignedBehavior::PreventImageSelectionOnContextualMenuClickInEditablePage)) {
+auto* page = m_frame.page();
+allowSelection = page && (!page->isEditable() || !is(mouseEvent.hitTestResult().targetElement()));
+}
+#endif
+
 if (m_frame.editor().behavior().shouldSelectOnContextualMenuClick()
-&& !m_frame.selection().contains(viewportPos)) {
+&& !m_frame.selection().contains(viewportPos)
+&& allowSelection) {
 m_mouseDownMayStartSelect = true; // context menu events are always allowed to perform a selection
 selectClosestContextualWordOrLinkFromHitTestResult(mouseEvent.hitTestResult(), shouldAppendTrailingWhitespace(mouseEvent, m_frame));
 }


Modified: trunk/Tools/ChangeLog (294112 => 294113)

--- trunk/Tools/ChangeLog	2022-05-12 18:14:51 UTC (rev 294112)
+++ trunk/Tools/ChangeLog	2022-05-12 18:22:57 UTC (rev 294113)
@@ -1,3 +1,17 @@
+2022-05-11  Kate Cheney  
+
+Mail compose: right clicking an image attachment selects it
+https://bugs.webkit.org/show_bug.cgi?id=240315
+rdar://45454933
+
+Reviewed by Wenson Hsieh.
+
+API test coverage.
+
+* TestWebKitAPI/Tests/mac/ContextMenuTests.mm:
+(TestWebKitAPI::rightClick):
+

[webkit-changes] [294112] tags/WebKit-7614.1.13.4/

2022-05-12 Thread repstein
Title: [294112] tags/WebKit-7614.1.13.4/








Revision 294112
Author repst...@apple.com
Date 2022-05-12 11:14:51 -0700 (Thu, 12 May 2022)


Log Message
Tag WebKit-7614.1.13.4.

Added Paths

tags/WebKit-7614.1.13.4/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294111] branches/safari-7614.1.13-branch/Source/WebKit

2022-05-12 Thread repstein
Title: [294111] branches/safari-7614.1.13-branch/Source/WebKit








Revision 294111
Author repst...@apple.com
Date 2022-05-12 11:05:21 -0700 (Thu, 12 May 2022)


Log Message
Apply patch. rdar://problem/92617943

Modified Paths

branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog
branches/safari-7614.1.13-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj




Diff

Modified: branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog (294110 => 294111)

--- branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog	2022-05-12 17:55:20 UTC (rev 294110)
+++ branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog	2022-05-12 18:05:21 UTC (rev 294111)
@@ -1,3 +1,19 @@
+2022-05-12  Alan Coon  
+
+Apply patch. rdar://problem/92617943
+
+2022-05-12  Tim Horton  
+
+Don't install WebKit feature flags plist on macOS
+https://bugs.webkit.org/show_bug.cgi?id=240350
+
+
+* WebKit.xcodeproj/project.pbxproj:
+We don't need it on macOS (and won't need it at all soon), and
+the script is currently installing to the wrong place for some kinds
+of macOS builds. So, just skip it.
+
+
 2022-05-12  Russell Epstein  
 
 Cherry-pick r294072. rdar://problem/93058432


Modified: branches/safari-7614.1.13-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (294110 => 294111)

--- branches/safari-7614.1.13-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-05-12 17:55:20 UTC (rev 294110)
+++ branches/safari-7614.1.13-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-05-12 18:05:21 UTC (rev 294111)
@@ -16120,7 +16120,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
-			shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == maccatalyst || \"${WK_PLATFORM_NAME}\" == iosmac ]]; then\nexit 0\nfi\n\nFEATURE_FLAGS_PLIST_SOURCE=\"${SRCROOT}/FeatureFlags/WebKit.plist\"\nFEATURE_FLAGS_PLIST_DESTINATION=\"${DSTROOT}/System/Library/FeatureFlags/Domain/WebKit.plist\"\necho \"copying feature flags plist\"\nmkdir -p \"$(dirname \"${FEATURE_FLAGS_PLIST_DESTINATION}\")\"\necho plutil -convert binary1 -o \"${FEATURE_FLAGS_PLIST_DESTINATION}\" \"${FEATURE_FLAGS_PLIST_SOURCE}\"\nplutil -convert binary1 -o \"${FEATURE_FLAGS_PLIST_DESTINATION}\" \"${FEATURE_FLAGS_PLIST_SOURCE}\"\n";
+			shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == maccatalyst || \"${WK_PLATFORM_NAME}\" == iosmac || \"${WK_PLATFORM_NAME}\" == macosx ]]; then\nexit 0\nfi\n\nFEATURE_FLAGS_PLIST_SOURCE=\"${SRCROOT}/FeatureFlags/WebKit.plist\"\nFEATURE_FLAGS_PLIST_DESTINATION=\"${DSTROOT}/System/Library/FeatureFlags/Domain/WebKit.plist\"\necho \"copying feature flags plist\"\nmkdir -p \"$(dirname \"${FEATURE_FLAGS_PLIST_DESTINATION}\")\"\necho plutil -convert binary1 -o \"${FEATURE_FLAGS_PLIST_DESTINATION}\" \"${FEATURE_FLAGS_PLIST_SOURCE}\"\nplutil -convert binary1 -o \"${FEATURE_FLAGS_PLIST_DESTINATION}\" \"${FEATURE_FLAGS_PLIST_SOURCE}\"\n";
 		};
 		2E16B6F42019BC25008996D6 /* Copy Additional Resources */ = {
 			isa = PBXShellScriptBuildPhase;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294110] trunk/LayoutTests

2022-05-12 Thread rackler
Title: [294110] trunk/LayoutTests








Revision 294110
Author rack...@apple.com
Date 2022-05-12 10:55:20 -0700 (Thu, 12 May 2022)


Log Message
[ iOS ] imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-videoDetectorTest.html is a consistent failure
https://bugs.webkit.org/show_bug.cgi?id=240348

Unreviewed test gardening.

* LayoutTests/platform/ios/TestExpectations:

Canonical link: https://commits.webkit.org/250493@main

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/ios/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (294109 => 294110)

--- trunk/LayoutTests/ChangeLog	2022-05-12 17:43:34 UTC (rev 294109)
+++ trunk/LayoutTests/ChangeLog	2022-05-12 17:55:20 UTC (rev 294110)
@@ -1,3 +1,12 @@
+2022-05-12  Karl Rackler  
+
+[ iOS ] imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-videoDetectorTest.html is a consistent failure
+https://bugs.webkit.org/show_bug.cgi?id=240348
+
+Unreviewed test gardening. 
+
+* platform/ios/TestExpectations:
+
 2022-05-12  Youenn Fablet  
 
 Add a better mock for audio units used by CoreAudioSharedUnit


Modified: trunk/LayoutTests/platform/ios/TestExpectations (294109 => 294110)

--- trunk/LayoutTests/platform/ios/TestExpectations	2022-05-12 17:43:34 UTC (rev 294109)
+++ trunk/LayoutTests/platform/ios/TestExpectations	2022-05-12 17:55:20 UTC (rev 294110)
@@ -3611,3 +3611,5 @@
 
 webkit.org/b/240167 [ Release ] fast/css-custom-paint/animate-repaint.html [ Pass Failure ]
 
+webkit.org/b/240348 imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-videoDetectorTest.html [ Slow ]
+






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294109] trunk/Source/WebKit

2022-05-12 Thread yurys
Title: [294109] trunk/Source/WebKit








Revision 294109
Author yu...@chromium.org
Date 2022-05-12 10:43:34 -0700 (Thu, 12 May 2022)


Log Message
[GTK][WPE] Do not return pointer to disposed timezone string
https://bugs.webkit.org/show_bug.cgi?id=240327

Reviewed by Michael Catanzaro.

Store time zone name in CString to avoid returning pointer to a temp string which was
disposed before returning from webkit_web_context_get_time_zone_override.

No new tests. Covered by existing unit tests.

* UIProcess/API/glib/WebKitWebContext.cpp:
(webkitWebContextSetProperty):
(webkitWebContextConstructed):
(webkit_web_context_get_time_zone_override):
(webkit_web_context_set_time_zone_override): Deleted this function as the time zone can
only be overridden during context construction.
* UIProcess/API/gtk/WebKitWebContext.h:
* UIProcess/API/wpe/WebKitWebContext.h:

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebContext.h
trunk/Source/WebKit/UIProcess/API/wpe/WebKitWebContext.h




Diff

Modified: trunk/Source/WebKit/ChangeLog (294108 => 294109)

--- trunk/Source/WebKit/ChangeLog	2022-05-12 17:43:27 UTC (rev 294108)
+++ trunk/Source/WebKit/ChangeLog	2022-05-12 17:43:34 UTC (rev 294109)
@@ -1,3 +1,24 @@
+2022-05-12  Yury Semikhatsky  
+
+[GTK][WPE] Do not return pointer to disposed timezone string
+https://bugs.webkit.org/show_bug.cgi?id=240327
+
+Reviewed by Michael Catanzaro.
+
+Store time zone name in CString to avoid returning pointer to a temp string which was
+disposed before returning from webkit_web_context_get_time_zone_override.
+
+No new tests. Covered by existing unit tests.
+
+* UIProcess/API/glib/WebKitWebContext.cpp:
+(webkitWebContextSetProperty):
+(webkitWebContextConstructed):
+(webkit_web_context_get_time_zone_override):
+(webkit_web_context_set_time_zone_override): Deleted this function as the time zone can
+only be overridden during context construction.
+* UIProcess/API/gtk/WebKitWebContext.h:
+* UIProcess/API/wpe/WebKitWebContext.h:
+
 2022-05-12  Olivier Blin  
 
 REGRESSION(r291038) [GTK][WPE] Fix build without remote inspector


Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp (294108 => 294109)

--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp	2022-05-12 17:43:27 UTC (rev 294108)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp	2022-05-12 17:43:34 UTC (rev 294109)
@@ -248,7 +248,7 @@
 
 WebKitMemoryPressureSettings* memoryPressureSettings;
 
-String timeZoneOverride;
+CString timeZoneOverride;
 };
 
 static guint signals[LAST_SIGNAL] = { 0, };
@@ -393,8 +393,9 @@
 break;
 }
 case PROP_TIME_ZONE_OVERRIDE: {
-if (const auto* override = g_value_get_string(value))
-webkit_web_context_set_time_zone_override(context, override);
+const auto* timeZone = g_value_get_string(value);
+if (isTimeZoneValid(timeZone))
+context->priv->timeZoneOverride = timeZone;
 break;
 }
 default:
@@ -425,7 +426,7 @@
 // Once the settings have been passed to the ProcessPoolConfiguration, we don't need them anymore so we can free them.
 g_clear_pointer(>memoryPressureSettings, webkit_memory_pressure_settings_free);
 }
-configuration.setTimeZoneOverride(priv->timeZoneOverride);
+configuration.setTimeZoneOverride(String::fromUTF8(priv->timeZoneOverride.data(), priv->timeZoneOverride.length()));
 
 if (!priv->websiteDataManager)
 priv->websiteDataManager = adoptGRef(webkit_website_data_manager_new("local-storage-directory", priv->localStorageDirectory.data(), nullptr));
@@ -1871,24 +1872,6 @@
 #endif
 
 /**
- * webkit_web_context_set_time_zone_override:
- * @context: a #WebKitWebContext
- * @time_zone_override: value to set
- *
- * Set the #WebKitWebContext:time-zone-override property. Refer to the IANA database for valid
- * specifiers, https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
- *
- * Since: 2.38
- */
-void webkit_web_context_set_time_zone_override(WebKitWebContext* context, const gchar* timeZoneOverride)
-{
-g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
-g_return_if_fail(isTimeZoneValid(timeZoneOverride));
-
-context->priv->timeZoneOverride = String::fromUTF8(timeZoneOverride);
-}
-
-/**
  * webkit_web_context_get_time_zone_override:
  * @context: a #WebKitWebContext
  *
@@ -1900,7 +1883,7 @@
 {
 g_return_val_if_fail(WEBKIT_IS_WEB_CONTEXT(context), nullptr);
 
-return context->priv->timeZoneOverride.utf8().data();
+return context->priv->timeZoneOverride.data();
 }
 
 void webkitWebContextInitializeNotificationPermissions(WebKitWebContext* context)


Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebContext.h (294108 => 294109)

--- 

[webkit-changes] [294108] trunk/Source/WebCore

2022-05-12 Thread eric . carlson
Title: [294108] trunk/Source/WebCore








Revision 294108
Author eric.carl...@apple.com
Date 2022-05-12 10:43:27 -0700 (Thu, 12 May 2022)


Log Message
[macOS] Remove support for deprecated ScreenCaptureKit API
https://bugs.webkit.org/show_bug.cgi?id=239511


Reviewed by Youenn Fablet.

Source/WebCore:

Tested manually.

* platform/mediastream/mac/ScreenCaptureKitCaptureSource.h:
* platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm:
(-[WebCoreScreenCaptureKitHelper stream:didOutputSampleBuffer:ofType:]):
(WebCore::ScreenCaptureKitCaptureSource::ScreenCaptureKitCaptureSource):
(WebCore::ScreenCaptureKitCaptureSource::stop):
(WebCore::ScreenCaptureKitCaptureSource::streamConfiguration):
(WebCore::ScreenCaptureKitCaptureSource::startContentStream):
(WebCore::ScreenCaptureKitCaptureSource::updateStreamConfiguration):
(WebCore::ScreenCaptureKitCaptureSource::streamDidOutputSampleBuffer):
* platform/mediastream/mac/ScreenCaptureKitSharingSessionManager.mm:
(-[WebDisplayMediaPromptHelper sessionDidEnd:]):
(WebCore::ScreenCaptureKitSharingSessionManager::sessionDidEnd):
(WebCore::ScreenCaptureKitSharingSessionManager::takeSharingSessionForFilter):

Source/WebCore/PAL:

* pal/spi/mac/ScreenCaptureKitSPI.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/PAL/ChangeLog
trunk/Source/WebCore/PAL/pal/spi/mac/ScreenCaptureKitSPI.h
trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.h
trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm
trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitSharingSessionManager.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (294107 => 294108)

--- trunk/Source/WebCore/ChangeLog	2022-05-12 17:39:05 UTC (rev 294107)
+++ trunk/Source/WebCore/ChangeLog	2022-05-12 17:43:27 UTC (rev 294108)
@@ -1,3 +1,27 @@
+2022-05-12  Eric Carlson  
+
+[macOS] Remove support for deprecated ScreenCaptureKit API
+https://bugs.webkit.org/show_bug.cgi?id=239511
+
+
+Reviewed by Youenn Fablet.
+
+Tested manually.
+
+* platform/mediastream/mac/ScreenCaptureKitCaptureSource.h:
+* platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm:
+(-[WebCoreScreenCaptureKitHelper stream:didOutputSampleBuffer:ofType:]):
+(WebCore::ScreenCaptureKitCaptureSource::ScreenCaptureKitCaptureSource):
+(WebCore::ScreenCaptureKitCaptureSource::stop):
+(WebCore::ScreenCaptureKitCaptureSource::streamConfiguration):
+(WebCore::ScreenCaptureKitCaptureSource::startContentStream):
+(WebCore::ScreenCaptureKitCaptureSource::updateStreamConfiguration):
+(WebCore::ScreenCaptureKitCaptureSource::streamDidOutputSampleBuffer):
+* platform/mediastream/mac/ScreenCaptureKitSharingSessionManager.mm:
+(-[WebDisplayMediaPromptHelper sessionDidEnd:]):
+(WebCore::ScreenCaptureKitSharingSessionManager::sessionDidEnd):
+(WebCore::ScreenCaptureKitSharingSessionManager::takeSharingSessionForFilter):
+
 2022-05-12  Loïc Le Page  
 
 [GStreamer][VideoCapture] Add support for capturing encoded video streams from a webcam


Modified: trunk/Source/WebCore/PAL/ChangeLog (294107 => 294108)

--- trunk/Source/WebCore/PAL/ChangeLog	2022-05-12 17:39:05 UTC (rev 294107)
+++ trunk/Source/WebCore/PAL/ChangeLog	2022-05-12 17:43:27 UTC (rev 294108)
@@ -1,3 +1,13 @@
+2022-05-12  Eric Carlson  
+
+[macOS] Remove support for deprecated ScreenCaptureKit API
+https://bugs.webkit.org/show_bug.cgi?id=239511
+
+
+Reviewed by Youenn Fablet.
+
+* pal/spi/mac/ScreenCaptureKitSPI.h:
+
 2022-05-06  Jer Noble  
 
 [Cocoa] Seeking into a xHE-AAC track backed by a SourceBuffer can stall playback


Modified: trunk/Source/WebCore/PAL/pal/spi/mac/ScreenCaptureKitSPI.h (294107 => 294108)

--- trunk/Source/WebCore/PAL/pal/spi/mac/ScreenCaptureKitSPI.h	2022-05-12 17:39:05 UTC (rev 294107)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/ScreenCaptureKitSPI.h	2022-05-12 17:43:27 UTC (rev 294108)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if HAVE(SCREEN_CAPTURE_KIT)
+#if HAVE(SCREEN_CAPTURE_KIT) && HAVE(SC_CONTENT_SHARING_SESSION)
 
 #import 
 


Modified: trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.h (294107 => 294108)

--- trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.h	2022-05-12 17:39:05 UTC (rev 294107)
+++ trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.h	2022-05-12 17:43:27 UTC (rev 294108)
@@ -99,6 +99,10 @@
 
 dispatch_queue_t captureQueue();
 
+#if HAVE(SC_CONTENT_SHARING_SESSION)
+RetainPtr m_contentSharingSession;
+#endif
+
 std::optional m_content;
 RetainPtr m_captureHelper;
 RetainPtr m_currentFrame;
@@ -105,7 +109,6 @@
 RetainPtr m_contentFilter;
 RetainPtr m_contentStream;
 RetainPtr m_streamConfiguration;
-RetainPtr m_contentSharingSession;
 

[webkit-changes] [294107] trunk/JSTests

2022-05-12 Thread angelos
Title: [294107] trunk/JSTests








Revision 294107
Author ange...@igalia.com
Date 2022-05-12 10:39:05 -0700 (Thu, 12 May 2022)


Log Message
Unskip no longer failing test
https://bugs.webkit.org/show_bug.cgi?id=240346

Unreviewed gardening.

Test no longer fails on ARM. No good explanation for why it was only
failing in bytecode-cache mode. Also not sure which subsequent commit
fixed it.


* stress/exception-in-to-property-key-should-be-handled-early.js:

Modified Paths

trunk/JSTests/ChangeLog
trunk/JSTests/stress/exception-in-to-property-key-should-be-handled-early.js




Diff

Modified: trunk/JSTests/ChangeLog (294106 => 294107)

--- trunk/JSTests/ChangeLog	2022-05-12 17:37:47 UTC (rev 294106)
+++ trunk/JSTests/ChangeLog	2022-05-12 17:39:05 UTC (rev 294107)
@@ -1,3 +1,16 @@
+2022-05-12  Angelos Oikonomopoulos  
+
+Unskip no longer failing test
+https://bugs.webkit.org/show_bug.cgi?id=240346
+
+Unreviewed gardening.
+
+Test no longer fails on ARM. No good explanation for why it was only
+failing in bytecode-cache mode. Also not sure which subsequent commit
+fixed it.
+
+* stress/exception-in-to-property-key-should-be-handled-early.js:
+
 2022-05-10  Ross Kirsling  
 
 [Temporal] Years 0-999 should be canonically represented with 4 digits, not 6


Modified: trunk/JSTests/stress/exception-in-to-property-key-should-be-handled-early.js (294106 => 294107)

--- trunk/JSTests/stress/exception-in-to-property-key-should-be-handled-early.js	2022-05-12 17:37:47 UTC (rev 294106)
+++ trunk/JSTests/stress/exception-in-to-property-key-should-be-handled-early.js	2022-05-12 17:39:05 UTC (rev 294107)
@@ -1,4 +1,3 @@
-//@ skip if $architecture == "arm"
 var propertyKey = {
 toString() {
 throw new Error("propertyKey.toString is called.");






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[webkit-changes] [294106] branches/safari-7614.1.13-branch/Source/WebKit

2022-05-12 Thread repstein
Title: [294106] branches/safari-7614.1.13-branch/Source/WebKit








Revision 294106
Author repst...@apple.com
Date 2022-05-12 10:37:47 -0700 (Thu, 12 May 2022)


Log Message
Cherry-pick r294072. rdar://problem/93058432

Need to add DYLD_LIBRARY_PATH for XPC services
https://bugs.webkit.org/show_bug.cgi?id=240289

Reviewed by Alexey Proskuryakov.

Set DYLD_LIBRARY_PATH / DYLD_VERSIONED_LIBRARY_PATH for XPC services depending on the value of USE_STAGING_INSTALL_PATH.
Also added DYLD_LIBRARY_PATH to the XPC environment for webpushd.

* Configurations/BaseTarget.xcconfig:
* webpushd/webpushtool/WebPushToolMain.mm:
(registerDaemonWithLaunchD):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294072 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog
branches/safari-7614.1.13-branch/Source/WebKit/Configurations/BaseTarget.xcconfig
branches/safari-7614.1.13-branch/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm




Diff

Modified: branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog (294105 => 294106)

--- branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog	2022-05-12 17:31:22 UTC (rev 294105)
+++ branches/safari-7614.1.13-branch/Source/WebKit/ChangeLog	2022-05-12 17:37:47 UTC (rev 294106)
@@ -1,3 +1,36 @@
+2022-05-12  Russell Epstein  
+
+Cherry-pick r294072. rdar://problem/93058432
+
+Need to add DYLD_LIBRARY_PATH for XPC services
+https://bugs.webkit.org/show_bug.cgi?id=240289
+
+Reviewed by Alexey Proskuryakov.
+
+Set DYLD_LIBRARY_PATH / DYLD_VERSIONED_LIBRARY_PATH for XPC services depending on the value of USE_STAGING_INSTALL_PATH.
+Also added DYLD_LIBRARY_PATH to the XPC environment for webpushd.
+
+* Configurations/BaseTarget.xcconfig:
+* webpushd/webpushtool/WebPushToolMain.mm:
+(registerDaemonWithLaunchD):
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294072 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2022-05-11  Michael Saboff  
+
+Need to add DYLD_LIBRARY_PATH for XPC services
+https://bugs.webkit.org/show_bug.cgi?id=240289
+
+Reviewed by Alexey Proskuryakov.
+
+Set DYLD_LIBRARY_PATH / DYLD_VERSIONED_LIBRARY_PATH for XPC services depending on the value of USE_STAGING_INSTALL_PATH.
+Also added DYLD_LIBRARY_PATH to the XPC environment for webpushd.
+
+* Configurations/BaseTarget.xcconfig:
+* webpushd/webpushtool/WebPushToolMain.mm:
+(registerDaemonWithLaunchD):
+
 2022-05-11  Russell Epstein  
 
 Cherry-pick r293945. rdar://problem/92859012


Modified: branches/safari-7614.1.13-branch/Source/WebKit/Configurations/BaseTarget.xcconfig (294105 => 294106)

--- branches/safari-7614.1.13-branch/Source/WebKit/Configurations/BaseTarget.xcconfig	2022-05-12 17:31:22 UTC (rev 294105)
+++ branches/safari-7614.1.13-branch/Source/WebKit/Configurations/BaseTarget.xcconfig	2022-05-12 17:37:47 UTC (rev 294106)
@@ -125,8 +125,8 @@
 WEBKIT_LEGACY_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebKitLegacy.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
 
 OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(USE_STAGING_INSTALL_PATH));
-OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env,DYLD_VERSIONED_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
-OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES[arch=arm64*][sdk=macosx11*] = -Wl,-dyld_env,DYLD_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
+OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env,DYLD_VERSIONED_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari,-dyld_env,DYLD_VERSIONED_LIBRARY_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
+OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES[arch=arm64*][sdk=macosx11*] = -Wl,-dyld_env,DYLD_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari,-dyld_env,DYLD_LIBRARY_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
 
 WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
 


Modified: branches/safari-7614.1.13-branch/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm (294105 => 294106)

--- branches/safari-7614.1.13-branch/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm	2022-05-12 17:31:22 UTC (rev 294105)
+++ branches/safari-7614.1.13-branch/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm	2022-05-12 17:37:47 UTC (rev 294106)
@@ -106,6 +106,7 @@
 {
 auto environmentVariables = adoptNS(xpc_dictionary_create(nullptr, nullptr, 0));
 xpc_dictionary_set_string(environmentVariables.get(), "DYLD_FRAMEWORK_PATH", currentExecutableDirectoryURL.fileSystemRepresentation);
+xpc_dictionary_set_string(environmentVariables.get(), "DYLD_LIBRARY_PATH", 

[webkit-changes] [294105] branches/safari-7614.1.13-branch/Source

2022-05-12 Thread repstein
Title: [294105] branches/safari-7614.1.13-branch/Source








Revision 294105
Author repst...@apple.com
Date 2022-05-12 10:31:22 -0700 (Thu, 12 May 2022)


Log Message
Versioning.

WebKit-7614.1.13.4

Modified Paths

branches/safari-7614.1.13-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/WebCore/PAL/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/WebGPU/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/WebKit/Configurations/Version.xcconfig
branches/safari-7614.1.13-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig




Diff

Modified: branches/safari-7614.1.13-branch/Source/_javascript_Core/Configurations/Version.xcconfig (294104 => 294105)

--- branches/safari-7614.1.13-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2022-05-12 16:24:00 UTC (rev 294104)
+++ branches/safari-7614.1.13-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2022-05-12 17:31:22 UTC (rev 294105)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 614;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 3;
+MICRO_VERSION = 4;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-7614.1.13-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig (294104 => 294105)

--- branches/safari-7614.1.13-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig	2022-05-12 16:24:00 UTC (rev 294104)
+++ branches/safari-7614.1.13-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig	2022-05-12 17:31:22 UTC (rev 294105)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 614;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 3;
+MICRO_VERSION = 4;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-7614.1.13-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (294104 => 294105)

--- branches/safari-7614.1.13-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2022-05-12 16:24:00 UTC (rev 294104)
+++ branches/safari-7614.1.13-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2022-05-12 17:31:22 UTC (rev 294105)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 614;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 3;
+MICRO_VERSION = 4;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-7614.1.13-branch/Source/WebCore/Configurations/Version.xcconfig (294104 => 294105)

--- branches/safari-7614.1.13-branch/Source/WebCore/Configurations/Version.xcconfig	2022-05-12 16:24:00 UTC (rev 294104)
+++ branches/safari-7614.1.13-branch/Source/WebCore/Configurations/Version.xcconfig	2022-05-12 17:31:22 UTC (rev 294105)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 614;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 3;
+MICRO_VERSION = 4;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-7614.1.13-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (294104 => 294105)

--- branches/safari-7614.1.13-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2022-05-12 16:24:00 UTC (rev 294104)
+++ branches/safari-7614.1.13-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2022-05-12 17:31:22 UTC (rev 294105)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 614;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 3;
+MICRO_VERSION = 4;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-7614.1.13-branch/Source/WebGPU/Configurations/Version.xcconfig (294104 => 294105)

--- branches/safari-7614.1.13-branch/Source/WebGPU/Configurations/Version.xcconfig	2022-05-12 16:24:00 UTC (rev 294104)
+++ branches/safari-7614.1.13-branch/Source/WebGPU/Configurations/Version.xcconfig	2022-05-12 17:31:22 UTC (rev 294105)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 614;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 3;
+MICRO_VERSION = 4;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-7614.1.13-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (294104 => 294105)

--- branches/safari-7614.1.13-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2022-05-12 16:24:00 UTC (rev 294104)
+++ branches/safari-7614.1.13-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2022-05-12 17:31:22 UTC (rev 294105)
@@ -1,7 +1,7 @@
 MAJOR_VERSION = 614;
 

[webkit-changes] [294104] trunk/Source/WebCore

2022-05-12 Thread commit-queue
Title: [294104] trunk/Source/WebCore








Revision 294104
Author commit-qu...@webkit.org
Date 2022-05-12 09:24:00 -0700 (Thu, 12 May 2022)


Log Message
[GStreamer][VideoCapture] Add support for capturing encoded video streams from a webcam
https://bugs.webkit.org/show_bug.cgi?id=240229

Patch by Loïc Le Page  on 2022-05-12
Reviewed by Philippe Normand.

Takes into account encoded video streams produced by a webcam for
video capture.

Manually tested (requires a webcam with encoded video streams).

* platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp:
(WebCore::GStreamerVideoCaptureSource::generatePresets):
* platform/mediastream/gstreamer/GStreamerVideoCapturer.cpp:
(WebCore::GStreamerVideoCapturer::createConverter):
(WebCore::GStreamerVideoCapturer::setSize):
(WebCore::GStreamerVideoCapturer::setFrameRate):
(WebCore::GStreamerVideoCapturer::adjustVideoSrcMIMEType):
* platform/mediastream/gstreamer/GStreamerVideoCapturer.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp
trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCapturer.cpp
trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCapturer.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (294103 => 294104)

--- trunk/Source/WebCore/ChangeLog	2022-05-12 14:27:48 UTC (rev 294103)
+++ trunk/Source/WebCore/ChangeLog	2022-05-12 16:24:00 UTC (rev 294104)
@@ -1,3 +1,24 @@
+2022-05-12  Loïc Le Page  
+
+[GStreamer][VideoCapture] Add support for capturing encoded video streams from a webcam
+https://bugs.webkit.org/show_bug.cgi?id=240229
+
+Reviewed by Philippe Normand.
+
+Takes into account encoded video streams produced by a webcam for
+video capture.
+
+Manually tested (requires a webcam with encoded video streams).
+
+* platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp:
+(WebCore::GStreamerVideoCaptureSource::generatePresets):
+* platform/mediastream/gstreamer/GStreamerVideoCapturer.cpp:
+(WebCore::GStreamerVideoCapturer::createConverter):
+(WebCore::GStreamerVideoCapturer::setSize):
+(WebCore::GStreamerVideoCapturer::setFrameRate):
+(WebCore::GStreamerVideoCapturer::adjustVideoSrcMIMEType):
+* platform/mediastream/gstreamer/GStreamerVideoCapturer.h:
+
 2022-05-12  Youenn Fablet  
 
 Add a better mock for audio units used by CoreAudioSharedUnit


Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp (294103 => 294104)

--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp	2022-05-12 14:27:48 UTC (rev 294103)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCaptureSource.cpp	2022-05-12 16:24:00 UTC (rev 294104)
@@ -264,10 +264,6 @@
 for (unsigned i = 0; i < gst_caps_get_size(caps.get()); i++) {
 GstStructure* str = gst_caps_get_structure(caps.get(), i);
 
-// Only accept raw video for now.
-if (!gst_structure_has_name(str, "video/x-raw"))
-continue;
-
 int32_t width, height;
 if (!gst_structure_get(str, "width", G_TYPE_INT, , "height", G_TYPE_INT, , nullptr)) {
 GST_INFO("Could not find discret height and width values in %" GST_PTR_FORMAT, str);


Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCapturer.cpp (294103 => 294104)

--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCapturer.cpp	2022-05-12 14:27:48 UTC (rev 294103)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoCapturer.cpp	2022-05-12 16:24:00 UTC (rev 294104)
@@ -68,7 +68,16 @@
 GstElement* GStreamerVideoCapturer::createConverter()
 {
 // https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/97#note_56575
-return makeGStreamerBin("videoscale ! videoconvert ! videorate drop-_only_=1 average-period=1", true);
+auto bin = makeGStreamerBin("capsfilter caps=\"video/x-raw\" name=mimetype-filter ! decodebin3 ! videoscale ! videoconvert ! videorate drop-_only_=1 average-period=1 name=videorate", false);
+
+m_videoSrcMIMETypeFilter = adoptGRef(gst_bin_get_by_name(GST_BIN(bin), "mimetype-filter"));
+auto videorate = adoptGRef(gst_bin_get_by_name(GST_BIN(bin), "videorate"));
+
+RELEASE_ASSERT(gst_element_add_pad(bin, gst_ghost_pad_new("sink", GST_PAD(m_videoSrcMIMETypeFilter->sinkpads->data;
+RELEASE_ASSERT(gst_element_add_pad(bin, gst_ghost_pad_new("src", GST_PAD(videorate->srcpads->data;
+
+adjustVideoSrcMIMEType();
+return bin;
 }
 
 GstVideoInfo GStreamerVideoCapturer::getBestFormat()
@@ -101,6 +110,8 @@
 m_caps = adoptGRef(gst_caps_copy(m_caps.get()));
 gst_caps_set_simple(m_caps.get(), "width", G_TYPE_INT, width, "height", G_TYPE_INT, height, nullptr);
 
+adjustVideoSrcMIMEType();
+
 if (!m_capsfilter)
 return false;
 
@@ -133,6 

[webkit-changes] [294103] trunk/Source/WebKit

2022-05-12 Thread commit-queue
Title: [294103] trunk/Source/WebKit








Revision 294103
Author commit-qu...@webkit.org
Date 2022-05-12 07:27:48 -0700 (Thu, 12 May 2022)


Log Message
REGRESSION(r291038) [GTK][WPE] Fix build without remote inspector
https://bugs.webkit.org/show_bug.cgi?id=240305

Patch by Olivier Blin  on 2022-05-12
Reviewed by Michael Catanzaro.

* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/glib/WebProcessPoolGLib.cpp:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* WebProcess/glib/WebProcessGLib.cpp:
(WebKit::WebProcess::platformInitializeWebProcess):

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp
trunk/Source/WebKit/Shared/WebProcessCreationParameters.h
trunk/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
trunk/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp




Diff

Modified: trunk/Source/WebKit/ChangeLog (294102 => 294103)

--- trunk/Source/WebKit/ChangeLog	2022-05-12 13:56:19 UTC (rev 294102)
+++ trunk/Source/WebKit/ChangeLog	2022-05-12 14:27:48 UTC (rev 294103)
@@ -1,3 +1,19 @@
+2022-05-12  Olivier Blin  
+
+REGRESSION(r291038) [GTK][WPE] Fix build without remote inspector
+https://bugs.webkit.org/show_bug.cgi?id=240305
+
+Reviewed by Michael Catanzaro.
+
+* Shared/WebProcessCreationParameters.cpp:
+(WebKit::WebProcessCreationParameters::encode const):
+(WebKit::WebProcessCreationParameters::decode):
+* Shared/WebProcessCreationParameters.h:
+* UIProcess/glib/WebProcessPoolGLib.cpp:
+(WebKit::WebProcessPool::platformInitializeWebProcess):
+* WebProcess/glib/WebProcessGLib.cpp:
+(WebKit::WebProcess::platformInitializeWebProcess):
+
 2022-05-12  Yousuke Kimoto  
 
 [WinCairo] Fix a compile error due to InspectorResourceURLSchemeHandler


Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp (294102 => 294103)

--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp	2022-05-12 13:56:19 UTC (rev 294102)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp	2022-05-12 14:27:48 UTC (rev 294103)
@@ -208,8 +208,10 @@
 #if USE(GLIB)
 encoder << applicationID;
 encoder << applicationName;
+#if ENABLE(REMOTE_INSPECTOR)
 encoder << inspectorServerAddress;
 #endif
+#endif
 
 #if USE(ATSPI)
 encoder << accessibilityBusAddress;
@@ -558,6 +560,7 @@
 if (!decoder.decode(parameters.applicationName))
 return false;
 
+#if ENABLE(REMOTE_INSPECTOR)
 std::optional inspectorServerAddress;
 decoder >> inspectorServerAddress;
 if (!inspectorServerAddress)
@@ -564,6 +567,7 @@
 return false;
 parameters.inspectorServerAddress = WTFMove(*inspectorServerAddress);
 #endif
+#endif
 
 #if USE(ATSPI)
 std::optional accessibilityBusAddress;


Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.h (294102 => 294103)

--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.h	2022-05-12 13:56:19 UTC (rev 294102)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.h	2022-05-12 14:27:48 UTC (rev 294103)
@@ -249,8 +249,10 @@
 #if USE(GLIB)
 String applicationID;
 String applicationName;
+#if ENABLE(REMOTE_INSPECTOR)
 CString inspectorServerAddress;
 #endif
+#endif
 
 #if USE(ATSPI)
 String accessibilityBusAddress;


Modified: trunk/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp (294102 => 294103)

--- trunk/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp	2022-05-12 13:56:19 UTC (rev 294102)
+++ trunk/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp	2022-05-12 14:27:48 UTC (rev 294103)
@@ -32,10 +32,13 @@
 #include "MemoryPressureMonitor.h"
 #include "WebMemoryPressureHandler.h"
 #include "WebProcessCreationParameters.h"
-#include <_javascript_Core/RemoteInspector.h>
 #include 
 #include 
 
+#if ENABLE(REMOTE_INSPECTOR)
+#include <_javascript_Core/RemoteInspector.h>
+#endif
+
 #if USE(GSTREAMER)
 #include 
 #endif
@@ -119,7 +122,9 @@
 parameters.applicationID = String::fromLatin1(g_application_get_application_id(app));
 parameters.applicationName = String::fromLatin1(g_get_application_name());
 
+#if ENABLE(REMOTE_INSPECTOR)
 parameters.inspectorServerAddress = Inspector::RemoteInspector::inspectorServerAddress();
+#endif
 
 #if USE(ATSPI)
 static const char* accessibilityBusAddress = getenv("WEBKIT_A11Y_BUS_ADDRESS");


Modified: trunk/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp (294102 => 294103)

--- trunk/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp	2022-05-12 13:56:19 UTC (rev 294102)
+++ trunk/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp	2022-05-12 14:27:48 UTC (rev 294103)
@@ -31,7 +31,10 @@
 #include "WebKitWebExtensionPrivate.h"
 #include "WebPage.h"
 #include "WebProcessCreationParameters.h"
+
+#if ENABLE(REMOTE_INSPECTOR)
 #include 

[webkit-changes] [294102] trunk

2022-05-12 Thread youenn
Title: [294102] trunk








Revision 294102
Author you...@apple.com
Date 2022-05-12 06:56:19 -0700 (Thu, 12 May 2022)


Log Message
Add a better mock for audio units used by CoreAudioSharedUnit
https://bugs.webkit.org/show_bug.cgi?id=240231

Reviewed by Eric Carlson.

Source/WebCore:

Move CoreAudioSharedUnit to its own file, CoreAudioSharedUnit.h/CoreAudioSharedUnit.cpp.
Introduce an internal unit to abstract out CoreAudioSharedUnit from actual CoreAudio units.
Implement a CoreAudio based internal unit in CoreAudioSharedUnit.cpp.
Implement a Mock based internal unit in MockAudioSharedUnit.h/MockAudioSharedUnit.mm.
Add inputput/ouput sample rate validation (debug assert and release error returned).
Add a test that uses this validation.

Test: fast/mediastream/audio-unit-reconfigure.html

* SourcesCocoa.txt:
* WebCore.xcodeproj/project.pbxproj:
* platform/mediastream/mac/BaseAudioSharedUnit.cpp:
* platform/mediastream/mac/BaseAudioSharedUnit.h:
* platform/mediastream/mac/CoreAudioCaptureSource.cpp:
* platform/mediastream/mac/CoreAudioSharedUnit.cpp: Added.
* platform/mediastream/mac/CoreAudioSharedUnit.h: Added.
* platform/mediastream/mac/MockAudioSharedUnit.h:
* platform/mediastream/mac/MockAudioSharedUnit.mm:

LayoutTests:

* fast/mediastream/audio-unit-reconfigure-expected.txt: Added.
* fast/mediastream/audio-unit-reconfigure.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/SourcesCocoa.txt
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/platform/mediastream/mac/BaseAudioSharedUnit.cpp
trunk/Source/WebCore/platform/mediastream/mac/BaseAudioSharedUnit.h
trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp
trunk/Source/WebCore/platform/mediastream/mac/MockAudioSharedUnit.h
trunk/Source/WebCore/platform/mediastream/mac/MockAudioSharedUnit.mm


Added Paths

trunk/LayoutTests/fast/mediastream/audio-unit-reconfigure-expected.txt
trunk/LayoutTests/fast/mediastream/audio-unit-reconfigure.html
trunk/Source/WebCore/platform/mediastream/mac/CoreAudioSharedUnit.cpp
trunk/Source/WebCore/platform/mediastream/mac/CoreAudioSharedUnit.h




Diff

Modified: trunk/LayoutTests/ChangeLog (294101 => 294102)

--- trunk/LayoutTests/ChangeLog	2022-05-12 13:49:11 UTC (rev 294101)
+++ trunk/LayoutTests/ChangeLog	2022-05-12 13:56:19 UTC (rev 294102)
@@ -1,3 +1,13 @@
+2022-05-12  Youenn Fablet  
+
+Add a better mock for audio units used by CoreAudioSharedUnit
+https://bugs.webkit.org/show_bug.cgi?id=240231
+
+Reviewed by Eric Carlson.
+
+* fast/mediastream/audio-unit-reconfigure-expected.txt: Added.
+* fast/mediastream/audio-unit-reconfigure.html: Added.
+
 2022-05-11  John Cunningham  
 
 [GPU Process] webrtc/vp8-then-h264-gpu-process-crash.html flaky fails after turning DOM in GPUP on by default


Added: trunk/LayoutTests/fast/mediastream/audio-unit-reconfigure-expected.txt (0 => 294102)

--- trunk/LayoutTests/fast/mediastream/audio-unit-reconfigure-expected.txt	(rev 0)
+++ trunk/LayoutTests/fast/mediastream/audio-unit-reconfigure-expected.txt	2022-05-12 13:56:19 UTC (rev 294102)
@@ -0,0 +1,5 @@
+
+
+PASS Reconfigure audio sample rate
+PASS Reconfigure audio unit when being in render-only mode
+


Added: trunk/LayoutTests/fast/mediastream/audio-unit-reconfigure.html (0 => 294102)

--- trunk/LayoutTests/fast/mediastream/audio-unit-reconfigure.html	(rev 0)
+++ trunk/LayoutTests/fast/mediastream/audio-unit-reconfigure.html	2022-05-12 13:56:19 UTC (rev 294102)
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+