date:20220221

[webkit-changes] [290290] trunk/Source

2022-02-21 Thread rmorisset

Title: [290290] trunk/Source








Revision 290290
Author rmoris...@apple.com
Date 2022-02-21 22:53:58 -0800 (Mon, 21 Feb 2022)


Log Message
[JSC] Format the output of --reportTotalPhaseTimes=1 more nicely
https://bugs.webkit.org/show_bug.cgi?id=237005

Reviewed by Saam Barati.

Source/_javascript_Core:

Before this patch:
[B3] moveConstants total ms: 64.307583 max ms: 1.703167
[B3] lowerToAir total ms: 151.297782 max ms: 5.426375
[B3] generateToAir total ms: 1623.987166 max ms: 92.826750
[B3] simplifyCFG total ms: 11.760463 max ms: 1.088083
[B3] Air::lowerMacros total ms: 5.975679 max ms: 0.382000

After this patch:
total ms:   66.328 max ms:   2.283 [B3] moveConstants
total ms:  148.097 max ms:   5.361 [B3] lowerToAir
total ms: 1619.115 max ms:  96.307 [Total B3] generateToAir
total ms:   11.959 max ms:   1.185 [Air] simplifyCFG
total ms:6.519 max ms:   0.697 [Air] Air::lowerMacros

Concretely there are two changes:
- use FixedWidthDouble (also introduced to WTF in this patch) to line-up the total times.
  This makes it possible to see at a glance which phases are worth optimizing and which aren't.
- Tag phases more precisely, and in particular replace [B3] by [Air] where relevant,
  and give different tags to measurements that correspond to groups of phases instead of a single phase (e.g. generateToAir).

* _javascript_Core.xcodeproj/project.pbxproj:
* b3/B3Compile.cpp:
(JSC::B3::compile):
* b3/B3FixSSA.cpp:
* b3/B3Generate.cpp:
(JSC::B3::prepareForGeneration):
(JSC::B3::generateToAir):
* b3/B3PhaseScope.cpp:
(JSC::B3::PhaseScope::PhaseScope):
* b3/B3PhaseScope.h:
* b3/B3TimingScope.h: Removed.
(JSC::B3::TimingScope::TimingScope): Deleted.
* b3/B3VariableLiveness.cpp:
(JSC::B3::VariableLiveness::VariableLiveness):
* b3/air/AirAllocateRegistersAndStackAndGenerateCode.cpp:
(JSC::B3::Air::GenerateAndAllocateRegisters::generate):
* b3/air/AirAllocateRegistersAndStackByLinearScan.cpp:
* b3/air/AirGenerate.cpp:
(JSC::B3::Air::prepareForGeneration):
(JSC::B3::Air::generateWithAlreadyAllocatedRegisters):
* b3/air/AirLiveness.h:
(JSC::B3::Air::Liveness::Liveness):
* b3/air/AirPhaseScope.cpp:
(JSC::B3::Air::PhaseScope::PhaseScope):
* b3/air/AirPhaseScope.h:
* tools/CompilerTimingScope.cpp:

Source/WTF:

Add FixedWidthDouble, which allows easily printing a double with some whitespace to pad it out if it is smaller than expected.
Its design roughly follows RawPointer which similarly allows special formatting of a kind of number.

* WTF.xcodeproj/project.pbxproj:
* wtf/CMakeLists.txt:
* wtf/FixedWidthDouble.h: Added.
(WTF::FixedWidthDouble::FixedWidthDouble):
(WTF::FixedWidthDouble::value const):
(WTF::FixedWidthDouble::width const):
(WTF::FixedWidthDouble::precision const):
* wtf/PrintStream.cpp:
(WTF::printInternal):
* wtf/PrintStream.h:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/_javascript_Core/b3/B3Compile.cpp
trunk/Source/_javascript_Core/b3/B3FixSSA.cpp
trunk/Source/_javascript_Core/b3/B3Generate.cpp
trunk/Source/_javascript_Core/b3/B3PhaseScope.cpp
trunk/Source/_javascript_Core/b3/B3PhaseScope.h
trunk/Source/_javascript_Core/b3/B3VariableLiveness.cpp
trunk/Source/_javascript_Core/b3/air/AirAllocateRegistersAndStackAndGenerateCode.cpp
trunk/Source/_javascript_Core/b3/air/AirAllocateRegistersAndStackByLinearScan.cpp
trunk/Source/_javascript_Core/b3/air/AirGenerate.cpp
trunk/Source/_javascript_Core/b3/air/AirLiveness.h
trunk/Source/_javascript_Core/b3/air/AirPhaseScope.cpp
trunk/Source/_javascript_Core/b3/air/AirPhaseScope.h
trunk/Source/_javascript_Core/tools/CompilerTimingScope.cpp
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/WTF.xcodeproj/project.pbxproj
trunk/Source/WTF/wtf/CMakeLists.txt
trunk/Source/WTF/wtf/PrintStream.cpp
trunk/Source/WTF/wtf/PrintStream.h


Added Paths

trunk/Source/WTF/wtf/FixedWidthDouble.h


Removed Paths

trunk/Source/_javascript_Core/b3/B3TimingScope.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (290289 => 290290)

--- trunk/Source/_javascript_Core/ChangeLog	2022-02-22 06:43:37 UTC (rev 290289)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-02-22 06:53:58 UTC (rev 290290)
@@ -1,3 +1,57 @@
+2022-02-21  Robin Morisset  
+
+[JSC] Format the output of --reportTotalPhaseTimes=1 more nicely
+https://bugs.webkit.org/show_bug.cgi?id=237005
+
+Reviewed by Saam Barati.
+
+Before this patch:
+[B3] moveConstants total ms: 64.307583 max ms: 1.703167
+[B3] lowerToAir total ms: 151.297782 max ms: 5.426375
+[B3] generateToAir total ms: 1623.987166 max ms: 92.826750
+[B3] simplifyCFG total ms: 11.760463 max ms: 1.088083
+[B3] Air::lowerMacros total ms: 5.975679 max ms: 0.382000
+
+After this patch:
+total ms:   66.328 max ms:   2.283 [B3] moveConstants
+total ms:  148.097 max ms:   5.361 [B3] lowerToAir
+total ms: 1619.115 max ms:  96.307 [Total B3] generateToAir
+

[webkit-changes] [290289] trunk/Tools

2022-02-21 Thread commit-queue

Title: [290289] trunk/Tools








Revision 290289
Author commit-qu...@webkit.org
Date 2022-02-21 22:43:37 -0800 (Mon, 21 Feb 2022)


Log Message
Use ArgumentParser for parsing args in generate-compile-commands
https://bugs.webkit.org/show_bug.cgi?id=236995

Patch by Brandon Stewart  on 2022-02-21
Reviewed by Alexey Proskuryakov.

Use argument parser instead of sys.argv[1] for getting build dir.

* Scripts/generate-compile-commands:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/generate-compile-commands




Diff

Modified: trunk/Tools/ChangeLog (290288 => 290289)

--- trunk/Tools/ChangeLog	2022-02-22 04:57:51 UTC (rev 290288)
+++ trunk/Tools/ChangeLog	2022-02-22 06:43:37 UTC (rev 290289)
@@ -1,3 +1,14 @@
+2022-02-21  Brandon Stewart  
+
+Use ArgumentParser for parsing args in generate-compile-commands
+https://bugs.webkit.org/show_bug.cgi?id=236995
+
+Reviewed by Alexey Proskuryakov.
+
+Use argument parser instead of sys.argv[1] for getting build dir.
+
+* Scripts/generate-compile-commands:
+
 2022-02-21  Wenson Hsieh  
 
 [iOS] Adjust some behaviors around the "Markup Image" action in the callout bar


Modified: trunk/Tools/Scripts/generate-compile-commands (290288 => 290289)

--- trunk/Tools/Scripts/generate-compile-commands	2022-02-22 04:57:51 UTC (rev 290288)
+++ trunk/Tools/Scripts/generate-compile-commands	2022-02-22 06:43:37 UTC (rev 290289)
@@ -33,7 +33,20 @@
 import sys
 import glob
 import json
+import argparse
 
+# Get command line args
+parser = argparse.ArgumentParser(description='Generate compile_commands.json', 
+usage="""
+  make r EXPORT_COMPILE_COMMANDS=YES
+  generate-compile-commands WebKitBuild/Release
+
+  https://trac.webkit.org/wiki/Clangd
+  """)
+
+parser.add_argument('built_products_dir', help='path to the build directory containing generated compile commands (ex: WebKitBuild/Release)')
+opts = parser.parse_args()
+
 # Change to the root of WebKit Directory
 file_dir = os.path.dirname(os.path.realpath(__file__))
 base_dir = file_dir + "/../../"
@@ -40,7 +53,7 @@
 os.chdir(base_dir)
 
 # Check compile_commands folder exists
-compile_commands_dir = sys.argv[1] + "/compile_commands/"
+compile_commands_dir = opts.built_products_dir + "/compile_commands/"
 
 if not os.path.exists(compile_commands_dir):
 print("Please specify the build directory with compile_commands.")






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

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

2022-02-21 Thread achristensen

Title: [290288] trunk/Source/WebKit








Revision 290288
Author achristen...@apple.com
Date 2022-02-21 20:57:51 -0800 (Mon, 21 Feb 2022)


Log Message
Allow adattributiond to start on iOS devices
https://bugs.webkit.org/show_bug.cgi?id=237009


Reviewed by Per Arne Vollan.

There were three more problems preventing it from starting:
1. The code signature said to look for a sandbox profile with "webkit" in the name, but the profile had "WebKit" in the name.
   These names are case sensitive.
2. The sandbox profile would not let it load the WebKit framework, so dyld would fail and the process would fail to launch.
   I added the framework directories that the XPC services are allowed to access.
3. Once it started, it would crash inside WTF::initializeMainThread when calling WTF::pageSize which requires access to the hw.pagesize_compat syscall.
   As a starting point, I'm going to allow all the syscalls that the network process currently has access to,
   which is enough to get it to respond without crashing.
4. We need access to com.apple.diagnosticd and com.apple.analyticsd in order to be able to generate crash reports.  This is quite useful.
Yes, I know I said there were only three problems, but the 4th is so useful I thought I'd put it in the list.

* Resources/SandboxProfiles/ios/com.apple.WebKit.adattributiond.sb:
* Scripts/process-entitlements.sh:

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.adattributiond.sb
trunk/Source/WebKit/Scripts/process-entitlements.sh




Diff

Modified: trunk/Source/WebKit/ChangeLog (290287 => 290288)

--- trunk/Source/WebKit/ChangeLog	2022-02-22 04:57:01 UTC (rev 290287)
+++ trunk/Source/WebKit/ChangeLog	2022-02-22 04:57:51 UTC (rev 290288)
@@ -1,5 +1,27 @@
 2022-02-21  Alex Christensen  
 
+Allow adattributiond to start on iOS devices
+https://bugs.webkit.org/show_bug.cgi?id=237009
+
+
+Reviewed by Per Arne Vollan.
+
+There were three more problems preventing it from starting:
+1. The code signature said to look for a sandbox profile with "webkit" in the name, but the profile had "WebKit" in the name.
+   These names are case sensitive.
+2. The sandbox profile would not let it load the WebKit framework, so dyld would fail and the process would fail to launch.
+   I added the framework directories that the XPC services are allowed to access.
+3. Once it started, it would crash inside WTF::initializeMainThread when calling WTF::pageSize which requires access to the hw.pagesize_compat syscall.
+   As a starting point, I'm going to allow all the syscalls that the network process currently has access to,
+   which is enough to get it to respond without crashing.
+4. We need access to com.apple.diagnosticd and com.apple.analyticsd in order to be able to generate crash reports.  This is quite useful.
+Yes, I know I said there were only three problems, but the 4th is so useful I thought I'd put it in the list.
+
+* Resources/SandboxProfiles/ios/com.apple.WebKit.adattributiond.sb:
+* Scripts/process-entitlements.sh:
+
+2022-02-21  Alex Christensen  
+
 Improve const correctness for SecurityOrigin accessors
 https://bugs.webkit.org/show_bug.cgi?id=236983
 


Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.adattributiond.sb (290287 => 290288)

--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.adattributiond.sb	2022-02-22 04:57:01 UTC (rev 290287)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.adattributiond.sb	2022-02-22 04:57:51 UTC (rev 290288)
@@ -73,6 +73,37 @@
 (allow file-read* file-write*
 (subpath "/var/mobile/Library/com.apple.webkit.addattributiond"))
 
+(allow file-read* file-map-executable
+(subpath "/System/Library/Frameworks")
+(subpath "/System/Library/PrivateFrameworks"))
+
+(with-filter (system-attribute apple-internal)
+(allow mach-lookup
+(global-name "com.apple.analyticsd")
+(global-name "com.apple.diagnosticd")))
+
+(deny sysctl* (with telemetry))
+(allow sysctl-read
+(sysctl-name
+"hw.activecpu"
+"hw.machine"
+"hw.memsize"
+"hw.ncpu"
+"hw.pagesize_compat"
+"kern.bootargs"
+"kern.hostname"
+"kern.maxfilesperproc"
+"kern.osproductversion"
+"kern.osrelease"
+"kern.ostype"
+"kern.osvariant_status"
+"kern.osversion"
+"kern.secure_kernel"
+"kern.version"
+"vm.footprint_suspend")
+(sysctl-name-prefix "kern.proc.pid.")
+)
+
 (allow-read-write-directory-contents (param "DARWIN_USER_CACHE_DIR"))
 (allow-read-write-directory-contents (param "DARWIN_USER_TEMP_DIR"))
 


Modified: trunk/Source/WebKit/Scripts/process-entitlements.sh (290287 => 290288)

--- trunk/Source/WebKit/Scripts/process-entitlements.sh	2022-02-22 04:57:01

[webkit-changes] [290287] trunk/Source

2022-02-21 Thread achristensen

Title: [290287] trunk/Source








Revision 290287
Author achristen...@apple.com
Date 2022-02-21 20:57:01 -0800 (Mon, 21 Feb 2022)


Log Message
Improve const correctness for SecurityOrigin accessors
https://bugs.webkit.org/show_bug.cgi?id=236983

Reviewed by Chris Dumez.

Source/WebCore:

* loader/SubresourceLoader.h:
* loader/cache/CachedResource.h:
(WebCore::CachedResource::origin const):
(WebCore::CachedResource::origin):
* loader/cache/CachedResourceRequest.h:
(WebCore::CachedResourceRequest::origin const):
(WebCore::CachedResourceRequest::origin):

Source/WebKit:

* UIProcess/Notifications/WebNotification.h:
(WebKit::WebNotification::origin const):
(WebKit::WebNotification::origin):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/SubresourceLoader.h
trunk/Source/WebCore/loader/cache/CachedResource.h
trunk/Source/WebCore/loader/cache/CachedResourceRequest.h
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/Notifications/WebNotification.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (290286 => 290287)

--- trunk/Source/WebCore/ChangeLog	2022-02-22 04:03:59 UTC (rev 290286)
+++ trunk/Source/WebCore/ChangeLog	2022-02-22 04:57:01 UTC (rev 290287)
@@ -1,3 +1,18 @@
+2022-02-21  Alex Christensen  
+
+Improve const correctness for SecurityOrigin accessors
+https://bugs.webkit.org/show_bug.cgi?id=236983
+
+Reviewed by Chris Dumez.
+
+* loader/SubresourceLoader.h:
+* loader/cache/CachedResource.h:
+(WebCore::CachedResource::origin const):
+(WebCore::CachedResource::origin):
+* loader/cache/CachedResourceRequest.h:
+(WebCore::CachedResourceRequest::origin const):
+(WebCore::CachedResourceRequest::origin):
+
 2022-02-21  Brandon Stewart  
 
 Ensure layer has backing during traversal


Modified: trunk/Source/WebCore/loader/SubresourceLoader.h (290286 => 290287)

--- trunk/Source/WebCore/loader/SubresourceLoader.h	2022-02-22 04:03:59 UTC (rev 290286)
+++ trunk/Source/WebCore/loader/SubresourceLoader.h	2022-02-22 04:57:01 UTC (rev 290287)
@@ -52,7 +52,8 @@
 CachedResource* cachedResource() const override { return m_resource; };
 WEBCORE_EXPORT const HTTPHeaderMap* originalHeaders() const;
 
-SecurityOrigin* origin() const { return m_origin.get(); }
+const SecurityOrigin* origin() const { return m_origin.get(); }
+SecurityOrigin* origin() { return m_origin.get(); }
 #if PLATFORM(IOS_FAMILY)
 void startLoading() override;
 


Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (290286 => 290287)

--- trunk/Source/WebCore/loader/cache/CachedResource.h	2022-02-22 04:03:59 UTC (rev 290286)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h	2022-02-22 04:57:01 UTC (rev 290287)
@@ -229,7 +229,8 @@
 
 void loadFrom(const CachedResource&);
 
-SecurityOrigin* origin() const { return m_origin.get(); }
+const SecurityOrigin* origin() const { return m_origin.get(); }
+SecurityOrigin* origin() { return m_origin.get(); }
 AtomString initiatorName() const { return m_initiatorName; }
 
 bool canDelete() const { return !hasClients() && !m_loader && !m_preloadCount && !m_handleCount && !m_resourceToRevalidate && !m_proxyResource; }


Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.h (290286 => 290287)

--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.h	2022-02-22 04:03:59 UTC (rev 290286)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.h	2022-02-22 04:57:01 UTC (rev 290287)
@@ -97,7 +97,8 @@
 
 void setOrigin(Ref&& origin) { m_origin = WTFMove(origin); }
 RefPtr releaseOrigin() { return WTFMove(m_origin); }
-SecurityOrigin* origin() const { return m_origin.get(); }
+const SecurityOrigin* origin() const { return m_origin.get(); }
+SecurityOrigin* origin() { return m_origin.get(); }
 
 String&& releaseFragmentIdentifier() { return WTFMove(m_fragmentIdentifier); }
 void clearFragmentIdentifier() { m_fragmentIdentifier = { }; }


Modified: trunk/Source/WebKit/ChangeLog (290286 => 290287)

--- trunk/Source/WebKit/ChangeLog	2022-02-22 04:03:59 UTC (rev 290286)
+++ trunk/Source/WebKit/ChangeLog	2022-02-22 04:57:01 UTC (rev 290287)
@@ -1,3 +1,14 @@
+2022-02-21  Alex Christensen  
+
+Improve const correctness for SecurityOrigin accessors
+https://bugs.webkit.org/show_bug.cgi?id=236983
+
+Reviewed by Chris Dumez.
+
+* UIProcess/Notifications/WebNotification.h:
+(WebKit::WebNotification::origin const):
+(WebKit::WebNotification::origin):
+
 2022-02-21  Wenson Hsieh  
 
 [iOS] Adjust some behaviors around the "Markup Image" action in the callout bar


Modified: trunk/Source/WebKit/UIProcess/Notifications/WebNotification.h (290286 => 290287)

--- trunk/Source/WebKit/UIProcess/Notifications/WebNotification.h	2022-02-22 04:03:59 UTC (rev 290286)
+++ trunk/Source/WebKit/UIProcess/Notifications/WebNotification.h	2022-02-22 04:57:01 UTC

[webkit-changes] [290286] trunk

2022-02-21 Thread wenson_hsieh

Title: [290286] trunk

Revision 290286
Author wenson_hs...@apple.com
Date 2022-02-21 20:03:59 -0800 (Mon, 21 Feb 2022)

Log Message
[iOS] Adjust some behaviors around the "Markup Image" action in the callout bar
https://bugs.webkit.org/show_bug.cgi?id=236980

Reviewed by Aditya Keerthi.

Source/WebKit:

Adjust the following behaviors around the "Markup Image" callout bar item on iOS:
1. The item should be present as long as the selection range contains a single image item (not only if the
selection range exactly encompasses a single image element.
2. The item should appear in the callout bar before other WebKit-client-provided menu controller items.

This patch also adds a new API test to exercise these behaviors and, in doing so, also refactors logic around
determining whether or not to show this item so that it's dependent on a WebKit internal feature instead of just
the system feature flag (with the default value of the internal feature being equal to whether or not the system
feature is enabled). This means we can run tests for these features without requiring the system feature flag to
be enabled.

See below for more details.

Test: ImageAnalysisTests.MenuControllerItems

* Platform/cocoa/TextRecognitionUtilities.mm:
(WebKit::makeTextRecognitionResult):

Drive-by fix for some API tests: only attempt to send the platform image analysis result over IPC if it is a
`VKCImageAnalysis`. In some API tests, we use mock objects here instead, which currently causes the IPC message
send to fail due to encoding failure.

* Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm:
(WebKit::defaultImageAnalysisMarkupEnabled):
* Shared/WebPreferencesDefaultValues.h:

Make the new internal feature flag default to the system feature flag.

* UIProcess/ios/WKActionSheetAssistant.h:
* UIProcess/ios/WKActionSheetAssistant.mm:
(-[WKActionSheetAssistant defaultActionsForLinkSheet:]):
(-[WKActionSheetAssistant defaultActionsForImageSheet:]):

Consult a new delegate method (`-actionSheetAssistantShouldIncludeCopyCroppedImageAction:`) instead of checking
the system feature flag directly.

* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView updateImageAnalysisMarkupMenuItems:]):

Append the "Markup Image" item at the start of the list of additional menu items.

(-[WKContentView canPerformImageAnalysisMarkup]):

Check the internal feature instead of the system feature flag.

(-[WKContentView performImageAnalysisMarkup:]):

Now that this action can be triggered even when the current selection doens't encompass only a single image, we
need to use `replaceWithPasteboardData()` instead, passing in the element context of the image element we want
to replace.

(-[WKContentView actionSheetAssistantShouldIncludeCopyCroppedImageAction:]):

Only attempt to show the new items if the internal feature is enabled. Consulted by `WKActionSheetAssistant`
above.

* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::setupServicesMenu):

Check the internal feature instead of the system feature flag.

* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getPlatformEditorState const):

Make a minor adjustment here to bail early only if we find multiple image elements in the selected range,
rather than bailing if we find anything that's not an image element.

Source/WTF:

Add a WebKit internal feature flag to control whether or not the "Markup Image" and related "Copy Cropped Image"
menu items should be enabled on iOS and macOS. This enables us to test these features in API and layout tests
without requiring the corresponding system feature flag to be enabled.

* Scripts/Preferences/WebPreferencesInternal.yaml:

Tools:

Add an API test to verify that "Markup Image" appears as the first non-default callout bar item when a single
image element is in the selection range. The test is comprised of three parts:

1. Select just a single image, and expect the "Markup Image" item.
2. Select all images in the document, and expect no "Markup Image" item.
3. Select a single image and some surrounding text, and expect the "Markup Image" item.

See WebKit/ChangeLog for more details.

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

Add some text before and after each image so that we can select a single image alongside some text, and exercise
the changes in `WebPage::getPlatformEditorState` (see WebKit changes for more information).

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Platform/cocoa/TextRecognitionUtilities.mm
trunk/Source/WebKit/Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm
trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h
trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.h

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

2022-02-21 Thread commit-queue

Title: [290285] trunk/Source/WebCore








Revision 290285
Author commit-qu...@webkit.org
Date 2022-02-21 19:57:42 -0800 (Mon, 21 Feb 2022)


Log Message
Ensure layer has backing during traversal
https://bugs.webkit.org/show_bug.cgi?id=236858

Patch by Brandon Stewart  on 2022-02-21
Reviewed by Simon Fraser.

Ensure the layer has a backing attached to it before trying to append
the node id.

* rendering/RenderLayerCompositor.cpp:
(WebCore::collectStationaryLayerRelatedOverflowNodes):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (290284 => 290285)

--- trunk/Source/WebCore/ChangeLog	2022-02-22 03:36:52 UTC (rev 290284)
+++ trunk/Source/WebCore/ChangeLog	2022-02-22 03:57:42 UTC (rev 290285)
@@ -1,3 +1,16 @@
+2022-02-21  Brandon Stewart  
+
+Ensure layer has backing during traversal
+https://bugs.webkit.org/show_bug.cgi?id=236858
+
+Reviewed by Simon Fraser.
+
+Ensure the layer has a backing attached to it before trying to append
+the node id.
+
+* rendering/RenderLayerCompositor.cpp:
+(WebCore::collectStationaryLayerRelatedOverflowNodes):
+
 2022-02-21  Cameron McCormack  
 
 Make input element UA shadow tree creation lazy


Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (290284 => 290285)

--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp	2022-02-22 03:36:52 UTC (rev 290284)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp	2022-02-22 03:57:42 UTC (rev 290285)
@@ -3442,7 +3442,7 @@
 static void collectStationaryLayerRelatedOverflowNodes(const RenderLayer& layer, const RenderLayer&, Vector& scrollingNodes)
 {
 ASSERT(layer.isComposited());
-
+
 auto appendOverflowLayerNodeID = [] (const RenderLayer& overflowLayer) {
 ASSERT(overflowLayer.isComposited());
 auto scrollingNodeID = overflowLayer.backing()->scrollingNodeIDForRole(ScrollCoordinationRole::Scrolling);
@@ -3459,6 +3459,9 @@
 if (isContainingBlockChain && isPaintOrderAncestor)
 return AncestorTraversal::Stop;
 
+if (!ancestorLayer.isComposited())
+return AncestorTraversal::Stop;
+
 if (seenPaintOrderAncestor && !isContainingBlockChain && ancestorLayer.hasCompositedScrollableOverflow())
 appendOverflowLayerNodeID(ancestorLayer);
 






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

[webkit-changes] [290284] trunk

2022-02-21 Thread heycam

Title: [290284] trunk








Revision 290284
Author hey...@apple.com
Date 2022-02-21 19:36:52 -0800 (Mon, 21 Feb 2022)


Log Message
Make input element UA shadow tree creation lazy
https://bugs.webkit.org/show_bug.cgi?id=236747

Reviewed by Aditya Keerthi.

Source/WebCore:

We currently delay InputType creation for parser inserted elements until
just after the attributes have been set, so that we don't wastefully
create an InputType and the UA shadow tree creation if a non-text
type="" was specified on the tag. We don't do anything similar for
script inserted input elements. We could make the InputType creation
lazy, but most of the wasted time is due to the shadow tree creation.

This patch makes InputType shadow tree creation lazy by delaying it
until one of the following happens:

1. the element is inserted into the document
2. the type="" or value="" attributes are changed before the element
   is inserted into the document
3. any DOM methods that need access to the innerTextElement() are
   called on the element before the element is inserted into the
   document

Not all places where we call innerTextElement() on the
HTMLInputElement are safe to lazily create the shadow trees, so we
have two accessors:

- innerTextElement() returns the inner text element if it's been
  created already
- innerTextElementCreatingShadowSubtreeIfNeeded will perform the lazy
  shadow tree construction if it hasn't already been done

Since the existing
createShadowSubtreeAndUpdateInnerTextElementEditability function has
more responsibility than just creating the subtree and ensuring the
editability is set appropriately, it's renamed to a more manageable
createShadowSubtree.

This change is a 0.5% progression on Speedometer 2.

Test: fast/forms/lazy-shadow-tree-creation.html

* html/BaseDateAndTimeInputType.h:
* html/BaseDateAndTimeInputType.cpp:
(WebCore::BaseDateAndTimeInputType::createShadowSubtree):
(WebCore::BaseDateAndTimeInputType::createShadowSubtreeAndUpdateInnerTextElementEditability):
* html/ColorInputType.h:
* html/ColorInputType.cpp:
(WebCore::ColorInputType::createShadowSubtree):
(WebCore::ColorInputType::createShadowSubtreeAndUpdateInnerTextElementEditability):
* html/FileInputType.h:
* html/FileInputType.cpp:
(WebCore::FileInputType::createShadowSubtree):
(WebCore::FileInputType::createShadowSubtreeAndUpdateInnerTextElementEditability):
* html/InputType.cpp:
(WebCore::InputType::createShadowSubtree):
(WebCore::InputType::createShadowSubtreeAndUpdateInnerTextElementEditability):
* html/RangeInputType.h:
* html/RangeInputType.cpp:
(WebCore::RangeInputType::createShadowSubtree):
(WebCore::RangeInputType::createShadowSubtreeAndUpdateInnerTextElementEditability):
* html/SearchInputType.h:
* html/SearchInputType.cpp:
(WebCore::SearchInputType::createShadowSubtree):
(WebCore::SearchInputType::createShadowSubtreeAndUpdateInnerTextElementEditability):
Renamed createShadowSubtreeAndUpdateInnerTextElementEditability to
createShadowSubtree and remove the "isInnerTextElementEditable"
argument, since we can ask the element() for its value if needed.
createShadowSubtree is now also responsible for creating the shadow
root.

* html/TextFieldInputType.h:
* html/TextFieldInputType.cpp:
(WebCore::TextFieldInputType::createShadowSubtree):
(WebCore::TextFieldInputType::createShadowSubtreeAndUpdateInnerTextElementEditability):
Renamed. Ensure all shadow tree state is up to date now that it can be
created later.

* html/InputType.h:
* html/InputType.cpp:
(WebCore::InputType::createShadowSubtree):
(WebCore::InputType::hasCreatedShadowSubtree const):
New functions to create the shadow subtree if it hasn't been done
already, and to query whether it's been done.

* html/HTMLInputElement.h:
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::innerTextElementCreatingShadowSubtreeIfNeeded):
* html/HTMLTextAreaElement.h:
* html/HTMLTextAreaElement.cpp:
(WebCore::HTMLTextAreaElement::innerTextElementCreatingShadowSubtreeIfNeeded):
* html/HTMLTextFormControlElement.h:
* html/InputType.h:
* html/InputType.cpp:
(WebCore::InputType::innerTextElementCreatingShadowSubtreeIfNeeded):
New functions to first create the shadow subtree before returning
innerTextElement(). HTMLTextAreaElement never lazily creates its
shadow subtree and so just returns innerTextElement().

* html/HTMLInputElement.h:
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::createShadowSubtreeAndUpdateInnerTextElementEditability):
Deleted. Just call through to m_inputType->createShadowTree()
directly.

(WebCore::HTMLInputElement::HTMLInputElement):
(WebCore::HTMLInputElement::create):
(WebCore::HTMLInputElement::initializeInputType):
(WebCore::HTMLInputElement::updateType):
Don't immediately create the shadow tree.

(WebCore::HTMLInputElement::didFinishInsertingNode):
Create the shadow subtree now that the element's been inserted. No
need to call dataListMayHaveChanged since
TextFieldInputType::createShadowSubtree will now do this.

*

[webkit-changes] [290283] trunk

2022-02-21 Thread ysuzuki

Title: [290283] trunk








Revision 290283
Author ysuz...@apple.com
Date 2022-02-21 18:16:28 -0800 (Mon, 21 Feb 2022)


Log Message
[JSC] Fix ShadowRealm unwinding
https://bugs.webkit.org/show_bug.cgi?id=237001

Reviewed by Saam Barati.

JSTests:

* test262/expectations.yaml:

Source/_javascript_Core:

This patch fixes a crash bug found by test262. Regardless of it is RemoteFunction,
we should handle it as the same way to the other normal host functions except
for setting m_seenRemoteFunction = true flag. Previously, we are early returning,
this is wrong since we should stop unwinding if the caller is entry frame.

* interpreter/Interpreter.cpp:
(JSC::UnwindFunctor::operator() const):

Modified Paths

trunk/JSTests/ChangeLog
trunk/JSTests/test262/expectations.yaml
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/interpreter/Interpreter.cpp




Diff

Modified: trunk/JSTests/ChangeLog (290282 => 290283)

--- trunk/JSTests/ChangeLog	2022-02-22 02:12:13 UTC (rev 290282)
+++ trunk/JSTests/ChangeLog	2022-02-22 02:16:28 UTC (rev 290283)
@@ -1,5 +1,14 @@
 2022-02-21  Yusuke Suzuki  
 
+[JSC] Fix ShadowRealm unwinding
+https://bugs.webkit.org/show_bug.cgi?id=237001
+
+Reviewed by Saam Barati.
+
+* test262/expectations.yaml:
+
+2022-02-21  Yusuke Suzuki  
+
 [JSC] Temporal.PlainDate should validate input range
 https://bugs.webkit.org/show_bug.cgi?id=236936
 


Modified: trunk/JSTests/test262/expectations.yaml (290282 => 290283)

--- trunk/JSTests/test262/expectations.yaml	2022-02-22 02:12:13 UTC (rev 290282)
+++ trunk/JSTests/test262/expectations.yaml	2022-02-22 02:16:28 UTC (rev 290283)
@@ -828,8 +828,6 @@
 test/built-ins/ShadowRealm/WrappedFunction/name-throws-typeerror.js:
   default: 'Test262Error: expect a TypeError on name getter throwing Expected a TypeError but got a Error'
   strict mode: 'Test262Error: expect a TypeError on name getter throwing Expected a TypeError but got a Error'
-test/built-ins/ShadowRealm/prototype/evaluate/wrapped-function-proxied-observes-boundary.js:
-  strict mode: 'Bad exit code: 11'
 test/built-ins/ShadowRealm/prototype/evaluate/wrapped-function-throws-typeerror-from-caller-realm.js:
   default: 'Test262Error: throws TypeError if arguments are not wrappable Expected a TypeError but got a different error constructor with the same name'
   strict mode: 'Test262Error: throws TypeError if arguments are not wrappable Expected a TypeError but got a different error constructor with the same name'


Modified: trunk/Source/_javascript_Core/ChangeLog (290282 => 290283)

--- trunk/Source/_javascript_Core/ChangeLog	2022-02-22 02:12:13 UTC (rev 290282)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-02-22 02:16:28 UTC (rev 290283)
@@ -1,5 +1,20 @@
 2022-02-21  Yusuke Suzuki  
 
+[JSC] Fix ShadowRealm unwinding
+https://bugs.webkit.org/show_bug.cgi?id=237001
+
+Reviewed by Saam Barati.
+
+This patch fixes a crash bug found by test262. Regardless of it is RemoteFunction,
+we should handle it as the same way to the other normal host functions except
+for setting m_seenRemoteFunction = true flag. Previously, we are early returning,
+this is wrong since we should stop unwinding if the caller is entry frame.
+
+* interpreter/Interpreter.cpp:
+(JSC::UnwindFunctor::operator() const):
+
+2022-02-21  Yusuke Suzuki  
+
 [JSC] Temporal.PlainDate should validate input range
 https://bugs.webkit.org/show_bug.cgi?id=236936
 


Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (290282 => 290283)

--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp	2022-02-22 02:12:13 UTC (rev 290282)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp	2022-02-22 02:16:28 UTC (rev 290283)
@@ -611,11 +611,10 @@
 }
 #endif
 
-if (!m_callFrame->isWasmFrame() &&  JSC::isRemoteFunction(m_vm, m_callFrame->jsCallee()) && !m_isTermination) {
+if (!m_callFrame->isWasmFrame() && JSC::isRemoteFunction(m_vm, m_callFrame->jsCallee()) && !m_isTermination) {
 // Continue searching for a handler, but mark that a marshalling function was on the stack so that we can
 // translate the exception before jumping to the handler.
 const_cast(this)->m_seenRemoteFunction = true;
-return StackVisitor::Continue;
 }
 
 notifyDebuggerOfUnwinding(m_vm, m_callFrame);






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

[webkit-changes] [290282] trunk

2022-02-21 Thread ysuzuki

Title: [290282] trunk








Revision 290282
Author ysuz...@apple.com
Date 2022-02-21 18:12:13 -0800 (Mon, 21 Feb 2022)


Log Message
[JSC] Temporal.PlainDate should validate input range
https://bugs.webkit.org/show_bug.cgi?id=236936

Reviewed by Darin Adler.

JSTests:

* stress/temporal-plaindate.js:
(shouldThrow):

Source/_javascript_Core:

Implement https://tc39.es/proposal-temporal/#sec-temporal-isodatetimewithinlimits check in
PlainDate to validate input range. For example, 0x7fff year should be rejected since
it is larger than ECMAScript datetime representation value. This is checked via ISODateTimeWithinLimits
in the spec.

We also remove isValid assertions in ExactTime. This should not be checked in these accessors, rather,
we should call that function when we would like to check, since PlainDate can represent a bit smaller
value than ExactTime's minValue (minValue - nsPerDay).

We also extend ExactTime::fromISOPartsAndOffset to handle values via Int128 to accept int32_t range years.
By using Int128 for nanoseconds, we can even represent int32_t max / min years. And we remove
`ASSERT(y >= -99 && y <= 99)` check since this is not necessary.

* runtime/ISO8601.cpp:
(JSC::ISO8601::ExactTime::fromISOPartsAndOffset):
(JSC::ISO8601::isDateTimeWithinLimits):
* runtime/ISO8601.h:
(JSC::ISO8601::ExactTime::ExactTime): Deleted.
(JSC::ISO8601::ExactTime::fromEpochSeconds): Deleted.
(JSC::ISO8601::ExactTime::fromEpochMilliseconds): Deleted.
(JSC::ISO8601::ExactTime::fromEpochMicroseconds): Deleted.
(JSC::ISO8601::ExactTime::epochSeconds const): Deleted.
(JSC::ISO8601::ExactTime::epochMilliseconds const): Deleted.
(JSC::ISO8601::ExactTime::epochMicroseconds const): Deleted.
(JSC::ISO8601::ExactTime::epochNanoseconds const): Deleted.
(JSC::ISO8601::ExactTime::nanosecondsFraction const): Deleted.
(JSC::ISO8601::ExactTime::asString const): Deleted.
(JSC::ISO8601::ExactTime::isValid const): Deleted.
(JSC::ISO8601::ExactTime::operator< const): Deleted.
(JSC::ISO8601::ExactTime::operator<= const): Deleted.
(JSC::ISO8601::ExactTime::operator== const): Deleted.
(JSC::ISO8601::ExactTime::operator!= const): Deleted.
(JSC::ISO8601::ExactTime::operator>= const): Deleted.
(JSC::ISO8601::ExactTime::operator> const): Deleted.
* runtime/TemporalPlainDate.cpp:
(JSC::toPlainDate):

Source/WTF:

Add code to allow dataLog(Int128).

* wtf/Int128.cpp:
(WTF::printInternal):
* wtf/Int128.h:

Modified Paths

trunk/JSTests/ChangeLog
trunk/JSTests/stress/temporal-plaindate.js
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/ISO8601.cpp
trunk/Source/_javascript_Core/runtime/ISO8601.h
trunk/Source/_javascript_Core/runtime/TemporalPlainDate.cpp
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Int128.cpp
trunk/Source/WTF/wtf/Int128.h




Diff

Modified: trunk/JSTests/ChangeLog (290281 => 290282)

--- trunk/JSTests/ChangeLog	2022-02-22 02:01:09 UTC (rev 290281)
+++ trunk/JSTests/ChangeLog	2022-02-22 02:12:13 UTC (rev 290282)
@@ -1,5 +1,15 @@
 2022-02-21  Yusuke Suzuki  
 
+[JSC] Temporal.PlainDate should validate input range
+https://bugs.webkit.org/show_bug.cgi?id=236936
+
+Reviewed by Darin Adler.
+
+* stress/temporal-plaindate.js:
+(shouldThrow):
+
+2022-02-21  Yusuke Suzuki  
+
 [JSC] ShadowRealm wrapArgument should check exceptions
 https://bugs.webkit.org/show_bug.cgi?id=236984
 


Modified: trunk/JSTests/stress/temporal-plaindate.js (290281 => 290282)

--- trunk/JSTests/stress/temporal-plaindate.js	2022-02-22 02:01:09 UTC (rev 290281)
+++ trunk/JSTests/stress/temporal-plaindate.js	2022-02-22 02:12:13 UTC (rev 290282)
@@ -110,6 +110,14 @@
 shouldThrow(() => { new Temporal.PlainDate(2007, -Infinity, 1); }, RangeError);
 shouldThrow(() => { new Temporal.PlainDate(2007, 1, Infinity); }, RangeError);
 shouldThrow(() => { new Temporal.PlainDate(2007, 1, -Infinity); }, RangeError);
+shouldThrow(() => { new Temporal.PlainDate(0x43530, 9, 14); }, RangeError);
+shouldBe(String(new Temporal.PlainDate(0x43530, 9, 13)), `275760-09-13`);
+shouldThrow(() => { new Temporal.PlainDate(-0x425cd, 4, 19); }, RangeError);
+shouldBe(String(new Temporal.PlainDate(-0x425cd, 4, 20)), `-271821-04-20`);
+shouldThrow(() => { new Temporal.PlainDate(0x8000, 1, 1); }, RangeError);
+shouldThrow(() => { new Temporal.PlainDate(-0x8000, 1, 1); }, RangeError);
+shouldThrow(() => { new Temporal.PlainDate(0x7fff, 1, 1); }, RangeError);
+shouldThrow(() => { new Temporal.PlainDate(-0x7fff, 1, 1); }, RangeError);
 
 let failures = [
 "",


Modified: trunk/Source/_javascript_Core/ChangeLog (290281 => 290282)

--- trunk/Source/_javascript_Core/ChangeLog	2022-02-22 02:01:09 UTC (rev 290281)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-02-22 02:12:13 UTC (rev 290282)
@@ -1 +1,45 @@
+2022-02-21  Yusuke Suzuki  
+
+[JSC] Temporal.PlainDate should validate input range
+https://bugs.webkit.org/show_bug.cgi?id=236936
+
+Reviewed by Darin

[webkit-changes] [290281] trunk/LayoutTests

2022-02-21 Thread jonlee

Title: [290281] trunk/LayoutTests








Revision 290281
Author jon...@apple.com
Date 2022-02-21 18:01:09 -0800 (Mon, 21 Feb 2022)


Log Message
Unreviewed gardening for the GPU Process bots.
* css3/color-filters/color-filter-text-decoration-shadow.html:
* fast/gradients/conic-gradient-alpha-unpremultiplied.html:
* fast/gradients/conic-gradient-alpha.html:
* fast/gradients/linear-two-hints-angle.html:
* fast/scrolling/overflow-inside-foreignobject.html:
* gpu-process/TestExpectations:
* imported/blink/svg/custom/crisp-edges-leak.svg:
* platform/ios/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/css3/color-filters/color-filter-text-decoration-shadow.html
trunk/LayoutTests/fast/gradients/conic-gradient-alpha-unpremultiplied.html
trunk/LayoutTests/fast/gradients/conic-gradient-alpha.html
trunk/LayoutTests/fast/gradients/linear-two-hints-angle.html
trunk/LayoutTests/fast/scrolling/overflow-inside-foreignobject.html
trunk/LayoutTests/gpu-process/TestExpectations
trunk/LayoutTests/imported/blink/svg/custom/crisp-edges-leak.svg
trunk/LayoutTests/platform/ios/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (290280 => 290281)

--- trunk/LayoutTests/ChangeLog	2022-02-22 01:48:11 UTC (rev 290280)
+++ trunk/LayoutTests/ChangeLog	2022-02-22 02:01:09 UTC (rev 290281)
@@ -1,5 +1,17 @@
 2022-02-21  Jon Lee  
 
+Unreviewed gardening for the GPU Process bots.
+* css3/color-filters/color-filter-text-decoration-shadow.html:
+* fast/gradients/conic-gradient-alpha-unpremultiplied.html:
+* fast/gradients/conic-gradient-alpha.html:
+* fast/gradients/linear-two-hints-angle.html:
+* fast/scrolling/overflow-inside-foreignobject.html:
+* gpu-process/TestExpectations:
+* imported/blink/svg/custom/crisp-edges-leak.svg:
+* platform/ios/TestExpectations:
+
+2022-02-21  Jon Lee  
+
 Add test name to the image diff template
 https://bugs.webkit.org/show_bug.cgi?id=237003
 


Modified: trunk/LayoutTests/css3/color-filters/color-filter-text-decoration-shadow.html (290280 => 290281)

--- trunk/LayoutTests/css3/color-filters/color-filter-text-decoration-shadow.html	2022-02-22 01:48:11 UTC (rev 290280)
+++ trunk/LayoutTests/css3/color-filters/color-filter-text-decoration-shadow.html	2022-02-22 02:01:09 UTC (rev 290281)
@@ -6,7 +6,7 @@
  
 
-
+

[webkit-changes] [290280] trunk

2022-02-21 Thread jonlee

Title: [290280] trunk








Revision 290280
Author jon...@apple.com
Date 2022-02-21 17:48:11 -0800 (Mon, 21 Feb 2022)


Log Message
Add test name to the image diff template
https://bugs.webkit.org/show_bug.cgi?id=237003

Reviewed by Sam Weinig.

Tools:

* Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
(TestResultWriter.write_image_diff_files):

LayoutTests:

Include the test name in the page. Workflow to update fuzzy match data becomes easier to copy-paste the name there instead of from the location bar.
* fast/harness/image-diff-template-expected.txt:
* fast/harness/image-diff-template.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/harness/image-diff-template-expected.txt
trunk/LayoutTests/fast/harness/image-diff-template.html
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py




Diff

Modified: trunk/LayoutTests/ChangeLog (290279 => 290280)

--- trunk/LayoutTests/ChangeLog	2022-02-22 01:42:45 UTC (rev 290279)
+++ trunk/LayoutTests/ChangeLog	2022-02-22 01:48:11 UTC (rev 290280)
@@ -1 +1,12 @@
+2022-02-21  Jon Lee  
+
+Add test name to the image diff template
+https://bugs.webkit.org/show_bug.cgi?id=237003
+
+Reviewed by Sam Weinig.
+
+Include the test name in the page. Workflow to update fuzzy match data becomes easier to copy-paste the name there instead of from the location bar.
+* fast/harness/image-diff-template-expected.txt:
+* fast/harness/image-diff-template.html:
+
 == Rolled over to ChangeLog-2022-02-22 ==


Modified: trunk/LayoutTests/fast/harness/image-diff-template-expected.txt (290279 => 290280)

--- trunk/LayoutTests/fast/harness/image-diff-template-expected.txt	2022-02-22 01:42:45 UTC (rev 290279)
+++ trunk/LayoutTests/fast/harness/image-diff-template-expected.txt	2022-02-22 01:48:11 UTC (rev 290280)
@@ -1,4 +1,5 @@
 CONSOLE MESSAGE: ReferenceError: Can't find variable: __FUZZY_DATA__
+Test path:	__TEST_NAME__
 Pixel difference:	__PIXEL_DIFF__
 Fuzzy match:	Click to toggle between ranges and values
 	


Modified: trunk/LayoutTests/fast/harness/image-diff-template.html (290279 => 290280)

--- trunk/LayoutTests/fast/harness/image-diff-template.html	2022-02-22 01:42:45 UTC (rev 290279)
+++ trunk/LayoutTests/fast/harness/image-diff-template.html	2022-02-22 01:48:11 UTC (rev 290280)
@@ -59,6 +59,10 @@
 
 
 
+
+Test path:
+__TEST_NAME__
+
 
 Pixel difference:
 __PIXEL_DIFF__


Modified: trunk/Tools/ChangeLog (290279 => 290280)

--- trunk/Tools/ChangeLog	2022-02-22 01:42:45 UTC (rev 290279)
+++ trunk/Tools/ChangeLog	2022-02-22 01:48:11 UTC (rev 290280)
@@ -1 +1,11 @@
+2022-02-21  Jon Lee  
+
+Add test name to the image diff template
+https://bugs.webkit.org/show_bug.cgi?id=237003
+
+Reviewed by Sam Weinig.
+
+* Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
+(TestResultWriter.write_image_diff_files):
+
 == Rolled over to ChangeLog-2022-02-22 ==


Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py (290279 => 290280)

--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py	2022-02-22 01:42:45 UTC (rev 290279)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py	2022-02-22 01:48:11 UTC (rev 290280)
@@ -196,6 +196,7 @@
 image_diff_file = self._filesystem.read_text_file(image_diff_template)
 
 html = image_diff_file.replace('__TITLE__', self._test_name)
+html = html.replace('__TEST_NAME__', self._test_name)
 html = html.replace('__PREFIX__', self._output_testname(''))
 
 if not diff_percent_text:






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

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

2022-02-21 Thread commit-queue

Title: [290279] trunk/Source/WebKit








Revision 290279
Author commit-qu...@webkit.org
Date 2022-02-21 17:42:45 -0800 (Mon, 21 Feb 2022)


Log Message
Fix racy parallel build of WebKit2-4.0.gir
https://bugs.webkit.org/show_bug.cgi?id=232935

Patch by Alexander Kanavin  on 2022-02-21
Reviewed by Michael Catanzaro.

This is a target and not a command because it's used to build another .gir
and a .typelib, which would trigger two racy parallel builds when using command
(e.g. command would run twice, target runs only once).

* PlatformGTK.cmake:

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/PlatformGTK.cmake




Diff

Modified: trunk/Source/WebKit/ChangeLog (290278 => 290279)

--- trunk/Source/WebKit/ChangeLog	2022-02-22 01:37:17 UTC (rev 290278)
+++ trunk/Source/WebKit/ChangeLog	2022-02-22 01:42:45 UTC (rev 290279)
@@ -1,3 +1,16 @@
+2022-02-21  Alexander Kanavin  
+
+Fix racy parallel build of WebKit2-4.0.gir
+https://bugs.webkit.org/show_bug.cgi?id=232935
+
+Reviewed by Michael Catanzaro.
+
+This is a target and not a command because it's used to build another .gir
+and a .typelib, which would trigger two racy parallel builds when using command
+(e.g. command would run twice, target runs only once).
+
+* PlatformGTK.cmake:
+
 2022-02-21  Myles C. Maxfield  
 
 Sort WebCore and WebKit Xcode project files


Modified: trunk/Source/WebKit/PlatformGTK.cmake (290278 => 290279)

--- trunk/Source/WebKit/PlatformGTK.cmake	2022-02-22 01:37:17 UTC (rev 290278)
+++ trunk/Source/WebKit/PlatformGTK.cmake	2022-02-22 01:42:45 UTC (rev 290279)
@@ -670,8 +670,9 @@
 set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}")
 endif ()
 
-add_custom_command(
-OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+# This is a target and not a command because it's used to build another .gir
+# and a .typelib, which would trigger two racy parallel builds when using command
+add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
 DEPENDS WebKit
 DEPENDS ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
@@ -719,7 +720,7 @@
 add_custom_command(
 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
 DEPENDS ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
-DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
 LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
 ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
@@ -781,7 +782,7 @@
 
 add_custom_command(
 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
-DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
 COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
 )
 






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

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

2022-02-21 Thread wenson_hsieh

Title: [290278] trunk/Source/WebCore








Revision 290278
Author wenson_hs...@apple.com
Date 2022-02-21 17:37:17 -0800 (Mon, 21 Feb 2022)


Log Message
Add test coverage for the pasteboard writing codepath added in r289839
https://bugs.webkit.org/show_bug.cgi?id=236944

Reviewed by Aditya Keerthi.

Add test coverage for the changes in r289839 in the case where `ENABLE(IMAGE_ANALYSIS_ENHANCEMENTS)` is turned
on. To do this, we set the platform image analysis results to a new internal mock object,
`FakeImageAnalysisResult`, that returns a string for a given NSRange. This code is then exercised by several
existing layout tests that copy and paste text inside image overlays:

- fast/images/text-recognition/image-overlay-line-wrapping.html
- fast/images/text-recognition/image-overlay-text-without-leading-whitespace.html
- fast/images/text-recognition/mac/copy-image-overlay-text-with-context-menu.html

* testing/Internals.cpp:
(WebCore::Internals::installImageOverlay):
* testing/Internals.h:
* testing/Internals.mm:
(-[FakeImageAnalysisResult initWithString:]):
(-[FakeImageAnalysisResult _attributedStringForRange:]):
(WebCore::Internals::fakeImageAnalysisResultForTesting):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/testing/Internals.cpp
trunk/Source/WebCore/testing/Internals.h
trunk/Source/WebCore/testing/Internals.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (290277 => 290278)

--- trunk/Source/WebCore/ChangeLog	2022-02-22 01:13:21 UTC (rev 290277)
+++ trunk/Source/WebCore/ChangeLog	2022-02-22 01:37:17 UTC (rev 290278)
@@ -1,3 +1,27 @@
+2022-02-21  Wenson Hsieh  
+
+Add test coverage for the pasteboard writing codepath added in r289839
+https://bugs.webkit.org/show_bug.cgi?id=236944
+
+Reviewed by Aditya Keerthi.
+
+Add test coverage for the changes in r289839 in the case where `ENABLE(IMAGE_ANALYSIS_ENHANCEMENTS)` is turned
+on. To do this, we set the platform image analysis results to a new internal mock object,
+`FakeImageAnalysisResult`, that returns a string for a given NSRange. This code is then exercised by several
+existing layout tests that copy and paste text inside image overlays:
+
+- fast/images/text-recognition/image-overlay-line-wrapping.html
+- fast/images/text-recognition/image-overlay-text-without-leading-whitespace.html
+- fast/images/text-recognition/mac/copy-image-overlay-text-with-context-menu.html
+
+* testing/Internals.cpp:
+(WebCore::Internals::installImageOverlay):
+* testing/Internals.h:
+* testing/Internals.mm:
+(-[FakeImageAnalysisResult initWithString:]):
+(-[FakeImageAnalysisResult _attributedStringForRange:]):
+(WebCore::Internals::fakeImageAnalysisResultForTesting):
+
 2022-02-21  Myles C. Maxfield  
 
 Sort WebCore and WebKit Xcode project files


Modified: trunk/Source/WebCore/testing/Internals.cpp (290277 => 290278)

--- trunk/Source/WebCore/testing/Internals.cpp	2022-02-22 01:13:21 UTC (rev 290277)
+++ trunk/Source/WebCore/testing/Internals.cpp	2022-02-22 01:37:17 UTC (rev 290278)
@@ -5876,6 +5876,9 @@
 , blocks.map([] (auto& block) {
 return TextRecognitionBlockData { block.text, getQuad(block) };
 })
+#if ENABLE(IMAGE_ANALYSIS_ENHANCEMENTS)
+, fakeImageAnalysisResultForTesting(lines)
+#endif
 });
 #else
 UNUSED_PARAM(blocks);


Modified: trunk/Source/WebCore/testing/Internals.h (290277 => 290278)

--- trunk/Source/WebCore/testing/Internals.h	2022-02-22 01:13:21 UTC (rev 290277)
+++ trunk/Source/WebCore/testing/Internals.h	2022-02-22 01:37:17 UTC (rev 290278)
@@ -48,6 +48,7 @@
 #endif
 
 OBJC_CLASS DDScannerResult;
+OBJC_CLASS VKCImageAnalysis;
 
 namespace WebCore {
 
@@ -1278,6 +1279,10 @@
 ExceptionOr markerAt(Node&, const String& markerType, unsigned index);
 ExceptionOr scrollableAreaForNode(Node*) const;
 
+#if ENABLE(IMAGE_ANALYSIS_ENHANCEMENTS)
+static RetainPtr fakeImageAnalysisResultForTesting(const Vector&);
+#endif
+
 #if ENABLE(DATA_DETECTION)
 static DDScannerResult *fakeDataDetectorResultForTesting();
 #endif


Modified: trunk/Source/WebCore/testing/Internals.mm (290277 => 290278)

--- trunk/Source/WebCore/testing/Internals.mm	2022-02-22 01:13:21 UTC (rev 290277)
+++ trunk/Source/WebCore/testing/Internals.mm	2022-02-22 01:37:17 UTC (rev 290278)
@@ -46,6 +46,7 @@
 #import 
 #import 
 #import 
+#import 
 
 #if PLATFORM(IOS_FAMILY)
 #import 
@@ -55,6 +56,36 @@
 #import 
 #endif
 
+#import 
+
+#if ENABLE(IMAGE_ANALYSIS_ENHANCEMENTS)
+
+@interface FakeImageAnalysisResult : NSObject
+- (instancetype)initWithString:(NSString *)fullText;
+@end
+
+@implementation FakeImageAnalysisResult {
+RetainPtr _string;
+}
+
+- (instancetype)initWithString:(NSString *)string
+{
+if (!(self = [super init]))
+return nil;
+
+_string = adoptNS([[NSMutableAttributedString alloc] initWithString:string]);
+return self;
+}
+