[webkit-changes] [271607] trunk/Source
Title: [271607] trunk/Source Revision 271607 Author krol...@apple.com Date 2021-01-19 13:09:28 -0800 (Tue, 19 Jan 2021) Log Message Modularize WebKitLegacy.framework https://bugs.webkit.org/show_bug.cgi?id=220026 Reviewed by Darin Adler. Add .modulemap files to WebKitLegacy to help speed up client builds. Source/WebKit: For MigrateHeadersFromWebKitLegacy.make, remove the newly-created umbrella header files from WEBKIT_LEGACY_PRIVATE_HEADERS in order to avoid some processing that the non-umbrella headers receive. * mac/MigrateHeadersFromWebKitLegacy.make: Source/WebKitLegacy: * Modules/WebKitLegacy_iOS.private.modulemap: Added. * Modules/WebKitLegacy_macOS.private.modulemap: Added. * WebKitLegacy.xcodeproj/project.pbxproj: Source/WebKitLegacy/ios: For WebUIKitDelegate.h, ensure that ENABLE_ORIENTATION_EVENTS is defined before checking its value, thereby avoiding a compiler warning-turned-error that an uninitialized symbol is being used. * WebView/WebUIKitDelegate.h: Source/WebKitLegacy/mac: In WebKitLegacy.xcconfig, enable module creation for macOS and iOS. Add the associated umbrella header files, and enable the validation of the module files. For WebHTMLViewPrivate.h, ensure that ENABLE_NETSCAPE_PLUGIN_API is defined before checking its value, thereby avoiding a compiler warning-turned-error that an uninitialized symbol is being used. For WebBackForwardListPrivate.h, make the parameter name in a function comment match the actual parameter name, thereby avoiding a warning-turned-error from the tool that processes headers into built modules. * Configurations/WebKitLegacy.xcconfig: * History/WebBackForwardListPrivate.h: * Misc/WebKitLegacy_Private.h: Added. * Misc/WebKitLegacy_iOS_Private.h: Added. * Misc/WebKitLegacy_macOS_Private.h: Copied from Source/WebKitLegacy/mac/History/WebBackForwardListPrivate.h. * WebView/WebHTMLViewPrivate.h: Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/mac/MigrateHeadersFromWebKitLegacy.make trunk/Source/WebKitLegacy/ChangeLog trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj trunk/Source/WebKitLegacy/ios/ChangeLog trunk/Source/WebKitLegacy/ios/WebView/WebUIKitDelegate.h trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig trunk/Source/WebKitLegacy/mac/History/WebBackForwardListPrivate.h trunk/Source/WebKitLegacy/mac/WebView/WebHTMLViewPrivate.h Added Paths trunk/Source/WebKitLegacy/Modules/ trunk/Source/WebKitLegacy/Modules/WebKitLegacy_iOS.private.modulemap trunk/Source/WebKitLegacy/Modules/WebKitLegacy_macOS.private.modulemap trunk/Source/WebKitLegacy/mac/Misc/WebKitLegacy_Private.h trunk/Source/WebKitLegacy/mac/Misc/WebKitLegacy_iOS_Private.h trunk/Source/WebKitLegacy/mac/Misc/WebKitLegacy_macOS_Private.h Diff Modified: trunk/Source/WebKit/ChangeLog (271606 => 271607) --- trunk/Source/WebKit/ChangeLog 2021-01-19 19:44:51 UTC (rev 271606) +++ trunk/Source/WebKit/ChangeLog 2021-01-19 21:09:28 UTC (rev 271607) @@ -1,3 +1,19 @@ +2021-01-19 Keith Rollin + +Modularize WebKitLegacy.framework +https://bugs.webkit.org/show_bug.cgi?id=220026 + + +Reviewed by Darin Adler. + +Add .modulemap files to WebKitLegacy to help speed up client builds. + +For MigrateHeadersFromWebKitLegacy.make, remove the newly-created +umbrella header files from WEBKIT_LEGACY_PRIVATE_HEADERS in order to +avoid some processing that the non-umbrella headers receive. + +* mac/MigrateHeadersFromWebKitLegacy.make: + 2021-01-19 Chris Dumez Unreviewed, drop remaining main-thread assertion in ShareableBitmap that I missed in r271533. Modified: trunk/Source/WebKit/mac/MigrateHeadersFromWebKitLegacy.make (271606 => 271607) --- trunk/Source/WebKit/mac/MigrateHeadersFromWebKitLegacy.make 2021-01-19 19:44:51 UTC (rev 271606) +++ trunk/Source/WebKit/mac/MigrateHeadersFromWebKitLegacy.make 2021-01-19 21:09:28 UTC (rev 271607) @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007, 2008, 2014 Apple Inc. All rights reserved. +# Copyright (C) 2006, 2007, 2008, 2014, 2021 Apple Inc. All rights reserved. # Copyright (C) 2006 Samuel Weinig # # Redistribution and use in source and binary forms, with or without @@ -203,7 +203,7 @@ WEBKIT_LEGACY_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(filter $(WEBKIT_PUBLIC_HEADERS), $(notdir $(wildcard $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/*.h))) WebKitLegacy.h) -WEBKIT_LEGACY_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out $(WEBKIT_PUBLIC_HEADERS) $(RECENTLY_REMOVED_WEBKIT_LEGACY_PRIVATE_HEADERS) WebKit.h, $(notdir $(wildcard $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/*.h +WEBKIT_LEGACY_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out $(WEBKIT_PUBLIC_HEADERS) $(RECENTLY_REMOVED_WEBKIT_LEGACY_PRIVATE_HEADERS) WebKit.h WebKitLegacy_Private.h WebKitLegacy_iOS_Private.h WebKitLegacy_macOS_Private.h, $(notdir $(wildcard
[webkit-changes] [270315] trunk/Source
Title: [270315] trunk/Source Revision 270315 Author krol...@apple.com Date 2020-12-01 10:39:50 -0800 (Tue, 01 Dec 2020) Log Message Consolidate header postprocessing scripts https://bugs.webkit.org/show_bug.cgi?id=219388 Reviewed by David Kilzer. Our build system contains the following scripts to perform some postprocessing of headers that we export to the SDK: _javascript_Core/postprocess-headers.sh WebKit/mac/postprocess-framework-headers.sh WebKitLegacy/mac/postprocess-headers.sh The preceding scripts are used when using the non-XCBuild -- or "legacy" -- Xcode build system. They are invoked in a custom Run Script build phase after the headers have been exported with the standard Xcode facility for creating frameworks. Alternatively, we also have the following postprocessing scripts: WebKit/Scripts/postprocess-header-rule _javascript_Core/Scripts/postprocess-header-rule WebKitLegacy/scripts/postprocess-header-rule These scripts are used when using the XCBuild build system. They are invoked *during* the header export process to copy and postprocess the headers in one blow. They are part of a Custom Build Rule for exporting files ending in ".h". The reason why we have two sets of scripts is because of the different capabilities of the two Xcode build systems. The legacy system does not support a custom "export header" step that would allow us to copy and postprocess each header in a single step. Therefore, when using the legacy build system, we export in one build step and postprocess in a subsequent build step. And XCBuild doesn't like the approach taken by the old build system where files are exported first and then munged in a separate step, since that confuses its notion of the state of the build ("Hey! That file I exported in the previous build? I see now that it's been changed, so I'm going to export it again. And change its modification date. And then rebuild everything downstream that uses it."). Therefore, XCBuild added a facility for copying and postprocessing in one step. The scripts supporting each of these approaches are very similar to each other, such that there is a lot of code duplication between them. At the same time, by having two sets of scripts that are very similar to each other, we run the risk of "drift", where files in one set may get updated while their counterparts in the other set are not. Address this duplication by making the scripts in the "legacy" set be mere stubs that invoke the scripts in the new "XCBuild" set. In doing this, we also fix a case of drift: the legacy-based scripts made use of a timestamp file to determine if headers needed to be reprocessed and exported, while the XCBuild-based scripts used a "process the files and export them if any actual changes now exist between this new version and any previously-exported version" approach. Along the way, fix a bug in WebKitLegacy's postprocess-header-rule that resulted in WebKitAvailability.h not being processed. The practical effect of this bug is that the file ended up with both macOS and iOS code, along with the #if that controlled which chunk of code was compiled, instead of just the chunk of code specific to the targeted SDK. Normally, the unused chunk of code would get removed through the invocation of `unifdef`. But, because of the bug, the results of running `unifdef` were being discarded. Source/_javascript_Core: * postprocess-headers.sh: Source/WebKit: * mac/postprocess-framework-headers.sh: Source/WebKitLegacy: * scripts/postprocess-header-rule: Source/WebKitLegacy/mac: * postprocess-headers.sh: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/postprocess-headers.sh trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/mac/postprocess-framework-headers.sh trunk/Source/WebKitLegacy/ChangeLog trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/postprocess-headers.sh trunk/Source/WebKitLegacy/scripts/postprocess-header-rule Diff Modified: trunk/Source/_javascript_Core/ChangeLog (270314 => 270315) --- trunk/Source/_javascript_Core/ChangeLog 2020-12-01 18:25:47 UTC (rev 270314) +++ trunk/Source/_javascript_Core/ChangeLog 2020-12-01 18:39:50 UTC (rev 270315) @@ -1,3 +1,73 @@ +2020-12-01 Keith Rollin + +Consolidate header postprocessing scripts +https://bugs.webkit.org/show_bug.cgi?id=219388 + + +Reviewed by David Kilzer. + +Our build system contains the following scripts to perform some +postprocessing of headers that we export to the SDK: + +_javascript_Core/postprocess-headers.sh +WebKit/mac/postprocess-framework-headers.sh +WebKitLegacy/mac/postprocess-headers.sh + +The preceding scripts are used when using the non-XCBuild -- or +"legacy" -- Xcode build system. They are invoked in a custom Run +Script build phase after the headers have been exported with the +standard Xcode
[webkit-changes] [269991] trunk/Tools
Title: [269991] trunk/Tools Revision 269991 Author krol...@apple.com Date 2020-11-18 14:48:09 -0800 (Wed, 18 Nov 2020) Log Message Extend check-for-inappropriate-files-in-framework to check for .tmp files https://bugs.webkit.org/show_bug.cgi?id=219064 Reviewed by Alexey Proskuryakov. Some *.tmp files that were generated from post-processing header files were appearing in *.framework/Headers directories. The problem doesn't seem to be occurring any more, but update check-for-inappropriate-files-in-framework to catch it if it does again. * Scripts/check-for-inappropriate-files-in-framework: Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/check-for-inappropriate-files-in-framework Diff Modified: trunk/Tools/ChangeLog (269990 => 269991) --- trunk/Tools/ChangeLog 2020-11-18 22:44:44 UTC (rev 269990) +++ trunk/Tools/ChangeLog 2020-11-18 22:48:09 UTC (rev 269991) @@ -1,3 +1,19 @@ +2020-11-18 Keith Rollin + +Extend check-for-inappropriate-files-in-framework to check for .tmp files +https://bugs.webkit.org/show_bug.cgi?id=219064 + + +Reviewed by Alexey Proskuryakov. + +Some *.tmp files that were generated from post-processing header files +were appearing in *.framework/Headers directories. The problem doesn't +seem to be occurring any more, but update +check-for-inappropriate-files-in-framework to catch it if it does +again. + +* Scripts/check-for-inappropriate-files-in-framework: + 2020-11-18 Jonathan Bedard [webkitpy] Respect --result-report-flavor on device ports Modified: trunk/Tools/Scripts/check-for-inappropriate-files-in-framework (269990 => 269991) --- trunk/Tools/Scripts/check-for-inappropriate-files-in-framework 2020-11-18 22:44:44 UTC (rev 269990) +++ trunk/Tools/Scripts/check-for-inappropriate-files-in-framework 2020-11-18 22:48:09 UTC (rev 269991) @@ -28,10 +28,21 @@ is_shallow_bundle = (ENV['SHALLOW_BUNDLE'] || "NO").upcase == "YES" $INAPPROPRIATE_FILES = { - "_javascript_Core" => { "Resources" => ["*.txt", "*.in", "*.idl", "*.h"] }, - "WebCore" => { "Resources" => ["*.txt", "*.in", "*.idl", "*.h"] }, - "WebKitLegacy"=> { "Resources" => ["*.txt", "*.in", "*.idl", "*.h"] }, - "WebKit" => { "Resources" => ["*.txt", "*.in", "*.idl", "*.h"] }, + "_javascript_Core" => { +"Headers" => ["*.tmp"], +"Resources" => ["*.txt", "*.in", "*.idl", "*.h"], + }, + "WebCore" => { +"Resources" => ["*.txt", "*.in", "*.idl", "*.h"], + }, + "WebKitLegacy" => { +"Headers" => ["*.tmp"], +"Resources" => ["*.txt", "*.in", "*.idl", "*.h"], + }, + "WebKit" => { +"Headers" => ["*.tmp"], +"Resources" => ["*.txt", "*.in", "*.idl", "*.h"], + }, } Dir.chdir base_directory ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [269347] trunk/Source/WebCore
Title: [269347] trunk/Source/WebCore Revision 269347 Author krol...@apple.com Date 2020-11-03 17:13:04 -0800 (Tue, 03 Nov 2020) Log Message Include path in generated IDL dependencies https://bugs.webkit.org/show_bug.cgi?id=218480 Reviewed by Brent Fulgham. Changes in Bug 218378 and Bug 217696 have lessened the reliance on VPATH to find files. This means that more places need to be explicit about the locations of their files. This change updates preprocess-idls.pl to include full- and partial-paths when generating dependency information. No new tests -- this is a build system change. * bindings/scripts/preprocess-idls.pl: (RemovePWD): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl Diff Modified: trunk/Source/WebCore/ChangeLog (269346 => 269347) --- trunk/Source/WebCore/ChangeLog 2020-11-04 00:30:34 UTC (rev 269346) +++ trunk/Source/WebCore/ChangeLog 2020-11-04 01:13:04 UTC (rev 269347) @@ -1,3 +1,21 @@ +2020-11-03 Keith Rollin + +Include path in generated IDL dependencies +https://bugs.webkit.org/show_bug.cgi?id=218480 + +Reviewed by Brent Fulgham. + +Changes in Bug 218378 and Bug 217696 have lessened the reliance on +VPATH to find files. This means that more places need to be explicit +about the locations of their files. This change updates +preprocess-idls.pl to include full- and partial-paths when generating +dependency information. + +No new tests -- this is a build system change. + +* bindings/scripts/preprocess-idls.pl: +(RemovePWD): + 2020-11-03 Dean Jackson Link against the ANGLE Shared Library Modified: trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl (269346 => 269347) --- trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl 2020-11-04 00:30:34 UTC (rev 269346) +++ trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl 2020-11-04 01:13:04 UTC (rev 269347) @@ -295,12 +295,33 @@ } WriteFileIfChanged($supplementalDependencyFile, $dependencies); +sub RemoveWellKnownPrefix +{ +my $path = shift; + +chomp(my $pwd = `pwd`); +my $srcroot = $ENV{'SRCROOT'}; +my $sdkroot = $ENV{'SDKROOT'}; +my $built_products_dir = $ENV{'BUILT_PRODUCTS_DIR'}; + +if ($srcroot and $sdkroot and $built_products_dir) { +$path =~ s/^${pwd}/./; +$path =~ s/^${srcroot}/WebCore/; +$path =~ s/^${sdkroot}/\$(SDKROOT)/; +$path =~ s/^${built_products_dir}/\$(BUILT_PRODUCTS_DIR)/; +} else { +$path = basename($path); +} + +return $path; +} + if ($supplementalMakefileDeps) { my $makefileDeps = "# Supplemental dependencies\n"; foreach my $idlFilePath (sort keys %supplementals) { my $basename = $idlFilePathToInterfaceName{$idlFilePath}; -my @dependencyList = map { basename($_) } @{$supplementals{$idlFilePath}}; +my @dependencyList = map { RemoveWellKnownPrefix($_) } @{$supplementals{$idlFilePath}}; my @dependencies = sort(keys %{{ map{$_=>1}@dependencyList}}); $makefileDeps .= "JS${basename}.h: @{dependencies}\n"; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [269310] trunk
Title: [269310] trunk Revision 269310 Author krol...@apple.com Date 2020-11-03 09:52:29 -0800 (Tue, 03 Nov 2020) Log Message Extend check-for-inappropriate-files-in-framework to WebKitLegacy and _javascript_Core https://bugs.webkit.org/show_bug.cgi?id=218272 Reviewed by Simon Fraser. Bug 218268 reports that some *.txt files got included in WebKitLegacy. To help protect against this happening in the future, extend check-for-inappropriate-files-in-framework to check for *.txt files, and apply the script to WebKitLegacy and _javascript_Core in addition to WebCore and WebKit. Source/_javascript_Core: * _javascript_Core.xcodeproj/project.pbxproj: Source/WebKitLegacy: In order to prevent this change from breaking local engineering builds that still have these files in their build output directories, add a couple of lines that will delete those *.txt files before making the check for them. * WebKitLegacy.xcodeproj/project.pbxproj: Tools: * Scripts/check-for-inappropriate-files-in-framework: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj trunk/Source/WebKitLegacy/ChangeLog trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj trunk/Tools/ChangeLog trunk/Tools/Scripts/check-for-inappropriate-files-in-framework Diff Modified: trunk/Source/_javascript_Core/ChangeLog (269309 => 269310) --- trunk/Source/_javascript_Core/ChangeLog 2020-11-03 17:37:43 UTC (rev 269309) +++ trunk/Source/_javascript_Core/ChangeLog 2020-11-03 17:52:29 UTC (rev 269310) @@ -1,3 +1,19 @@ +2020-11-03 Keith Rollin + +Extend check-for-inappropriate-files-in-framework to WebKitLegacy and _javascript_Core +https://bugs.webkit.org/show_bug.cgi?id=218272 + + +Reviewed by Simon Fraser. + +Bug 218268 reports that some *.txt files got included in WebKitLegacy. +To help protect against this happening in the future, extend +check-for-inappropriate-files-in-framework to check for *.txt files, +and apply the script to WebKitLegacy and _javascript_Core in addition to +WebCore and WebKit. + +* _javascript_Core.xcodeproj/project.pbxproj: + 2020-11-03 Don Olmstead [CMake] Add remote inspector platforms Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (269309 => 269310) --- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2020-11-03 17:37:43 UTC (rev 269309) +++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2020-11-03 17:52:29 UTC (rev 269310) @@ -10819,6 +10819,7 @@ 932F5BD20822A1C700736975 /* Frameworks */, 5D29D8BE0E9860B400C3D2D0 /* Check For Weak VTables and Externals */, 3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */, +532424B0254905D900A6975B /* Check For Inappropriate Files In Framework */, A55DEAA416703DF7003DB841 /* Check For Inappropriate Macros in External Headers */, 1A02D9A81B34A882000D1522 /* Add Symlink in /System/Library/PrivateFrameworks */, 53609F9021DFFA9C008FA60A /* Check .xcfilelists */, @@ -11025,6 +11026,24 @@ shellPath = /bin/sh; shellScript = "set -e\n\nif [[ -f \"${BUILT_PRODUCTS_DIR}/libWTF.a\" ]]; then\nln -s -f -h \"${BUILT_PRODUCTS_DIR}/libWTF.a\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core/libWTF.a\"\nelse\nln -s -f -h \"${SDK_DIR}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/lib/libWTF.a\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core/libWTF.a\"\nfi\n"; }; + 532424B0254905D900A6975B /* Check For Inappropriate Files In Framework */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Check For Inappropriate Files In Framework"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\nexit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-files-in-framework ]; then\n../../Tools/Scripts/check-for-inappropriate-files-in-framework || exit $?\nfi\n"; + }; 5325BDC521DFF2BA00A0DEE1 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; Modified: trunk/Source/WebKitLegacy/ChangeLog (269309 => 269310) --- trunk/Source/WebKitLegacy/ChangeLog 2020-11-03 17:37:43 UTC (rev 269309) +++ trunk/Source/WebKitLegacy/ChangeLog 2020-11-03 17:52:29 UTC (rev 269310) @@ -1,3 +1,24 @@ +2020-11-03 Keith Rollin + +Extend check-for-inappropriate-files-in-framework to WebKitLegacy and _javascript_Core +https://bugs.webkit.org/show_bug.cgi?id=218272 + + +Reviewed by Simon Fraser. + +Bug 218268 reports that some *.txt files got included in WebKitLegacy. +To
[webkit-changes] [269206] trunk/Source/WebCore
Title: [269206] trunk/Source/WebCore Revision 269206 Author krol...@apple.com Date 2020-10-30 13:34:29 -0700 (Fri, 30 Oct 2020) Log Message Further lessen reliance on VPATH in WebCore/DerivedSources.make https://bugs.webkit.org/show_bug.cgi?id=218378 Reviewed by Darin Adler. Bug 217696 updated WebCore/DerivedSources.make to rely less on VPATH and make more use of explicit partial or full paths. The solution there, however, did not go far enough, and led to failures when building WebKit for Safari Tech Preview and using old SDKs that contains files that have since been "upstreamed" into WebKit. Address this problem by taking further control of how DerivedSources.make finds needed files instead of using the VPATH mechanism. No new tests -- this is a build fix. * DerivedSources.make: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/DerivedSources.make Diff Modified: trunk/Source/WebCore/ChangeLog (269205 => 269206) --- trunk/Source/WebCore/ChangeLog 2020-10-30 20:32:08 UTC (rev 269205) +++ trunk/Source/WebCore/ChangeLog 2020-10-30 20:34:29 UTC (rev 269206) @@ -1,3 +1,23 @@ +2020-10-30 Keith Rollin + +Further lessen reliance on VPATH in WebCore/DerivedSources.make +https://bugs.webkit.org/show_bug.cgi?id=218378 + + +Reviewed by Darin Adler. + +Bug 217696 updated WebCore/DerivedSources.make to rely less on VPATH +and make more use of explicit partial or full paths. The solution +there, however, did not go far enough, and led to failures when +building WebKit for Safari Tech Preview and using old SDKs that +contains files that have since been "upstreamed" into WebKit. Address +this problem by taking further control of how DerivedSources.make +finds needed files instead of using the VPATH mechanism. + +No new tests -- this is a build fix. + +* DerivedSources.make: + 2020-10-30 Fujii Hironori [TextureMapper] Replica layers don't blend correctly because computeOverlapRegions doesn't take TextureMapperPaintOptions::transform into account Modified: trunk/Source/WebCore/DerivedSources.make (269205 => 269206) --- trunk/Source/WebCore/DerivedSources.make 2020-10-30 20:32:08 UTC (rev 269205) +++ trunk/Source/WebCore/DerivedSources.make 2020-10-30 20:34:29 UTC (rev 269206) @@ -49,7 +49,7 @@ # -JS_BINDING_IDLS = \ +JS_BINDING_IDLS := \ $(WebCore)/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl \ $(WebCore)/Modules/applepay/ApplePayCancelEvent.idl \ $(WebCore)/Modules/applepay/ApplePayContactField.idl \ @@ -316,13 +316,13 @@ $(WebCore)/Modules/speech/SpeechSynthesisEvent.idl \ $(WebCore)/Modules/speech/SpeechSynthesisUtterance.idl \ $(WebCore)/Modules/speech/SpeechSynthesisVoice.idl \ - $(WebCore)/Modules/speech/SpeechRecognition.idl \ - $(WebCore)/Modules/speech/SpeechRecognitionAlternative.idl \ - $(WebCore)/Modules/speech/SpeechRecognitionErrorCode.idl \ - $(WebCore)/Modules/speech/SpeechRecognitionErrorEvent.idl \ - $(WebCore)/Modules/speech/SpeechRecognitionEvent.idl \ - $(WebCore)/Modules/speech/SpeechRecognitionResult.idl \ - $(WebCore)/Modules/speech/SpeechRecognitionResultList.idl \ +$(WebCore)/Modules/speech/SpeechRecognition.idl \ +$(WebCore)/Modules/speech/SpeechRecognitionAlternative.idl \ +$(WebCore)/Modules/speech/SpeechRecognitionErrorCode.idl \ +$(WebCore)/Modules/speech/SpeechRecognitionErrorEvent.idl \ +$(WebCore)/Modules/speech/SpeechRecognitionEvent.idl \ +$(WebCore)/Modules/speech/SpeechRecognitionResult.idl \ +$(WebCore)/Modules/speech/SpeechRecognitionResultList.idl \ $(WebCore)/Modules/streams/ByteLengthQueuingStrategy.idl \ $(WebCore)/Modules/streams/CountQueuingStrategy.idl \ $(WebCore)/Modules/streams/ReadableByteStreamController.idl \ @@ -1296,38 +1296,40 @@ -include WebCoreDerivedSourcesAdditions.make -# Convert the IDLs in ADDITIONAL_BINDING_IDLS -- which are just bare names -# -- into full paths. We want to look for the IDL files in the set of paths -# given in ADDITIONAL_BINDING_IDLS_PATHS, preferring the order in which the -# paths are specified. +# Convert the "bare" IDL names in ADDITIONAL_BINDING_IDLS to full paths by +# looking for those files in the expected locations: in /usr/local/include in +# the build output directory, in /usr/local/include in the SDK, or in any of +# the paths indicated in JS_BINDING_IDLS. # -# We perform this conversions by taking each IDL from ADDITIONAL_BINDING_IDLS -# in turn. For each one, prepend it with the paths in -# ADDITIONAL_BINDING_IDLS_PATHS. Then pass those paths for that single IDL to -# $(realpath) in order to evaluate their existence. Take the resulting list -# (which should have 1..N items in it, depending on the number of directories -# in ADDITIONAL_BINDING_IDLS_PATHS and the existence of the IDL file at each -# location) and pick the first one. That will be the path we use for
[webkit-changes] [269093] trunk/Source/WebKitLegacy
Title: [269093] trunk/Source/WebKitLegacy Revision 269093 Author krol...@apple.com Date 2020-10-27 19:25:56 -0700 (Tue, 27 Oct 2020) Log Message Unexpected txt file: .../WebKitLegacy.framework/.../Sources.txt https://bugs.webkit.org/show_bug.cgi?id=218268 Reviewed by Tim Horton. Sources.txt and SourcesCocoa.txt were added to the WebKitLegacy project in https://trac.webkit.org/changeset/247401 as targets of the WebKitLegacy target. This caused them to be treated as resources and so were copied to the framework's Resources directory on a build. These files don't need to be included in the build, and so are removed from that target. * WebKitLegacy.xcodeproj/project.pbxproj: Modified Paths trunk/Source/WebKitLegacy/ChangeLog trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj Diff Modified: trunk/Source/WebKitLegacy/ChangeLog (269092 => 269093) --- trunk/Source/WebKitLegacy/ChangeLog 2020-10-28 02:09:17 UTC (rev 269092) +++ trunk/Source/WebKitLegacy/ChangeLog 2020-10-28 02:25:56 UTC (rev 269093) @@ -1,3 +1,20 @@ +2020-10-27 Keith Rollin + +Unexpected txt file: .../WebKitLegacy.framework/.../Sources.txt +https://bugs.webkit.org/show_bug.cgi?id=218268 + + +Reviewed by Tim Horton. + +Sources.txt and SourcesCocoa.txt were added to the WebKitLegacy +project in https://trac.webkit.org/changeset/247401 as targets of the +WebKitLegacy target. This caused them to be treated as resources and +so were copied to the framework's Resources directory on a build. +These files don't need to be included in the build, and so are removed +from that target. + +* WebKitLegacy.xcodeproj/project.pbxproj: + 2020-10-17 Sam Weinig [Preferences] Add infrastructure for generating preferences for Windows WebKitLegacy Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (269092 => 269093) --- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2020-10-28 02:09:17 UTC (rev 269092) +++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2020-10-28 02:25:56 UTC (rev 269093) @@ -171,8 +171,6 @@ 598ADA461202275000ABAE4E /* WebDeviceOrientationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 598ADA451202275000ABAE4E /* WebDeviceOrientationProvider.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5C40CD2122D8F9C000E9DAD5 /* PopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C01CB82173435C900C5D807 /* PopupMenuMac.mm */; }; 5C40CDD8F9C300E9DAD5 /* SearchPopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C01CB84173435C900C5D807 /* SearchPopupMenuMac.mm */; }; - 5C9D925A22D7E8AD008E9266 /* Sources.txt in Resources */ = {isa = PBXBuildFile; fileRef = 5C9D925822D7E8AD008E9266 /* Sources.txt */; }; - 5C9D925B22D7E8AD008E9266 /* SourcesCocoa.txt in Resources */ = {isa = PBXBuildFile; fileRef = 5C9D925922D7E8AD008E9266 /* SourcesCocoa.txt */; }; 5C9EF2F521F061BE003BDC56 /* PageStorageSessionProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C9EF2F421F061BE003BDC56 /* PageStorageSessionProvider.h */; }; 5CA46E7821F1451D00CE86B4 /* NetworkStorageSessionMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CA46E7621F1451D00CE86B4 /* NetworkStorageSessionMap.h */; }; 5CE44F4A206D70EA003EFD01 /* PingHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE44F49206D70E9003EFD01 /* PingHandle.h */; }; @@ -3277,8 +3275,6 @@ 7CCE766B25223BC8003C7BD2 /* generate-preferences.sh in Resources */, A1382CDF24B15A51001645B0 /* LaBanquePostaleQuirks.js in Resources */, 29AEF960134C76FB00FE5096 /* OutlookQuirksUserScript.js in Resources */, -5C9D925A22D7E8AD008E9266 /* Sources.txt in Resources */, -5C9D925B22D7E8AD008E9266 /* SourcesCocoa.txt in Resources */, 939810B70824BF01008DF038 /* url_icon.tiff in Resources */, 939810B50824BF01008DF038 /* WebAuthenticationPanel.xib in Resources */, 5DE83A7A0D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.xib in Resources */, ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [269076] trunk
Title: [269076] trunk Revision 269076 Author krol...@apple.com Date 2020-10-27 14:54:25 -0700 (Tue, 27 Oct 2020) Log Message Fix "usage" message when invoking `ar -V` https://bugs.webkit.org/show_bug.cgi?id=218255 Reviewed by Fujii Hironori. The Mac/BSD version of `ar` does not support the -V flag. This flag is used unconditionally in OptionsCommon.cmake when trying to determine if the installed `ar` supports the thinning of archives, leading to a "usage" message being emitted on macOS. Avoid this message by capturing the error-output. Examine the output to see if it's a "usage" message. If so, then treat the `ar` as one that does not support thinning. Any other error-output is printed as a warning. If there is no error-output, continue processing as normal. * Source/cmake/OptionsCommon.cmake: Modified Paths trunk/ChangeLog trunk/Source/cmake/OptionsCommon.cmake Diff Modified: trunk/ChangeLog (269075 => 269076) --- trunk/ChangeLog 2020-10-27 21:49:38 UTC (rev 269075) +++ trunk/ChangeLog 2020-10-27 21:54:25 UTC (rev 269076) @@ -1,3 +1,23 @@ +2020-10-27 Keith Rollin + +Fix "usage" message when invoking `ar -V` +https://bugs.webkit.org/show_bug.cgi?id=218255 + + +Reviewed by Fujii Hironori. + +The Mac/BSD version of `ar` does not support the -V flag. This flag is +used unconditionally in OptionsCommon.cmake when trying to determine +if the installed `ar` supports the thinning of archives, leading to a +"usage" message being emitted on macOS. + +Avoid this message by capturing the error-output. Examine the output +to see if it's a "usage" message. If so, then treat the `ar` as one +that does not support thinning. Any other error-output is printed as a +warning. If there is no error-output, continue processing as normal. + +* Source/cmake/OptionsCommon.cmake: + 2020-10-27 Brian Burg Web Inspector: add ENABLE(INSPECTOR_EXTENSIONS) to feature defines Modified: trunk/Source/cmake/OptionsCommon.cmake (269075 => 269076) --- trunk/Source/cmake/OptionsCommon.cmake 2020-10-27 21:49:38 UTC (rev 269075) +++ trunk/Source/cmake/OptionsCommon.cmake 2020-10-27 21:54:25 UTC (rev 269076) @@ -7,8 +7,13 @@ option(USE_THIN_ARCHIVES "Produce all static libraries as thin archives" ON) if (USE_THIN_ARCHIVES) -execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION) -if ("${AR_VERSION}" MATCHES "^GNU ar") +execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION ERROR_VARIABLE AR_ERROR) +if ("${AR_ERROR}" MATCHES "^usage:") +# This `ar` doesn't understand "-V". Ignore the error and treat this as +# an unsupported `ar`. TODO: Determine BSD or Xcode equivalent. +elseif ("${AR_ERROR}") +message(WARNING "Error from `ar`: ${AR_ERROR}") +elseif ("${AR_VERSION}" MATCHES "^GNU ar") set(CMAKE_CXX_ARCHIVE_CREATE " crT ") set(CMAKE_C_ARCHIVE_CREATE " crT ") set(CMAKE_CXX_ARCHIVE_APPEND " rT ") ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [269063] trunk/Tools
Title: [269063] trunk/Tools Revision 269063 Author krol...@apple.com Date 2020-10-27 12:33:13 -0700 (Tue, 27 Oct 2020) Log Message Update generate_xcfilelists to accommodate paths with symlinks https://bugs.webkit.org/show_bug.cgi?id=218223 Reviewed by Timothy Hatcher. There are cases where file system paths are compared against each other, and where the comparisons are failing because one or the other (or both) make use of symlinks, causing paths that refer to the same location to fail to compare correctly. Address this by resolving path components that are symlinks. * Scripts/webkitpy/generate_xcfilelists_lib/generators.py: (BaseGenerator): (BaseGenerator._unexpand): (BaseGenerator._unexpand._expand_if_abs): (BaseGenerator._unexpand._variations): (BaseGenerator._unexpand._variations._gen): (BaseGenerator._unexpand._try_unexpand): (BaseGenerator._unexpand._do_unexpand): Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py Diff Modified: trunk/Tools/ChangeLog (269062 => 269063) --- trunk/Tools/ChangeLog 2020-10-27 19:17:43 UTC (rev 269062) +++ trunk/Tools/ChangeLog 2020-10-27 19:33:13 UTC (rev 269063) @@ -1,3 +1,26 @@ +2020-10-27 Keith Rollin + +Update generate_xcfilelists to accommodate paths with symlinks +https://bugs.webkit.org/show_bug.cgi?id=218223 + + +Reviewed by Timothy Hatcher. + +There are cases where file system paths are compared against each +other, and where the comparisons are failing because one or the other +(or both) make use of symlinks, causing paths that refer to the same +location to fail to compare correctly. Address this by resolving path +components that are symlinks. + +* Scripts/webkitpy/generate_xcfilelists_lib/generators.py: +(BaseGenerator): +(BaseGenerator._unexpand): +(BaseGenerator._unexpand._expand_if_abs): +(BaseGenerator._unexpand._variations): +(BaseGenerator._unexpand._variations._gen): +(BaseGenerator._unexpand._try_unexpand): +(BaseGenerator._unexpand._do_unexpand): + 2020-10-27 Carlos Alberto Lopez Perez [GTK] Don't disable MSE build support on Debian and Ubuntu LTS bots Modified: trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py (269062 => 269063) --- trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py 2020-10-27 19:17:43 UTC (rev 269062) +++ trunk/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py 2020-10-27 19:33:13 UTC (rev 269063) @@ -55,6 +55,7 @@ from __future__ import print_function +import itertools import os import pickle import re @@ -349,14 +350,85 @@ # Utility for post-processing the initial .xcfilelist content. Used to # replace file path segments with the variables that represent those path # segments. +# +# The way we approach this gets a little involved. The straightforward +# approach would be to fetch the value (a file system path) of the given +# environment variable, and then replace that path with the variable name +# in each of the given lines if the particular line is prefixed with that +# path. So, for instance, converting: +# +# /Volumes/Data/dev/webkit/OpenSource/WebKitBuild/Debug/DerivedSources/_javascript_Core/ErrorPrototype.lut.h +# +# to: +# +# $(BUILT_PRODUCTS_DIR)/DerivedSources/_javascript_Core/ErrorPrototype.lut.h +# +# However, there are issues with symlinks messing up that prefix matching. +# It's possible for the entries in "lines" to contain fully resolved paths, +# while the variable contains a path that has components that are symlinks. +# These symlinks need to be resolved before the prefix matching can be +# performed. That is, if BUILT_PRODUCTS_DIR contained +# "/Users/Me/webkit/OpenSource/WebKitBuild/Debug", we would need to first +# resolve that to "/Volumes/Data/dev/webkit/OpenSource/WebKitBuild/Debug" +# before trying to replace it in any lines that are prefixed with it. +# +# Further, it's not always the case that the entries in "lines" contain +# fully-resolved paths. For instance, some of them may refer to something +# like .PrivateHeaders, which may be a symlink in a non-shallow +# framework. If an incoming replacement value referred to that +# PrivateHeaders directory, after being resolved, it now refers to the +# versioned location (that is, /Versions/A/PrivateHeaders), and +# will no longer match a path expressed in terms of +# .PrivateHeaders. This means that each entry in "lines" also +# needs to be fully resolved. +# +# And, yet, there's still a wrinkle. Sometimes we *don't* want to expand +# the paths in "lines". An example of this occurs in DumpRenderTree, where +# we wanted to convert: +# +#
[webkit-changes] [268991] trunk
Title: [268991] trunk Revision 268991 Author krol...@apple.com Date 2020-10-26 12:54:45 -0700 (Mon, 26 Oct 2020) Log Message Move some initialization code from top-level CMakeLists.txt to WebKitCommon.cmake https://bugs.webkit.org/show_bug.cgi?id=218069 Reviewed by Fujii Hironori. Moving this initialization code into a central location allows other top-level CMakeLists.txt files to include WebKitCommon.cmake and get that same initialization. * CMakeLists.txt: * Source/cmake/WebKitCommon.cmake: Modified Paths trunk/CMakeLists.txt trunk/ChangeLog trunk/Source/cmake/WebKitCommon.cmake Diff Modified: trunk/CMakeLists.txt (268990 => 268991) --- trunk/CMakeLists.txt 2020-10-26 18:41:09 UTC (rev 268990) +++ trunk/CMakeLists.txt 2020-10-26 19:54:45 UTC (rev 268991) @@ -1,175 +1,18 @@ # - # Determine CMake version and build type. # - -# # NOTE: cmake_minimum_required() and project() *MUST* be the two first commands # used, see https://cmake.org/cmake/help/v3.3/command/project.html -- the # latter in particular handles loading a bunch of shared CMake definitions # and loading the cross-compilation settings from CMAKE_TOOLCHAIN_FILE. # - cmake_minimum_required(VERSION 3.10) - project(WebKit) -if (NOT CMAKE_BUILD_TYPE) -message(WARNING "No CMAKE_BUILD_TYPE value specified, defaulting to RelWithDebInfo.") -set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build." FORCE) -else () -message(STATUS "The CMake build type is: ${CMAKE_BUILD_TYPE}") -endif () - -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake") - -set(ENABLE_WEBCORE ON) - -if (NOT DEFINED ENABLE_WEBKIT) -set(ENABLE_WEBKIT ON) -endif () - -if (NOT DEFINED ENABLE_TOOLS AND EXISTS "${CMAKE_SOURCE_DIR}/Tools") -set(ENABLE_TOOLS ON) -endif () - -if (NOT DEFINED ENABLE_WEBINSPECTORUI) -set(ENABLE_WEBINSPECTORUI ON) -endif () - # - -# Determine which port will be built -# - -set(ALL_PORTS -AppleWin -Efl -FTW -GTK -JSCOnly -Mac -PlayStation -WPE -WinCairo -) -set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})") - -list(FIND ALL_PORTS ${PORT} RET) -if (${RET} EQUAL -1) -message(FATAL_ERROR "Please choose which WebKit port to build (one of ${ALL_PORTS})") -endif () - -string(TOLOWER ${PORT} WEBKIT_PORT_DIR) - -# - -# Determine the compiler -# - -if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang") -set(COMPILER_IS_CLANG ON) -endif () - -if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") -if (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "7.3.0") -message(FATAL_ERROR "GCC 7.3 or newer is required to build WebKit. Use a newer GCC version or Clang.") -endif () -endif () - -if (CMAKE_COMPILER_IS_GNUCXX OR COMPILER_IS_CLANG) -set(COMPILER_IS_GCC_OR_CLANG ON) -endif () - -if (MSVC AND COMPILER_IS_CLANG) -set(COMPILER_IS_CLANG_CL ON) -endif () - -# - -# Determine the target processor -# - -# Use MSVC_CXX_ARCHITECTURE_ID instead of CMAKE_SYSTEM_PROCESSOR when defined, -# since the later one just resolves to the host processor on Windows. -if (MSVC_CXX_ARCHITECTURE_ID) -string(TOLOWER ${MSVC_CXX_ARCHITECTURE_ID} LOWERCASE_CMAKE_SYSTEM_PROCESSOR) -else () -string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR) -endif () -if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^aarch64|^arm64)") -set(WTF_CPU_ARM64 1) -elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") -set(WTF_CPU_ARM 1) -elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64") -set(WTF_CPU_MIPS64 1) -elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") -set(WTF_CPU_MIPS 1) -elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)") -# FORCE_32BIT is set in the build script when --32-bit is passed -# on a Linux/intel 64bit host. This allows us to produce 32bit -# binaries without setting the build up as a crosscompilation, -# which is the only way to modify CMAKE_SYSTEM_PROCESSOR. -if (FORCE_32BIT) -set(WTF_CPU_X86 1) -else () -set(WTF_CPU_X86_64 1) -endif () -elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)") -set(WTF_CPU_X86 1) -elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc") -set(WTF_CPU_PPC 1) -elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") -
[webkit-changes] [268566] trunk/Source/WebCore
Title: [268566] trunk/Source/WebCore Revision 268566 Author krol...@apple.com Date 2020-10-15 18:01:22 -0700 (Thu, 15 Oct 2020) Log Message Lessen the reliance on VPATH in WebCore/DerivedSources.make https://bugs.webkit.org/show_bug.cgi?id=217696 Reviewed by Darin Adler. Due to the way vpath/VPATH works in `make`, we can get into a situation where necessarily IDL files are not copied to their correct locations. WebKit comes with many IDL files. When building for internal purposes, Apple can add to or modify this set of IDL files. When creating Engineering builds, these additional IDL files are copied to .../WebKitBuild//usr/local/includes. When performing Production builds, these IDL files are included in the SDK. This arrangement can be seen in DerivedSources.make: vpath %.idl $(BUILT_PRODUCTS_DIR)/usr/local/include $(SDKROOT)/usr/local/include In order to get these IDL files into a location where they can be uniformly found and handled, there is a step in DerivedSources.make that copies them to the current directory, which is WebKitBuild//DerivedSources/WebCore: $(ADDITIONAL_BINDING_IDLS) : % : WebKitAdditions/% cp $< . The IDL files specified in ADDITIONAL_BINDING_IDLS are specified as bare files names, meaning that vpath and VPATH are employed to find them. Given the vpath specification previously shown, if the IDL files can be found in $(BUILT_PRODUCTS_DIR)/usr/local/include, they are copied locally. Otherwise, they should be found in $(SDKROOT)/usr/local/include and copied locally. As it turns out, vpath/VPATH resolution is performed not only on the prerequisites of the build rule, but also the target (see section 4.5.3 of the GNU `make` manual). This means that the files specified on the left side of the `cp` rule above are also searched for. And since the standard IDL files (the ones that are being replaced with the Apple-specific versions) can be found on VPATH as it's defined in DerivedSources.make (specifically, in $(WebCore)/dom), then those files participate in determining if the `cp` rule is executed. Consider the normal build case: repositories are checked out (applying the current modification timestamp to the files). During the build, the files in $(ADDITIONAL_BINDING_IDLS) are copied to either BUILT_PRODUCTS_DIR or to SDKROOT, which again modifies their timestamps. We eventually get to the build rule for the `cp` operation. Because the files in WebKitAdditions (be it in the local build directory or the SDK) are *newer* than the checked-out ones in $(WebCore)/dom due to their having been copied after they were checked-out, then the `cp` command is invoked and then files are copied to the current build directory. However, consider a slightly different build case. In this case, projects are checked out and built one at a time. So the project producing the files in ADDITIONAL_BINDING_IDLS is checked out and then the IDL files are copied to their intermediate location and have their timestamps set to that time. Later, WebCore is checked out, and DerivedSources.make is eventually invoked. Now, the files in $(WebCore)/dom are *newer* than those in WebKitAdditions. `make` determines that the IDL files are up-to-date and does not execute the `cp` commands. The IDL files are not copied, and the build then either fails (because of missing files) or proceeds incorrectly (because the wrong IDL files are found). The solution to this issue is to lessen the reliance on vpath/VPATH in DerivedSources.make. Instead, be more explicit about where files can be found and trim down vpath/VPATH to it's bare minimum. With vpath/VPATH reduced, we remove the issue of files being accidentally discovered that we don't want discovered. The modifications effected to make this change are: - Remove the definition of VPATH. - Dynamically build up an idl-only "VPATH" as needed with the "vpath" directive. - Manually look for the additional IDL files at their expected locations without using vpath/VPATH. - For the files that used to be found on VPATH, specify their actual locations (typically by prefixing them with $(WebCore). - (Cleanup) Consistently refer to local files with bare names (that is, remove the "./" that some files were prefixed with). - (Cleanup) Use consistent spacing around "<" and ">" redirection symbols. - (Cleanup) Remove some redundant prerequisites from the build rule involving IDL_INTERMEDIATE_PATTERNS. No new tests -- no new or changed functionality. * DerivedSources.make: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/DerivedSources.make Diff Modified: trunk/Source/WebCore/ChangeLog (268565 => 268566) --- trunk/Source/WebCore/ChangeLog 2020-10-16 00:34:30 UTC (rev 268565) +++ trunk/Source/WebCore/ChangeLog 2020-10-16 01:01:22 UTC (rev 268566) @@ -1,3 +1,97 @@ +2020-10-15 Keith Rollin + +Lessen the reliance on VPATH in WebCore/DerivedSources.make +https://bugs.webkit.org/show_bug.cgi?id=217696 + +
[webkit-changes] [268475] trunk/Tools
Title: [268475] trunk/Tools Revision 268475 Author krol...@apple.com Date 2020-10-14 11:03:36 -0700 (Wed, 14 Oct 2020) Log Message 'make debug' fails on the repository root if ccache is installed on mac after r262147 https://bugs.webkit.org/show_bug.cgi?id=212469 Reviewed by David Kilzer. ccache is frequently installed in /usr/local/bin. However, when running under XCBuild, $PATH does not include /usr/local/bin. This leaves in a situation where the check for the existence of ccache in Makefile.shared succeeds, but the use of ccache in ccache-wrapper fails. To address this, look for ccache in a few well-known places rather than just relying on $PATH. If it still can't be found, fall back to compiling normally without ccache. * ccache/ccache-wrapper: Modified Paths trunk/Tools/ChangeLog trunk/Tools/ccache/ccache-wrapper Diff Modified: trunk/Tools/ChangeLog (268474 => 268475) --- trunk/Tools/ChangeLog 2020-10-14 17:56:12 UTC (rev 268474) +++ trunk/Tools/ChangeLog 2020-10-14 18:03:36 UTC (rev 268475) @@ -1,3 +1,21 @@ +2020-10-14 Keith Rollin + +'make debug' fails on the repository root if ccache is installed on mac after r262147 +https://bugs.webkit.org/show_bug.cgi?id=212469 + + +Reviewed by David Kilzer. + +ccache is frequently installed in /usr/local/bin. However, when +running under XCBuild, $PATH does not include /usr/local/bin. This +leaves in a situation where the check for the existence of ccache in +Makefile.shared succeeds, but the use of ccache in ccache-wrapper +fails. To address this, look for ccache in a few well-known places +rather than just relying on $PATH. If it still can't be found, fall +back to compiling normally without ccache. + +* ccache/ccache-wrapper: + 2020-10-14 Sam Weinig [Testing] Support configuring any preference from test headers for WebKitTestRunner Modified: trunk/Tools/ccache/ccache-wrapper (268474 => 268475) --- trunk/Tools/ccache/ccache-wrapper 2020-10-14 17:56:12 UTC (rev 268474) +++ trunk/Tools/ccache/ccache-wrapper 2020-10-14 18:03:36 UTC (rev 268475) @@ -23,4 +23,28 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF # THE POSSIBILITY OF SUCH DAMAGE. -CCACHE_SLOPPINESS="pch_defines,time_macros" ccache "$@" +try_one() +{ +[[ -x "$1" && ! -d "$1" ]] && { CCACHE="$1"; return 0; } +return 1 +} + +try() +{ +[[ -n "${CCACHE}" ]] && return 0 +try_one "$1" || \ +try_one "$1/ccache" || \ +try_one "$1/bin/ccache" +} + +try $(which ccache &> /dev/null) +try /usr/local +try /opt/brew +try "${HOMEBREW_TEMP}/../brew" +try "${HOMEBREW_TEMP}/../../brew" + +if [[ -n "${CCACHE}" ]]; then +CCACHE_SLOPPINESS="pch_defines,time_macros" "${CCACHE}" "$@" +else +"$@" +fi ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [268420] trunk
Title: [268420] trunk Revision 268420 Author krol...@apple.com Date 2020-10-13 14:25:46 -0700 (Tue, 13 Oct 2020) Log Message Remove leftover MACOSX_DEPLOYMENT_TARGET_macosx support https://bugs.webkit.org/show_bug.cgi?id=217649 Reviewed by Darin Adler. Bug 42796 introduced MACOSX_DEPLOYMENT_TARGET_ as "support for compiling WebKit against iOS SDKs". Support for the iOS part of this feature was later removed in several changes, including Bug 139212, Bug 139463 and Bug 144762. However, vestiges have remained for five or six years in the form of MACOSX_DEPLOYMENT_TARGET_macosx. The inclusion of the platform in MACOSX_DEPLOYMENT_TARGET is no longer needed and can be removed. This changes brings most projects in conformance with other projects that don't support including the platform in MACOSX_DEPLOYMENT_TARGET, including WebEditingTester, gtest, WebKitTestRunner, MiniBrowser, and TestWebKitAPI. Along the way, remove a couple of left-over references to macOS 10.16, and a couple of places where [sdk=macosx*] was still being used. With this change, initialization of MACOSX_DEPLOYMENT_TARGET should be consistent across all projects, with two exceptions: WebKitLauncher (which hardcodes it to 10.12) and libwebrtc's copy of googletest (which hardcodes it to 10.4). The reasons for these hard-coded values is not apparent, so leave them be. PerformanceTests: * DecoderTest/Configurations/DebugRelease.xcconfig: * MediaTime/Configurations/DebugRelease.xcconfig: Source/bmalloc: * Configurations/DebugRelease.xcconfig: Source/_javascript_Core: * Configurations/DebugRelease.xcconfig: Source/ThirdParty/ANGLE: * Configurations/DebugRelease.xcconfig: Source/ThirdParty/libwebrtc: * Configurations/DebugRelease.xcconfig: Source/WebCore: No new tests -- no changed functionality. * Configurations/DebugRelease.xcconfig: Source/WebCore/PAL: * Configurations/DebugRelease.xcconfig: Source/WebInspectorUI: * Configurations/DebugRelease.xcconfig: Source/WebKit: * Configurations/DebugRelease.xcconfig: Source/WebKitLegacy/mac: * Configurations/DebugRelease.xcconfig: Source/WTF: * Configurations/DebugRelease.xcconfig: Tools: * ContentExtensionTester/Configurations/DebugRelease.xcconfig: * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig: * ImageDiff/cg/Configurations/DebugRelease.xcconfig: * lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig: Modified Paths trunk/PerformanceTests/ChangeLog trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig trunk/Source/WTF/ChangeLog trunk/Source/WTF/Configurations/DebugRelease.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/DebugRelease.xcconfig trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/DebugRelease.xcconfig trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig trunk/Source/bmalloc/ChangeLog trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig trunk/Tools/ChangeLog trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig Diff Modified: trunk/PerformanceTests/ChangeLog (268419 => 268420) --- trunk/PerformanceTests/ChangeLog 2020-10-13 21:09:16 UTC (rev 268419) +++ trunk/PerformanceTests/ChangeLog 2020-10-13 21:25:46 UTC (rev 268420) @@ -1,3 +1,36 @@ +2020-10-13 Keith Rollin + +Remove leftover MACOSX_DEPLOYMENT_TARGET_macosx support +https://bugs.webkit.org/show_bug.cgi?id=217649 + + +Reviewed by Darin Adler. + +Bug 42796 introduced MACOSX_DEPLOYMENT_TARGET_ as "support +for compiling WebKit against iOS SDKs". Support for the iOS part of +this feature was later removed in several changes, including Bug +139212, Bug 139463 and Bug 144762. However, vestiges have remained for +five or six years in the form of MACOSX_DEPLOYMENT_TARGET_macosx. The +inclusion of the platform in MACOSX_DEPLOYMENT_TARGET is no longer +needed and can be removed. + +This changes brings most projects in conformance with other projects +that don't support including the platform in MACOSX_DEPLOYMENT_TARGET, +including WebEditingTester,
[webkit-changes] [268200] trunk
Title: [268200] trunk Revision 268200 Author krol...@apple.com Date 2020-10-08 12:10:32 -0700 (Thu, 08 Oct 2020) Log Message Remove copy-webkitlibraries-to-product-directory https://bugs.webkit.org/show_bug.cgi?id=217465 Reviewed by Darin Adler. This script no longer does anything, so remove it along with the scaffolding around it that invokes it during the build. .: * Makefile: Tools: * Scripts/build-jsc: * Scripts/build-webkit: * Scripts/copy-webkitlibraries-to-product-directory: Removed. WebKitLibraries: * Makefile: Removed. Modified Paths trunk/ChangeLog trunk/Makefile trunk/Tools/ChangeLog trunk/Tools/Scripts/build-jsc trunk/Tools/Scripts/build-webkit trunk/WebKitLibraries/ChangeLog Removed Paths trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory trunk/WebKitLibraries/Makefile Diff Modified: trunk/ChangeLog (268199 => 268200) --- trunk/ChangeLog 2020-10-08 19:03:08 UTC (rev 268199) +++ trunk/ChangeLog 2020-10-08 19:10:32 UTC (rev 268200) @@ -1,3 +1,16 @@ +2020-10-08 Keith Rollin + +Remove copy-webkitlibraries-to-product-directory +https://bugs.webkit.org/show_bug.cgi?id=217465 + + +Reviewed by Darin Adler. + +This script no longer does anything, so remove it along with the +scaffolding around it that invokes it during the build. + +* Makefile: + 2020-10-04 Ryan Hostetler Submission failure with "make: *** No rule to make target `installsrc'. Stop" Modified: trunk/Makefile (268199 => 268200) --- trunk/Makefile 2020-10-08 19:03:08 UTC (rev 268199) +++ trunk/Makefile 2020-10-08 19:10:32 UTC (rev 268200) @@ -1,4 +1,4 @@ -MODULES = WebKitLibraries Source Tools +MODULES = Source Tools define build_target_for_each_module for dir in $(MODULES); do \ Modified: trunk/Tools/ChangeLog (268199 => 268200) --- trunk/Tools/ChangeLog 2020-10-08 19:03:08 UTC (rev 268199) +++ trunk/Tools/ChangeLog 2020-10-08 19:10:32 UTC (rev 268200) @@ -1,3 +1,18 @@ +2020-10-08 Keith Rollin + +Remove copy-webkitlibraries-to-product-directory +https://bugs.webkit.org/show_bug.cgi?id=217465 + + +Reviewed by Darin Adler. + +This script no longer does anything, so remove it along with the +scaffolding around it that invokes it during the build. + +* Scripts/build-jsc: +* Scripts/build-webkit: +* Scripts/copy-webkitlibraries-to-product-directory: Removed. + 2020-10-08 Chris Dumez Crash under WebKit::WebProcessCache::clear() Modified: trunk/Tools/Scripts/build-jsc (268199 => 268200) --- trunk/Tools/Scripts/build-jsc 2020-10-08 19:03:08 UTC (rev 268199) +++ trunk/Tools/Scripts/build-jsc 2020-10-08 19:10:32 UTC (rev 268200) @@ -59,7 +59,6 @@ my $makeArgs = ""; my @cmakeArgs; my $buildDir = ""; -my $copyLibraries = 1; my $startTime = time(); my $useCCache = -1; @@ -87,7 +86,6 @@ --[no-]analyzeToggle code static analysis (default: $shouldRunStaticAnalyzer) --[no-]coverage Toggle code coverage support (default: $coverageSupport) --[no-]ftl-jitToggle FTL JIT support (default: $ftlJIT) - --[no-]copy-libraries Toggle whether to copy libraries (default: $copyLibraries) --cloop Use C Loop interpreter (default: $forceCLoop) --cli Build the new jsc command line interface (default: $cli) --makeargs=Optional Makefile flags @@ -104,7 +102,6 @@ 'ftl-jit!' => \$ftlJIT, 'cloop!' => \$forceCLoop, 'cli!' => \$cli, -'copy-libraries!' => \$copyLibraries, 'makeargs=s' => \$makeArgs, 'cmakeargs=s' => \@cmakeArgs, 'build-dir=s' => \$buildDir, @@ -203,13 +200,6 @@ push @options, $option unless $option eq ""; } } - -if ($copyLibraries) { -my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory"); -push @copyLibrariesArgs, "--device" if willUseIOSDeviceSDK(); -push @copyLibrariesArgs, productDir(); -(system(@copyLibrariesArgs) == 0) or die; -} } sub buildMyProject Modified: trunk/Tools/Scripts/build-webkit (268199 => 268200) --- trunk/Tools/Scripts/build-webkit 2020-10-08 19:03:08 UTC (rev 268199) +++ trunk/Tools/Scripts/build-webkit 2020-10-08 19:10:32 UTC (rev 268200) @@ -252,16 +252,6 @@ # WebInspectorUI must come after _javascript_Core and WebCore but before WebKit and WebKit2 my $webKitIndex = first { $projects[$_] eq "Source/WebKitLegacy" } 0..$#projects; splice(@projects, $webKitIndex, 0, "Source/WebInspectorUI"); - -# Copy library and header from WebKitLibraries to a findable place in the product directory. -my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", "--wksi", productDir()); -print(join(" ", @copyLibrariesArgs) . "\n"); -(system(@copyLibrariesArgs) == 0) or die; -
[webkit-changes] [268163] trunk/Source
Title: [268163] trunk/Source Revision 268163 Author krol...@apple.com Date 2020-10-07 17:23:53 -0700 (Wed, 07 Oct 2020) Log Message Update post-processing rules for headers to not unnecessarily change timestamps https://bugs.webkit.org/show_bug.cgi?id=217371 Reviewed by Darin Adler. Under XCBuild, the scripts employed in custom build rules can be invoked in innocuous situations. A common example is when the user is building from the command-line and they change the `make` output from stdout to a file, or vice-versa. Changing the output changes the setting of the COLOR_DIAGNOSTICS environment variable, which is enough to cause XCBuild to think something is different and that the custom build rule needs to be invoked. For the script's part, nothing significant has changed, yet it post-processes the header files, causing their modification dates to change, causing downstream rebuilds to occur. Fix this problem by adopting an approach that doesn't modify the post-processed header files unless their contents actually change. Source/_javascript_Core: * Scripts/postprocess-header-rule: Source/ThirdParty/ANGLE: * adjust-angle-include-paths-rule: Source/ThirdParty/libwebrtc: * libwebrtc.xcodeproj/project.pbxproj: Source/WebKit: No new tests -- this is a build change only. * Scripts/postprocess-header-rule: Source/WebKitLegacy: * scripts/postprocess-header-rule: Source/WTF: * Scripts/GeneratePreferences.rb: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Scripts/postprocess-header-rule trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/adjust-angle-include-paths-rule trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj trunk/Source/WTF/ChangeLog trunk/Source/WTF/Scripts/GeneratePreferences.rb trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Scripts/postprocess-header-rule trunk/Source/WebKitLegacy/ChangeLog trunk/Source/WebKitLegacy/scripts/postprocess-header-rule Diff Modified: trunk/Source/_javascript_Core/ChangeLog (268162 => 268163) --- trunk/Source/_javascript_Core/ChangeLog 2020-10-08 00:01:27 UTC (rev 268162) +++ trunk/Source/_javascript_Core/ChangeLog 2020-10-08 00:23:53 UTC (rev 268163) @@ -1,3 +1,27 @@ +2020-10-07 Keith Rollin + +Update post-processing rules for headers to not unnecessarily change timestamps +https://bugs.webkit.org/show_bug.cgi?id=217371 + + +Reviewed by Darin Adler. + +Under XCBuild, the scripts employed in custom build rules can be +invoked in innocuous situations. A common example is when the user is +building from the command-line and they change the `make` output from +stdout to a file, or vice-versa. Changing the output changes the +setting of the COLOR_DIAGNOSTICS environment variable, which is enough +to cause XCBuild to think something is different and that the custom +build rule needs to be invoked. For the script's part, nothing +significant has changed, yet it post-processes the header files, +causing their modification dates to change, causing downstream +rebuilds to occur. + +Fix this problem by adopting an approach that doesn't modify the +post-processed header files unless their contents actually change. + +* Scripts/postprocess-header-rule: + 2020-10-05 Yusuke Suzuki [JSC] More consistent PtrTagging for code types Modified: trunk/Source/_javascript_Core/Scripts/postprocess-header-rule (268162 => 268163) --- trunk/Source/_javascript_Core/Scripts/postprocess-header-rule 2020-10-08 00:01:27 UTC (rev 268162) +++ trunk/Source/_javascript_Core/Scripts/postprocess-header-rule 2020-10-08 00:23:53 UTC (rev 268163) @@ -44,6 +44,10 @@ } function rewrite_headers () { +local SOURCE_FILE="${1}" +local WORK_FILE="${2}.tmp" +local DEST_FILE="${2}" + if [[ "${PLATFORM_NAME}" == "macosx" ]]; then [[ -n ${OSX_VERSION} ]] || OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET} [[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA" @@ -80,8 +84,9 @@ SED_OPTIONS+=(${OTHER_SED_OPTIONS[*]}) -ditto "${1}" "${2}" -sed -i .tmp -E "${SED_OPTIONS[@]}" "${2}" || exit $? +sed -E "${SED_OPTIONS[@]}" "${SOURCE_FILE}" > "${WORK_FILE}" || exit $? +cmp -s "${WORK_FILE}" "${DEST_FILE}" && rm -f "${WORK_FILE}" || mv "${WORK_FILE}" "${DEST_FILE}" +[[ "${SOURCE_FILE}" -nt "${DEST_FILE}" ]] && touch "${DEST_FILE}" || true } DEFINITIONS_PATH=usr/local/include/WebKitAdditions/Scripts/postprocess-framework-headers-definitions Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (268162 => 268163) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-10-08 00:01:27 UTC (rev 268162) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-10-08 00:23:53 UTC (rev 268163) @@ -1,3 +1,27 @@ +2020-10-07 Keith Rollin + +Update post-processing rules for headers to not
[webkit-changes] [267902] trunk
Title: [267902] trunk Revision 267902 Author krol...@apple.com Date 2020-10-02 17:18:25 -0700 (Fri, 02 Oct 2020) Log Message Seeing "usage: basename string [suffix]" spam when using make to build https://bugs.webkit.org/show_bug.cgi?id=217231 Reviewed by Darin Adler. The name of the project being built is no longer displayed when using XCBuild. Therefore, https://bugs.webkit.org/show_bug.cgi?id=216865 taught the Makefile to perform this logging. The approach took advantage of a `make` variable (PATH_FROM_ROOT) that tracks the relative path from the root of the build hierarchy to the current project. However, that variable may not be initialized if the build is not initiated from the root. Therefore, don't count on that variable, and get the name of the current project by invoking `pwd`. * Makefile.shared: Modified Paths trunk/ChangeLog trunk/Makefile.shared Diff Modified: trunk/ChangeLog (267901 => 267902) --- trunk/ChangeLog 2020-10-02 23:28:01 UTC (rev 267901) +++ trunk/ChangeLog 2020-10-03 00:18:25 UTC (rev 267902) @@ -1,3 +1,22 @@ +2020-10-02 Keith Rollin + +Seeing "usage: basename string [suffix]" spam when using make to build +https://bugs.webkit.org/show_bug.cgi?id=217231 + + +Reviewed by Darin Adler. + +The name of the project being built is no longer displayed when using +XCBuild. Therefore, https://bugs.webkit.org/show_bug.cgi?id=216865 +taught the Makefile to perform this logging. The approach took +advantage of a `make` variable (PATH_FROM_ROOT) that tracks the +relative path from the root of the build hierarchy to the current +project. However, that variable may not be initialized if the build is +not initiated from the root. Therefore, don't count on that variable, +and get the name of the current project by invoking `pwd`. + +* Makefile.shared: + 2020-10-02 Sam Weinig Remove code behind ENABLE(MEDIA_SESSION), no ports enable it Modified: trunk/Makefile.shared (267901 => 267902) --- trunk/Makefile.shared 2020-10-02 23:28:01 UTC (rev 267901) +++ trunk/Makefile.shared 2020-10-03 00:18:25 UTC (rev 267902) @@ -100,7 +100,7 @@ ( \ [[ -t 1 ]] && COLOR_DIAGNOSTICS_ARG="COLOR_DIAGNOSTICS=YES"; \ echo; \ - echo "= BUILDING $$(basename $(PATH_FROM_ROOT)) ="; \ + echo "= BUILDING $$(basename "$$(pwd)") ="; \ echo; \ $1 xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) $2 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \ ) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [267715] trunk
Title: [267715] trunk Revision 267715 Author krol...@apple.com Date 2020-09-28 14:11:41 -0700 (Mon, 28 Sep 2020) Log Message Print message saying what project is being built https://bugs.webkit.org/show_bug.cgi?id=216865 Reviewed by Andy Estes. XCBuild removes the progress messages saying which project/target is being built. We can't show the target, but update the Makefiles to at least show which project is being built. * Makefile.shared: Modified Paths trunk/ChangeLog trunk/Makefile.shared Diff Modified: trunk/ChangeLog (267714 => 267715) --- trunk/ChangeLog 2020-09-28 20:26:13 UTC (rev 267714) +++ trunk/ChangeLog 2020-09-28 21:11:41 UTC (rev 267715) @@ -1,3 +1,17 @@ +2020-09-28 Keith Rollin + +Print message saying what project is being built +https://bugs.webkit.org/show_bug.cgi?id=216865 + + +Reviewed by Andy Estes. + +XCBuild removes the progress messages saying which project/target is +being built. We can't show the target, but update the Makefiles to at +least show which project is being built. + +* Makefile.shared: + 2020-09-27 Philippe Normand Add .ccls config file Modified: trunk/Makefile.shared (267714 => 267715) --- trunk/Makefile.shared 2020-09-28 20:26:13 UTC (rev 267714) +++ trunk/Makefile.shared 2020-09-28 21:11:41 UTC (rev 267715) @@ -99,6 +99,9 @@ define invoke_xcode ( \ [[ -t 1 ]] && COLOR_DIAGNOSTICS_ARG="COLOR_DIAGNOSTICS=YES"; \ + echo; \ + echo "= BUILDING $$(basename $(PATH_FROM_ROOT)) ="; \ + echo; \ $1 xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) $2 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \ ) endef ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [267458] trunk
Title: [267458] trunk Revision 267458 Author krol...@apple.com Date 2020-09-22 20:38:17 -0700 (Tue, 22 Sep 2020) Log Message Unify debug and release target aliases https://bugs.webkit.org/show_bug.cgi?id=216863 Reviewed by Tim Horton. All Makefiles have "debug", "d", "release", and "r" for build targets. Others -- but not all -- also include "dev", "develop", "development", "dep", "deploy", and "deployment". Because of this inconsistency, trying to use those additional targets didn't work. It looks like all Makefiles used to support all of those targets, but some got dropped along the way. For instance, the top-level Makefile and Source/Makefile dropped them in 2013 as part of Bug 107863. And it looks like WebKitLibraries/Makefile never had them. Given that those additional targets don't work, it seems like no one uses them, so let's remove them completely. .: * Makefile.shared: Source/ThirdParty: * Makefile: Tools: * Makefile: Modified Paths trunk/ChangeLog trunk/Makefile.shared trunk/Source/ThirdParty/ChangeLog trunk/Source/ThirdParty/Makefile trunk/Tools/ChangeLog trunk/Tools/Makefile Diff Modified: trunk/ChangeLog (267457 => 267458) --- trunk/ChangeLog 2020-09-23 03:36:13 UTC (rev 267457) +++ trunk/ChangeLog 2020-09-23 03:38:17 UTC (rev 267458) @@ -1,5 +1,26 @@ 2020-09-22 Keith Rollin +Unify debug and release target aliases +https://bugs.webkit.org/show_bug.cgi?id=216863 + + +Reviewed by Tim Horton. + +All Makefiles have "debug", "d", "release", and "r" for build +targets. Others -- but not all -- also include "dev", "develop", +"development", "dep", "deploy", and "deployment". Because of this +inconsistency, trying to use those additional targets didn't work. It +looks like all Makefiles used to support all of those targets, but +some got dropped along the way. For instance, the top-level Makefile +and Source/Makefile dropped them in 2013 as part of Bug 107863. And it +looks like WebKitLibraries/Makefile never had them. Given that those +additional targets don't work, it seems like no one uses them, so +let's remove them completely. + +* Makefile.shared: + +2020-09-22 Keith Rollin + Refactor build rules in Makefiles and Makefile.shared https://bugs.webkit.org/show_bug.cgi?id=216806 Modified: trunk/Makefile.shared (267457 => 267458) --- trunk/Makefile.shared 2020-09-23 03:36:13 UTC (rev 267457) +++ trunk/Makefile.shared 2020-09-23 03:38:17 UTC (rev 267458) @@ -109,11 +109,11 @@ endif @$(call invoke_xcode,,GCC_PREPROCESSOR_DEFINITIONS='$(GCC_PREPROCESSOR_ADDITIONS) $$(inherited)') -debug d development dev develop: force +debug d: force @$(call set_webkit_configuration,--debug) @$(call invoke_xcode,,GCC_PREPROCESSOR_DEFINITIONS='$(GCC_PREPROCESSOR_ADDITIONS) $$(inherited)') -release r deployment dep deploy: force +release r: force @$(call set_webkit_configuration,--release) @$(call invoke_xcode,,GCC_PREPROCESSOR_DEFINITIONS='$(GCC_PREPROCESSOR_ADDITIONS) $$(inherited)') Modified: trunk/Source/ThirdParty/ChangeLog (267457 => 267458) --- trunk/Source/ThirdParty/ChangeLog 2020-09-23 03:36:13 UTC (rev 267457) +++ trunk/Source/ThirdParty/ChangeLog 2020-09-23 03:38:17 UTC (rev 267458) @@ -1,5 +1,26 @@ 2020-09-22 Keith Rollin +Unify debug and release target aliases +https://bugs.webkit.org/show_bug.cgi?id=216863 + + +Reviewed by Tim Horton. + +All Makefiles have "debug", "d", "release", and "r" for build +targets. Others -- but not all -- also include "dev", "develop", +"development", "dep", "deploy", and "deployment". Because of this +inconsistency, trying to use those additional targets didn't work. It +looks like all Makefiles used to support all of those targets, but +some got dropped along the way. For instance, the top-level Makefile +and Source/Makefile dropped them in 2013 as part of Bug 107863. And it +looks like WebKitLibraries/Makefile never had them. Given that those +additional targets don't work, it seems like no one uses them, so +let's remove them completely. + +* Makefile: + +2020-09-22 Keith Rollin + Refactor build rules in Makefiles and Makefile.shared https://bugs.webkit.org/show_bug.cgi?id=216806 Modified: trunk/Source/ThirdParty/Makefile (267457 => 267458) --- trunk/Source/ThirdParty/Makefile 2020-09-23 03:36:13 UTC (rev 267457) +++ trunk/Source/ThirdParty/Makefile 2020-09-23 03:38:17 UTC (rev 267458) @@ -35,10 +35,10 @@ all: @$(build_target_for_each_module) -debug d development dev develop: +debug d: @$(build_target_for_each_module) -release r deployment dep deploy: +release r: @$(build_target_for_each_module) release+assert ra: Modified: trunk/Tools/ChangeLog (267457 => 267458) --- trunk/Tools/ChangeLog
[webkit-changes] [267441] trunk
Title: [267441] trunk Revision 267441 Author krol...@apple.com Date 2020-09-22 15:26:39 -0700 (Tue, 22 Sep 2020) Log Message Refactor build rules in Makefiles and Makefile.shared https://bugs.webkit.org/show_bug.cgi?id=216806 Reviewed by David Kilzer. Build fix: Previous change for this bug broke the ability to perform a build with just `make`, due to that code path invoking `set-webkit-configuration` with no parameters, which causes that script to error-out. * Makefile.shared: Modified Paths trunk/ChangeLog trunk/Makefile.shared Diff Modified: trunk/ChangeLog (267440 => 267441) --- trunk/ChangeLog 2020-09-22 22:23:08 UTC (rev 267440) +++ trunk/ChangeLog 2020-09-22 22:26:39 UTC (rev 267441) @@ -6,6 +6,21 @@ Reviewed by David Kilzer. +Build fix: Previous change for this bug broke the ability to perform a +build with just `make`, due to that code path invoking +`set-webkit-configuration` with no parameters, which causes that +script to error-out. + +* Makefile.shared: + +2020-09-22 Keith Rollin + +Refactor build rules in Makefiles and Makefile.shared +https://bugs.webkit.org/show_bug.cgi?id=216806 + + +Reviewed by David Kilzer. + Factor out the common aspects of the build rules in Makefile.shared and the various Makefiles. This allows us to more easily see what's different between the various build targets, and to apply uniform Modified: trunk/Makefile.shared (267440 => 267441) --- trunk/Makefile.shared 2020-09-22 22:23:08 UTC (rev 267440) +++ trunk/Makefile.shared 2020-09-22 22:26:39 UTC (rev 267441) @@ -104,7 +104,9 @@ endef all: +ifneq (,$(strip $(ASAN_OPTION) $(TSAN_OPTION) $(WK_LTO_OPTION))) @$(call set_webkit_configuration,) +endif @$(call invoke_xcode,,GCC_PREPROCESSOR_DEFINITIONS='$(GCC_PREPROCESSOR_ADDITIONS) $$(inherited)') debug d development dev develop: force ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [267424] trunk
Title: [267424] trunk Revision 267424 Author krol...@apple.com Date 2020-09-22 11:37:51 -0700 (Tue, 22 Sep 2020) Log Message Refactor build rules in Makefiles and Makefile.shared https://bugs.webkit.org/show_bug.cgi?id=216806 Reviewed by David Kilzer. Factor out the common aspects of the build rules in Makefile.shared and the various Makefiles. This allows us to more easily see what's different between the various build targets, and to apply uniform changes across all of the targets. * Makefile: .: * Makefile.shared: * Source/Makefile: Modified Paths trunk/ChangeLog trunk/Makefile trunk/Makefile.shared trunk/Source/Makefile trunk/Source/ThirdParty/ChangeLog trunk/Source/ThirdParty/Makefile trunk/Tools/ChangeLog trunk/Tools/Makefile Diff Modified: trunk/ChangeLog (267423 => 267424) --- trunk/ChangeLog 2020-09-22 18:30:53 UTC (rev 267423) +++ trunk/ChangeLog 2020-09-22 18:37:51 UTC (rev 267424) @@ -1,3 +1,20 @@ +2020-09-22 Keith Rollin + +Refactor build rules in Makefiles and Makefile.shared +https://bugs.webkit.org/show_bug.cgi?id=216806 + + +Reviewed by David Kilzer. + +Factor out the common aspects of the build rules in Makefile.shared +and the various Makefiles. This allows us to more easily see what's +different between the various build targets, and to apply uniform +changes across all of the targets. + +* Makefile: +* Makefile.shared: +* Source/Makefile: + 2020-09-22 Jonathan Bedard Correct instructions for building iOS in ReadMe Modified: trunk/Makefile (267423 => 267424) --- trunk/Makefile 2020-09-22 18:30:53 UTC (rev 267423) +++ trunk/Makefile 2020-09-22 18:37:51 UTC (rev 267424) @@ -1,29 +1,30 @@ MODULES = WebKitLibraries Source Tools +define build_target_for_each_module + for dir in $(MODULES); do \ + ${MAKE} $@ -C $$dir PATH_FROM_ROOT=$(PATH_FROM_ROOT)/$${dir}; \ + exit_status=$$?; \ + [ $$exit_status -ne 0 ] && exit $$exit_status; \ + done; true +endef + all: - @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ - if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + @$(build_target_for_each_module) debug d: - @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ - if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + @$(build_target_for_each_module) release r: - @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ - if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + @$(build_target_for_each_module) release+assert ra: - @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ - if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + @$(build_target_for_each_module) testing t: - @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ - if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + @$(build_target_for_each_module) analyze: - @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ - if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + @$(build_target_for_each_module) clean: - @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ - if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + @$(build_target_for_each_module) Modified: trunk/Makefile.shared (267423 => 267424) --- trunk/Makefile.shared 2020-09-22 18:30:53 UTC (rev 267423) +++ trunk/Makefile.shared 2020-09-22 18:37:51 UTC (rev 267424) @@ -1,6 +1,5 @@ SCRIPTS_PATH ?= ../Tools/Scripts -SET_COLOR_DIAGNOSTICS_ARG = if [[ -t 1 ]]; then COLOR_DIAGNOSTICS_ARG="COLOR_DIAGNOSTICS=YES"; fi XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $${COLOR_DIAGNOSTICS_ARG} $(ARGS) ifneq (,$(SDKROOT)) @@ -92,42 +91,47 @@ # See . export PATH = $(shell getconf PATH) -all: set_sanitizer_configuration - ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) GCC_PREPROCESSOR_DEFINITIONS='$(GCC_PREPROCESSOR_ADDITIONS) $$(inherited)' | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} ) +define set_webkit_configuration + $(SCRIPTS_PATH)/set-webkit-configuration $1 $(ASAN_OPTION) $(TSAN_OPTION) $(WK_LTO_OPTION) +endef + +define invoke_xcode + ( \ + [[ -t 1 ]] && COLOR_DIAGNOSTICS_ARG="COLOR_DIAGNOSTICS=YES"; \ + $1 xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) $2 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \ + ) +endef + +all: + @$(call set_webkit_configuration,) + @$(call invoke_xcode,,GCC_PREPROCESSOR_DEFINITIONS='$(GCC_PREPROCESSOR_ADDITIONS) $$(inherited)') + debug d development dev develop: force - $(SCRIPTS_PATH)/set-webkit-configuration --debug $(ASAN_OPTION) $(TSAN_OPTION) $(WK_LTO_OPTION) - ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) GCC_PREPROCESSOR_DEFINITIONS='$(GCC_PREPROCESSOR_ADDITIONS) $$(inherited)' | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} ) + @$(call set_webkit_configuration,--debug) + @$(call
[webkit-changes] [265602] trunk
Title: [265602] trunk Revision 265602 Author krol...@apple.com Date 2020-08-12 23:09:30 -0700 (Wed, 12 Aug 2020) Log Message Remove the need for defining USE_NEW_BUILD_SYSTEM https://bugs.webkit.org/show_bug.cgi?id=215439 Reviewed by Darin Adler. When building WebKit for XCBuild, we currently require that the external build system (such as the Makefile, build-webkit, etc.) defines the USE_NEW_BUILD_SYSTEM=YES build setting. This build setting controls parts of our build instructions that are sensitive to when XCBuild or the Legacy build system are being used. Notably, we need to know when to use our custom “copy and modify” scripts with copying certain header files (used with the Legacy build system) vs. using the enhanced Copy Headers build phase that’s enabled with APPLY_RULES_IN_COPY_HEADERS=YES (introduced with and used by XCBuild). The choice of which method to copy headers is used is controlled by USE_NEW_BUILD_SYSTEM. There is no built-in build setting that we can probe to help us determine which approach to take when copying and modifying headers, which is why we need to define USE_NEW_BUILD_SYSTEM ourselves. But it turns out that we can *detect* which build system is being used by taking advantage of a subtle difference between the two systems. As noted in: https://developer.apple.com/documentation/xcode-release-notes/build-system-release-notes-for-xcode-10 “When an .xcconfig file contains multiple assignments of the same build setting, later assignments using $(inherited) or $() will inherit from earlier assignments in the .xcconfig. The legacy build system caused every use of $(inherited) or $() skip any other values defined within the .xcconfig.” This difference can be exploited as follows: WK_WHICH_BUILD_SYSTEM = not_ WK_WHICH_BUILD_SYSTEM = $(inherited)legacy WK_USE_NEW_BUILD_SYSTEM = $(WK_USE_NEW_BUILD_SYSTEM_$(WK_WHICH_BUILD_SYSTEM)) WK_USE_NEW_BUILD_SYSTEM_legacy = NO WK_USE_NEW_BUILD_SYSTEM_not_legacy = YES We can then use WK_USE_NEW_BUILD_SYSTEM where we used to use the externally-defined USE_NEW_BUILD_SYSTEM. .: * Makefile.shared: Source/_javascript_Core: * Configurations/Base.xcconfig: * Configurations/_javascript_Core.xcconfig: * _javascript_Core.xcodeproj/project.pbxproj: Source/ThirdParty/ANGLE: * ANGLE.xcodeproj/project.pbxproj: * Configurations/ANGLE-dynamic.xcconfig: * Configurations/ANGLE-static.xcconfig: * Configurations/Base.xcconfig: Source/WebKit: No new tests -- no new or changed functionality. * Configurations/Base.xcconfig: * Configurations/WebKit.xcconfig: * WebKit.xcodeproj/project.pbxproj: Source/WebKitLegacy: * WebKitLegacy.xcodeproj/project.pbxproj: Source/WebKitLegacy/mac: * Configurations/Base.xcconfig: * Configurations/WebKitLegacy.xcconfig: Tools: * Scripts/build-webkit: Modified Paths trunk/ChangeLog trunk/Makefile.shared trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/Base.xcconfig trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-static.xcconfig trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/Base.xcconfig trunk/Source/WebKit/Configurations/WebKit.xcconfig trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj trunk/Source/WebKitLegacy/ChangeLog trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig trunk/Tools/ChangeLog trunk/Tools/Scripts/build-webkit Diff Modified: trunk/ChangeLog (265601 => 265602) --- trunk/ChangeLog 2020-08-13 06:06:57 UTC (rev 265601) +++ trunk/ChangeLog 2020-08-13 06:09:30 UTC (rev 265602) @@ -1,3 +1,51 @@ +2020-08-12 Keith Rollin + +Remove the need for defining USE_NEW_BUILD_SYSTEM +https://bugs.webkit.org/show_bug.cgi?id=215439 + +Reviewed by Darin Adler. + +When building WebKit for XCBuild, we currently require that the +external build system (such as the Makefile, build-webkit, etc.) +defines the USE_NEW_BUILD_SYSTEM=YES build setting. This build setting +controls parts of our build instructions that are sensitive to when +XCBuild or the Legacy build system are being used. Notably, we need to +know when to use our custom “copy and modify” scripts with copying +certain header files (used with the Legacy build system) vs. using the +enhanced Copy Headers build phase that’s enabled with +APPLY_RULES_IN_COPY_HEADERS=YES (introduced with and used by
[webkit-changes] [265526] trunk/Tools
Title: [265526] trunk/Tools Revision 265526 Author krol...@apple.com Date 2020-08-11 15:23:19 -0700 (Tue, 11 Aug 2020) Log Message Update filter-build-webkit for unknown/unhandled messages https://bugs.webkit.org/show_bug.cgi?id=215395 Reviewed by Alexey Proskuryakov. Teach filter-build-webkit about XCBuild build output that needs to be reformatted. At the same time, address other red messages that have crept in over time, either reformatting or squelching them. Some red messages are still emitted under both XCBuild and the Legacy build system, but those either need to be addressed at the source or be investigated first in order to determine the correct remediation. * Scripts/filter-build-webkit: (shouldShowSubsequentLine): (shouldIgnoreLine): Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/filter-build-webkit Diff Modified: trunk/Tools/ChangeLog (265525 => 265526) --- trunk/Tools/ChangeLog 2020-08-11 22:20:16 UTC (rev 265525) +++ trunk/Tools/ChangeLog 2020-08-11 22:23:19 UTC (rev 265526) @@ -1,3 +1,25 @@ +2020-08-11 Keith Rollin + +Update filter-build-webkit for unknown/unhandled messages +https://bugs.webkit.org/show_bug.cgi?id=215395 + + +Reviewed by Alexey Proskuryakov. + +Teach filter-build-webkit about XCBuild build output that needs to be +reformatted. + +At the same time, address other red messages that have crept in over +time, either reformatting or squelching them. + +Some red messages are still emitted under both XCBuild and the Legacy +build system, but those either need to be addressed at the source or +be investigated first in order to determine the correct remediation. + +* Scripts/filter-build-webkit: +(shouldShowSubsequentLine): +(shouldIgnoreLine): + 2020-08-11 Brady Eidson Add a "use stored credentials" setting to WKWebView. Modified: trunk/Tools/Scripts/filter-build-webkit (265525 => 265526) --- trunk/Tools/Scripts/filter-build-webkit 2020-08-11 22:20:16 UTC (rev 265525) +++ trunk/Tools/Scripts/filter-build-webkit 2020-08-11 22:23:19 UTC (rev 265526) @@ -1,7 +1,7 @@ #!/usr/bin/env perl -# Copyright (C) 2011, 2012, 2013, 2014 Apple Inc. All rights reserved. -# +# Copyright (C) 2011, 2012, 2013, 2014, 2020 Apple Inc. All rights reserved. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -10,7 +10,7 @@ # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# +# # THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -82,6 +82,7 @@ our $outputFormat = "text"; our $unfilteredOutputPath = "build.log"; our $useColor = -t STDOUT; +our $inEntitlements = 0; sub usageAndExit() { @@ -133,21 +134,28 @@ next if shouldIgnoreLine($previousLine, $line); +$line =~ s/\(in target .* from project .*\)$//g; + if ($line =~ /^={10}/) { printLine($line, STYLE_SUCCESS); $buildFinished = 1; } elsif ($line =~ /^===/) { printLine($line, STYLE_HEADER); -} elsif ($line =~ /^note: using/) { +} elsif ($line =~ /^note: [Uu]sing/) { printLine($line, STYLE_HEADER); } elsif ($line =~ /Checking Dependencies|Check dependencies|Create product structure|Write auxiliary files|LinkStoryboards/) { printLine($line, STYLE_PLAIN); } elsif ($line =~ /\*\* BUILD SUCCEEDED \*\*/) { printLine("Build Succeeded", STYLE_SUCCESS); -} elsif ($line =~ /^(\e\[1m)?(PhaseScriptExecution|RuleScriptExecution|ClCompile|CompileC|Distributed-CompileC|Ld|PBXCp|CpResource|CopyPNGFile|CopyTiffFile|CpHeader|Preprocess|Processing|ProcessInfoPlistFile|ProcessPCH|ProcessPCH\+\+|Touch|Libtool|CopyStringsFile|Mig|CreateUniversalBinary|Analyze|AnalyzeShallow|ProcessProductPackaging|CodeSign|Validate|SymLink|Updating|CompileDTraceScript|CompileXIB|StripNIB|CopyPlistFile|GenerateDSYMFile|GenerateTAPI|CompileStoryboard|ExternalBuildToolExecution)(\e\[0m)? ("[^"]+"|(\\|(?<=\\)\s|\S)+)?/) { +} elsif ($line =~
[webkit-changes] [265178] trunk/Source/WebKit
Title: [265178] trunk/Source/WebKit Revision 265178 Author krol...@apple.com Date 2020-08-01 10:54:44 -0700 (Sat, 01 Aug 2020) Log Message Prevent multiple invocations of generate-message-receiver.py https://bugs.webkit.org/show_bug.cgi?id=215054 Reviewed by Darin Adler. WebKit/DerivedSources.make is written such that generate-message-receiver.py can be invoked N times, where N is the value passed to -j. This results in the N invocations of generate-message-receiver.py trying trying to generate the same set of files at the same time, possibly leading to their being corrupted. We have reports of generated files starting with a 4K block of NULs, and this contention may be causing it. Address this by using a "pattern rule" in the makefile, which is documented in GNU make's documentation as the approach to take when there is one build rule that creates multiple outputs, as is the case here. See also and . No new tests -- no new or changed functionality. * DerivedSources.make: Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/DerivedSources.make Diff Modified: trunk/Source/WebKit/ChangeLog (265177 => 265178) --- trunk/Source/WebKit/ChangeLog 2020-08-01 17:51:17 UTC (rev 265177) +++ trunk/Source/WebKit/ChangeLog 2020-08-01 17:54:44 UTC (rev 265178) @@ -1,3 +1,28 @@ +2020-08-01 Keith Rollin + +Prevent multiple invocations of generate-message-receiver.py +https://bugs.webkit.org/show_bug.cgi?id=215054 + +Reviewed by Darin Adler. + +WebKit/DerivedSources.make is written such that +generate-message-receiver.py can be invoked N times, where N is the +value passed to -j. This results in the N invocations of +generate-message-receiver.py trying trying to generate the same set of +files at the same time, possibly leading to their being corrupted. We +have reports of generated files starting with a 4K block of NULs, and +this contention may be causing it. Address this by using a "pattern +rule" in the makefile, which is documented in GNU make's documentation +as the approach to take when there is one build rule that creates +multiple outputs, as is the case here. + +See also and +. + +No new tests -- no new or changed functionality. + +* DerivedSources.make: + 2020-08-01 Darin Adler Remove Range::create and many more uses of live ranges Modified: trunk/Source/WebKit/DerivedSources.make (265177 => 265178) --- trunk/Source/WebKit/DerivedSources.make 2020-08-01 17:51:17 UTC (rev 265177) +++ trunk/Source/WebKit/DerivedSources.make 2020-08-01 17:54:44 UTC (rev 265178) @@ -253,16 +253,26 @@ FRAMEWORK_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));') HEADER_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));') +MESSAGE_RECEIVER_FILES := $(addsuffix MessageReceiver.cpp,$(notdir $(MESSAGE_RECEIVERS))) +MESSAGES_FILES := $(addsufix Messages.h,$(notdir $(MESSAGE_RECEIVERS))) +MESSAGE_REPLIES_FILES := $(addsuffix MessagesReplies.h,$(notdir $(MESSAGE_RECEIVERS))) +MESSAGES_IN_FILES := $(addsuffix .messages.in,$(MESSAGE_RECEIVERS)) + +MESSAGE_RECEIVER_PATTERNS := $(subst .,%,$(MESSAGE_RECEIVER_FILES)) +MESSAGES_PATTERNS := $(subst .,%,$(MESSAGES_FILES)) +MESSAGE_REPLIES_PATTERNS := $(subst .,%,$(MESSAGE_REPLIES_FILES)) + .PHONY : all -all : MessageNames.h MessageNames.cpp \ -$(addsuffix MessageReceiver.cpp,$(notdir $(MESSAGE_RECEIVERS))) \ -$(addsuffix Messages.h,$(notdir $(MESSAGE_RECEIVERS))) \ -$(addsuffix MessagesReplies.h,$(notdir $(MESSAGE_RECEIVERS))) \ +all : \ +$(MESSAGE_RECEIVER_FILES) \ +$(MESSAGES_FILES) \ +$(MESSAGE_REPLIES_FILES) \ +MessageNames.h MessageNames.cpp \ # -$(addsuffix MessageReceiver.cpp,$(notdir $(MESSAGE_RECEIVERS))) $(addsufix Messages.h,$(notdir $(MESSAGE_RECEIVERS))) $(addsuffix MessagesReplies.h,$(notdir $(MESSAGE_RECEIVERS))) MessageNames.h MessageNames.cpp: $(addsuffix .messages.in,$(MESSAGE_RECEIVERS)) $(SCRIPTS) - @python $(WebKit2)/Scripts/generate-message-receiver.py $(WebKit2) $(MESSAGE_RECEIVERS) +$(MESSAGE_RECEIVER_PATTERNS) $(MESSAGES_PATTERNS) $(MESSAGE_REPLIES_PATTERNS) MessageNames%h MessageNames%cpp : $(MESSAGES_IN_FILES) $(SCRIPTS) + python $(WebKit2)/Scripts/generate-message-receiver.py $(WebKit2) $(MESSAGE_RECEIVERS) TEXT_PREPROCESSOR_FLAGS=-E -P -w ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [262935] trunk/Source/WebKitLegacy
Title: [262935] trunk/Source/WebKitLegacy Revision 262935 Author krol...@apple.com Date 2020-06-12 00:01:36 -0700 (Fri, 12 Jun 2020) Log Message Add dependencies for Migrate Headers and Generate Export Files build phases https://bugs.webkit.org/show_bug.cgi?id=213072 Reviewed by Tim Horton. These build phases have incomplete specifications for the files they consume and produce, which can lead to incorrect builds. Address this by: - Adding the WebCore/PrivateHeaders directory (which contains the headers being migrated) as input to the Migrate Headers build phase - Touching a timestamp file when re-exporting any headers in the Migrate Headers build phase - Adding the timestamp file as an output of the Migrate Headers build phase - Adding the timestamp file as an input of the Generate Export Files build phase - Adding other files that Generate Export Files consumes to the list of input files In this way, if any exported headers are changed, both Migrate Headers and Generate Export Files will be run. Source/WebKitLegacy: * WebKitLegacy.xcodeproj/project.pbxproj: Source/WebKitLegacy/mac: * MigrateHeaders.make: Modified Paths trunk/Source/WebKitLegacy/ChangeLog trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/MigrateHeaders.make Diff Modified: trunk/Source/WebKitLegacy/ChangeLog (262934 => 262935) --- trunk/Source/WebKitLegacy/ChangeLog 2020-06-12 06:17:48 UTC (rev 262934) +++ trunk/Source/WebKitLegacy/ChangeLog 2020-06-12 07:01:36 UTC (rev 262935) @@ -1,3 +1,31 @@ +2020-06-12 Keith Rollin + +Add dependencies for Migrate Headers and Generate Export Files build phases +https://bugs.webkit.org/show_bug.cgi?id=213072 + + +Reviewed by Tim Horton. + +These build phases have incomplete specifications for the files they +consume and produce, which can lead to incorrect builds. Address this +by: + +- Adding the WebCore/PrivateHeaders directory (which contains the + headers being migrated) as input to the Migrate Headers build phase +- Touching a timestamp file when re-exporting any headers in the + Migrate Headers build phase +- Adding the timestamp file as an output of the Migrate Headers build + phase +- Adding the timestamp file as an input of the Generate Export Files + build phase +- Adding other files that Generate Export Files consumes to the list + of input files + +In this way, if any exported headers are changed, both Migrate Headers +and Generate Export Files will be run. + +* WebKitLegacy.xcodeproj/project.pbxproj: + 2020-05-29 Keith Rollin Revert switch to XCBuild Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (262934 => 262935) --- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2020-06-12 06:17:48 UTC (rev 262934) +++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2020-06-12 07:01:36 UTC (rev 262935) @@ -3239,6 +3239,10 @@ files = ( ); inputPaths = ( +"$(PROJECT_DIR)/mac/WebKit.exp", +"$(PROJECT_DIR)/mac/WebKit.mac.exp", +"$(PROJECT_DIR)/ios/WebKit.iOS.exp", +"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/ReexportedWebCoreSymbols.timestamp", ); name = "Generate Export Files"; outputPaths = ( @@ -3255,9 +3259,11 @@ ); inputPaths = ( "$(PROJECT_DIR)/mac/MigrateHeaders.make", +"$(WEBCORE_PRIVATE_HEADERS_DIR)", ); name = "Migrate Headers"; outputPaths = ( +"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/ReexportedWebCoreSymbols.timestamp", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (262934 => 262935) --- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-06-12 06:17:48 UTC (rev 262934) +++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-06-12 07:01:36 UTC (rev 262935) @@ -1,3 +1,31 @@ +2020-06-12 Keith Rollin + +Add dependencies for Migrate Headers and Generate Export Files build phases +https://bugs.webkit.org/show_bug.cgi?id=213072 + + +Reviewed by Tim Horton. + +These build phases have incomplete specifications for the files they +consume and produce, which can lead to incorrect builds. Address this +by: + +- Adding the WebCore/PrivateHeaders directory (which contains the + headers being migrated) as input to the Migrate Headers build phase +- Touching a timestamp file when re-exporting any headers in the + Migrate Headers build phase +- Adding the timestamp file as an output of the Migrate Headers build + phase +- Adding the timestamp file as an input of the Generate Export Files + build phase +- Adding other files that Generate Export Files consumes
[webkit-changes] [262474] trunk/Source/ThirdParty/ANGLE
Title: [262474] trunk/Source/ThirdParty/ANGLE Revision 262474 Author krol...@apple.com Date 2020-06-02 20:59:46 -0700 (Tue, 02 Jun 2020) Log Message Change ANGLE's header postprocessing script to not rely on timestamps https://bugs.webkit.org/show_bug.cgi?id=212623 Reviewed by David Kilzer. Reviewed by Kennneth Russell. Some WebKit builds involve multiple passes, where each pass is a superset of the previous pass. In the cases where each pass produces the same files, it is required that files be produced in exactly the same way in each of those passes. A build process that relies on a file containing a timestamp trips up that prerequisite. adjust-angle-include-paths.sh uses such a mechanism, using a timestamp file to determine if any exported headers need to be post-processed. Since this violates our prerequisite, we need a different approach. Instead of using a timestamp, always perform the post-processing, but write the output to a temporary location. Then see if it differs from what's in the actual final destination. If the two files diff, then copy the one from the temporary location to the final destination. This approach does cause more work in the area of post-processing. However, this post-processing is actually very cheap. And avoiding the post-processing is not actually the original goal of the timestamp. The actual goal is to avoid touching the modification dates of the exported headers, which would then cause a lot of downstream rebuilding. The new approach with the temporary files also achieves that goal. * CMakeLists.txt: * adjust-angle-include-paths.sh: Modified Paths trunk/Source/ThirdParty/ANGLE/CMakeLists.txt trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh Diff Modified: trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (262473 => 262474) --- trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2020-06-03 03:48:52 UTC (rev 262473) +++ trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2020-06-03 03:59:46 UTC (rev 262474) @@ -150,17 +150,14 @@ FLATTENED ) -add_custom_command( -OUTPUT ${ANGLE_FRAMEWORK_HEADERS_DIR}/ANGLE/angle.timestamp +add_custom_target(ANGLE-webgl-headers DEPENDS LibGLESv2EntryPointsHeaders ANGLEWebGLHeaders COMMAND BUILT_PRODUCTS_DIR=${ANGLE_FRAMEWORK_HEADERS_DIR}/ +DERIVED_FILE_DIR=${BUILT_PRODUCTS_DIR} PUBLIC_HEADERS_FOLDER_PATH=ANGLE ${CMAKE_CURRENT_SOURCE_DIR}/adjust-angle-include-paths.sh VERBATIM ) -add_custom_target(ANGLE-webgl-headers -DEPENDS ${ANGLE_FRAMEWORK_HEADERS_DIR}/ANGLE/angle.timestamp -) add_dependencies(ANGLEFramework ANGLE-webgl-headers) endif () Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (262473 => 262474) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-06-03 03:48:52 UTC (rev 262473) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-06-03 03:59:46 UTC (rev 262474) @@ -1,3 +1,37 @@ +2020-06-02 Keith Rollin + +Change ANGLE's header postprocessing script to not rely on timestamps +https://bugs.webkit.org/show_bug.cgi?id=212623 + + +Reviewed by David Kilzer. +Reviewed by Kennneth Russell. + +Some WebKit builds involve multiple passes, where each pass is a +superset of the previous pass. In the cases where each pass produces +the same files, it is required that files be produced in exactly the +same way in each of those passes. A build process that relies on a +file containing a timestamp trips up that prerequisite. + +adjust-angle-include-paths.sh uses such a mechanism, using a timestamp +file to determine if any exported headers need to be post-processed. +Since this violates our prerequisite, we need a different approach. +Instead of using a timestamp, always perform the post-processing, but +write the output to a temporary location. Then see if it differs from +what's in the actual final destination. If the two files diff, then +copy the one from the temporary location to the final destination. + +This approach does cause more work in the area of post-processing. +However, this post-processing is actually very cheap. And avoiding the +post-processing is not actually the original goal of the timestamp. +The actual goal is to avoid touching the modification dates of the +exported headers, which would then cause a lot of downstream +rebuilding. The new approach with the temporary files also achieves +that goal. + +* CMakeLists.txt: +* adjust-angle-include-paths.sh: + 2020-06-02 Kenneth Russell Revise PVRTC compressed texture validation in ANGLE backend for WebGL Modified: trunk/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh (262473 => 262474) --- trunk/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh 2020-06-03 03:48:52 UTC
[webkit-changes] [262308] trunk
Title: [262308] trunk Revision 262308 Author krol...@apple.com Date 2020-05-29 11:40:48 -0700 (Fri, 29 May 2020) Log Message Revert switch to XCBuild https://bugs.webkit.org/show_bug.cgi?id=212530 Unreviewed build fix. Bug 209890 enabled the use of XCBuild by default. Since then, some build issues have shown up. While addressing them, temporarily turn off the use of XCBuild by default. .: * Makefile.shared: * WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings: Source/_javascript_Core: * Configurations/_javascript_Core.xcconfig: * _javascript_Core.xcodeproj/project.pbxproj: Source/ThirdParty/ANGLE: * ANGLE.xcodeproj/project.pbxproj: * Configurations/ANGLE.xcconfig: Source/ThirdParty/libwebrtc: * libwebrtc.xcodeproj/project.pbxproj: Source/WebCore: No new tests -- build fix. * WebCore.xcodeproj/project.pbxproj: Source/WebKit: * Configurations/WebKit.xcconfig: * WebKit.xcodeproj/project.pbxproj: Source/WebKitLegacy: * WebKitLegacy.xcodeproj/project.pbxproj: Source/WebKitLegacy/mac: * Configurations/WebKitLegacy.xcconfig: Tools: * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: * Scripts/build-webkit: * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: Modified Paths trunk/ChangeLog trunk/Makefile.shared trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/WebKit.xcconfig trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj trunk/Source/WebKitLegacy/ChangeLog trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj trunk/Tools/Scripts/build-webkit trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj trunk/WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings Diff Modified: trunk/ChangeLog (262307 => 262308) --- trunk/ChangeLog 2020-05-29 18:32:27 UTC (rev 262307) +++ trunk/ChangeLog 2020-05-29 18:40:48 UTC (rev 262308) @@ -1,3 +1,18 @@ +2020-05-29 Keith Rollin + +Revert switch to XCBuild +https://bugs.webkit.org/show_bug.cgi?id=212530 + + +Unreviewed build fix. + +Bug 209890 enabled the use of XCBuild by default. Since then, some +build issues have shown up. While addressing them, temporarily turn +off the use of XCBuild by default. + +* Makefile.shared: +* WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings: + 2020-05-27 Kenneth Russell Update MobileMiniBrowser project settings to current Xcode Modified: trunk/Makefile.shared (262307 => 262308) --- trunk/Makefile.shared 2020-05-29 18:32:27 UTC (rev 262307) +++ trunk/Makefile.shared 2020-05-29 18:40:48 UTC (rev 262308) @@ -47,8 +47,11 @@ ifeq ($(findstring UseNewBuildSystem,$(ARGS)),) CAN_USE_XCBUILD = $(shell perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print canUseXCBuild()') ifeq ($(CAN_USE_XCBUILD),1) - XCODE_OPTIONS += -UseNewBuildSystem=YES - XCODE_OPTIONS += USE_NEW_BUILD_SYSTEM=YES + # Temporarily disable default use of XCBuild until issues with it are ironed out. + #XCODE_OPTIONS += -UseNewBuildSystem=YES + #XCODE_OPTIONS += USE_NEW_BUILD_SYSTEM=YES + XCODE_OPTIONS += -UseNewBuildSystem=NO + XCODE_OPTIONS += USE_NEW_BUILD_SYSTEM=NO else XCODE_OPTIONS += -UseNewBuildSystem=NO XCODE_OPTIONS += USE_NEW_BUILD_SYSTEM=NO Modified: trunk/Source/_javascript_Core/ChangeLog (262307 => 262308) --- trunk/Source/_javascript_Core/ChangeLog 2020-05-29 18:32:27 UTC (rev 262307) +++ trunk/Source/_javascript_Core/ChangeLog 2020-05-29 18:40:48 UTC (rev 262308) @@ -1,3 +1,18 @@ +2020-05-29 Keith Rollin + +Revert switch to XCBuild +https://bugs.webkit.org/show_bug.cgi?id=212530 + + +Unreviewed build fix. + +Bug 209890 enabled the use of XCBuild by default. Since then, some +build issues have shown up. While addressing them, temporarily turn +off the use of XCBuild by default. + +* Configurations/_javascript_Core.xcconfig: +* _javascript_Core.xcodeproj/project.pbxproj: + 2020-05-29 Commit Queue Unreviewed, reverting r262245. Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (262307 => 262308) --- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2020-05-29
[webkit-changes] [262236] trunk/Source/WebKit
Title: [262236] trunk/Source/WebKit Revision 262236 Author krol...@apple.com Date 2020-05-27 22:53:17 -0700 (Wed, 27 May 2020) Log Message Add output file specifications to "Copy Custom WebContent Resources to Framework Private Headers" build phase in WebKit/WebContent https://bugs.webkit.org/show_bug.cgi?id=212452 Reviewed by Timothy Hatcher. The "Copy Custom WebContent Resources to Framework Private Headers" build phase in the WebContent target of the WebKit project doesn't advertise the files that it produces. This has consequences on later build phases that consume those files. In particular, XCBuild is left not knowing where those files are coming from, and it fails saying that those files don't exist. Fix this by adding the output files to the "output files" section of the custom build phase. No new tests -- this is just a build fix. * WebKit.xcodeproj/project.pbxproj: Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj Diff Modified: trunk/Source/WebKit/ChangeLog (262235 => 262236) --- trunk/Source/WebKit/ChangeLog 2020-05-28 05:32:50 UTC (rev 262235) +++ trunk/Source/WebKit/ChangeLog 2020-05-28 05:53:17 UTC (rev 262236) @@ -1,3 +1,23 @@ +2020-05-27 Keith Rollin + +Add output file specifications to "Copy Custom WebContent Resources to Framework Private Headers" build phase in WebKit/WebContent +https://bugs.webkit.org/show_bug.cgi?id=212452 + + +Reviewed by Timothy Hatcher. + +The "Copy Custom WebContent Resources to Framework Private Headers" +build phase in the WebContent target of the WebKit project doesn't +advertise the files that it produces. This has consequences on later +build phases that consume those files. In particular, XCBuild is left +not knowing where those files are coming from, and it fails saying +that those files don't exist. Fix this by adding the output files to +the "output files" section of the custom build phase. + +No new tests -- this is just a build fix. + +* WebKit.xcodeproj/project.pbxproj: + 2020-05-27 Tim Horton REGRESSION (PSON): Resizing WKWebView during cross-site navigation results in the page laying out at the wrong size Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (262235 => 262236) --- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-05-28 05:32:50 UTC (rev 262235) +++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-05-28 05:53:17 UTC (rev 262236) @@ -12371,6 +12371,11 @@ "$(SRCROOT)/Resources/WebContentProcess.xib", ); name = "Copy Custom WebContent Resources to Framework Private Headers"; + outputPaths = ( +"$(BUILT_PRODUCTS_DIR)/WebKit.framework/PrivateHeaders/CustomWebContentResources/WebContent.entitlements", +"$(BUILT_PRODUCTS_DIR)/WebKit.framework/PrivateHeaders/CustomWebContentResources/Info-WebContent.plist", +"$(BUILT_PRODUCTS_DIR)/WebKit.framework/PrivateHeaders/CustomWebContentResources/WebContentProcess.xib", + ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "Scripts/copy-webcontent-resources-to-private-headers.sh\n"; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [262182] trunk/Source
Title: [262182] trunk/Source Revision 262182 Author krol...@apple.com Date 2020-05-27 00:40:41 -0700 (Wed, 27 May 2020) Log Message Enable the use of XCBuild by default in Apple builds https://bugs.webkit.org/show_bug.cgi?id=209890 Unreviewed build fix. Check the value of XCODE_VERSION_ACTUAL rather than XCODE_VERSION_MAJOR when determining whether to use the XCBuild or non-XCBuild method of running header post-processing scripts. Source/_javascript_Core: * _javascript_Core.xcodeproj/project.pbxproj: Source/ThirdParty/ANGLE: * ANGLE.xcodeproj/project.pbxproj: Source/WebKit: No new tests -- this is a build fix. * WebKit.xcodeproj/project.pbxproj: Source/WebKitLegacy: * WebKitLegacy.xcodeproj/project.pbxproj: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj trunk/Source/WebKitLegacy/ChangeLog trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj Diff Modified: trunk/Source/_javascript_Core/ChangeLog (262181 => 262182) --- trunk/Source/_javascript_Core/ChangeLog 2020-05-27 07:13:56 UTC (rev 262181) +++ trunk/Source/_javascript_Core/ChangeLog 2020-05-27 07:40:41 UTC (rev 262182) @@ -1,3 +1,15 @@ +2020-05-27 Keith Rollin + +Enable the use of XCBuild by default in Apple builds +https://bugs.webkit.org/show_bug.cgi?id=209890 + + +Unreviewed build fix. Check the value of XCODE_VERSION_ACTUAL rather +than XCODE_VERSION_MAJOR when determining whether to use the XCBuild +or non-XCBuild method of running header post-processing scripts. + +* _javascript_Core.xcodeproj/project.pbxproj: + 2020-05-26 Mark Lam Add some new emitters to the X86_64 and ARM64 MacroAssemblers. Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (262181 => 262182) --- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2020-05-27 07:13:56 UTC (rev 262181) +++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2020-05-27 07:40:41 UTC (rev 262182) @@ -10861,7 +10861,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ \"${XCODE_VERSION_MAJOR}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" != \"NO\" ]; then\n# In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step.\nexit 0\nfi\n\nexec ${SRCROOT}/postprocess-headers.sh\n"; + shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" != \"NO\" ]; then\n# In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step.\nexit 0\nfi\n\nexec ${SRCROOT}/postprocess-headers.sh\n"; }; 374F95C9205F9975002BF68F /* Make libWTF.a Symbolic Link */ = { isa = PBXShellScriptBuildPhase; Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (262181 => 262182) --- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2020-05-27 07:13:56 UTC (rev 262181) +++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2020-05-27 07:40:41 UTC (rev 262182) @@ -3058,7 +3058,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ \"${XCODE_VERSION_MAJOR}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" != \"NO\" ]; then\n# In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step.\nexit 0\nfi\n\nexec \"$SRCROOT/adjust-angle-include-paths.sh\"\n"; + shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${USE_NEW_BUILD_SYSTEM}\" != \"NO\" ]; then\n# In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step.\nexit 0\nfi\n\nexec \"$SRCROOT/adjust-angle-include-paths.sh\"\n"; }; /* End PBXShellScriptBuildPhase section */ Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (262181 => 262182) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-05-27 07:13:56 UTC (rev 262181) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-05-27 07:40:41 UTC (rev 262182) @@ -1,3 +1,15 @@ +2020-05-27 Keith Rollin + +Enable the use of XCBuild by default in Apple builds +https://bugs.webkit.org/show_bug.cgi?id=209890 + + +Unreviewed build fix. Check the value of XCODE_VERSION_ACTUAL rather +than XCODE_VERSION_MAJOR when determining whether to use the XCBuild +or non-XCBuild method of running header post-processing scripts. + +
[webkit-changes] [262147] trunk
Title: [262147] trunk Revision 262147 Author krol...@apple.com Date 2020-05-26 09:17:44 -0700 (Tue, 26 May 2020) Log Message Enable the use of XCBuild by default in Apple builds https://bugs.webkit.org/show_bug.cgi?id=209890 Reviewed by Darin Adler. Switch from the "legacy" Xcode build system to the "new" build system (also known as "XCBuild"). Switching to the new system speeds up builds by a small percentage, better validates projects for build-related issues (such as dependency cycles), lets WebKit benefit from future improvements in XCBuild such as those coming from the underlying llbuild open source project, and prepares us for any other tools built for this new ecosystem. Specific changes: - Remove Xcode project and workspace settings that selected the Build system, allowing the default to take hold (which is currently the New build system). - Updated webkitdirs.pm with a terser check for Xcode version. - Update build-webkit and Makefile.shared to be explicit when using the old build system (no longer treat it as a default or fall-back configuration). - Update various xcconfig files similarly to treat the default as using the new build system. - Update various post-processing build steps to check for Xcode 11.4 and to no longer treat the default as using the old build system. .: * Makefile.shared: * WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings: Source/_javascript_Core: * Configurations/_javascript_Core.xcconfig: * _javascript_Core.xcodeproj/project.pbxproj: Source/ThirdParty/ANGLE: * ANGLE.xcodeproj/project.pbxproj: * Configurations/ANGLE.xcconfig: Source/ThirdParty/libwebrtc: * libwebrtc.xcodeproj/project.pbxproj: Source/WebCore: No new tests -- no changed functionality. * WebCore.xcodeproj/project.pbxproj: Source/WebKit: * Configurations/WebKit.xcconfig: * WebKit.xcodeproj/project.pbxproj: Source/WebKitLegacy: * WebKitLegacy.xcodeproj/project.pbxproj: Source/WebKitLegacy/mac: * Configurations/WebKitLegacy.xcconfig: Tools: * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: * Scripts/build-webkit: * Scripts/webkitdirs.pm: (canUseXCBuild): * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: Modified Paths trunk/ChangeLog trunk/Makefile.shared trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/WebKit.xcconfig trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj trunk/Source/WebKitLegacy/ChangeLog trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj trunk/Tools/Scripts/build-webkit trunk/Tools/Scripts/webkitdirs.pm trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj trunk/WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings Diff Modified: trunk/ChangeLog (262146 => 262147) --- trunk/ChangeLog 2020-05-26 16:17:16 UTC (rev 262146) +++ trunk/ChangeLog 2020-05-26 16:17:44 UTC (rev 262147) @@ -1,3 +1,36 @@ +2020-05-26 Keith Rollin + +Enable the use of XCBuild by default in Apple builds +https://bugs.webkit.org/show_bug.cgi?id=209890 + + +Reviewed by Darin Adler. + +Switch from the "legacy" Xcode build system to the "new" build system +(also known as "XCBuild"). Switching to the new system speeds up +builds by a small percentage, better validates projects for +build-related issues (such as dependency cycles), lets WebKit benefit +from future improvements in XCBuild such as those coming from the +underlying llbuild open source project, and prepares us for any other +tools built for this new ecosystem. + +Specific changes: + +- Remove Xcode project and workspace settings that selected the Build + system, allowing the default to take hold (which is currently the + New build system). +- Updated webkitdirs.pm with a terser check for Xcode version. +- Update build-webkit and Makefile.shared to be explicit when using + the old build system (no longer treat it as a default or fall-back + configuration). +- Update various xcconfig files similarly to treat the default as + using the new build system. +- Update various post-processing build steps to check for Xcode 11.4
[webkit-changes] [261249] trunk/Source/WebKit
Title: [261249] trunk/Source/WebKit Revision 261249 Author krol...@apple.com Date 2020-05-06 13:35:11 -0700 (Wed, 06 May 2020) Log Message Better surfacing of the presenting parent PID in the Network process https://bugs.webkit.org/show_bug.cgi?id=211495 Reviewed by Youenn Fablet. In Bug 205295, NetworkResourceLoader logging was improved, with one of the changes being that the PID of parent process that invoked the Network process was logged at the start of NetworkResourceLoader::start(). However, there was an execution path that skipped calling start() (NetworkConnectionToWebProcess::scheduleResourceLoad -> NetworkResourceLoader::startWithServiceWorker -> serviceWorkerDidNotHandle -> restartNetworkLoad -> startNetworkLoad), and so the the logging would not show the parent PID. This logging is needed for diagnostic purposes, so tweak the logging a little bit more in order to ensure we emit it. In this change, logging is added to various loading-related NetworkConnectionToWebProcess entry points (not just scheduleResourceLoad) in order to (a) ensure we emit the logging we want and (b) to give a clearer picture of what operations are being invoked in the Network process. No new tests -- no new or changed functionality. * NetworkProcess/NetworkConnectionToWebProcess.cpp: (WebKit::NetworkConnectionToWebProcess::hasUploadStateChanged): (WebKit::NetworkConnectionToWebProcess::resolveBlobReferences): (WebKit::NetworkConnectionToWebProcess::scheduleResourceLoad): (WebKit::NetworkConnectionToWebProcess::performSynchronousLoad): (WebKit::NetworkConnectionToWebProcess::loadPing): (WebKit::NetworkConnectionToWebProcess::preconnectTo): (WebKit::NetworkConnectionToWebProcess::serverToContextConnectionNoLongerNeeded): * NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::start): Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp Diff Modified: trunk/Source/WebKit/ChangeLog (261248 => 261249) --- trunk/Source/WebKit/ChangeLog 2020-05-06 20:11:39 UTC (rev 261248) +++ trunk/Source/WebKit/ChangeLog 2020-05-06 20:35:11 UTC (rev 261249) @@ -1,3 +1,40 @@ +2020-05-06 Keith Rollin + +Better surfacing of the presenting parent PID in the Network process +https://bugs.webkit.org/show_bug.cgi?id=211495 + + +Reviewed by Youenn Fablet. + +In Bug 205295, NetworkResourceLoader logging was improved, with one of +the changes being that the PID of parent process that invoked the +Network process was logged at the start of +NetworkResourceLoader::start(). However, there was an execution path +that skipped calling start() +(NetworkConnectionToWebProcess::scheduleResourceLoad -> +NetworkResourceLoader::startWithServiceWorker -> +serviceWorkerDidNotHandle -> restartNetworkLoad -> startNetworkLoad), +and so the the logging would not show the parent PID. This logging is +needed for diagnostic purposes, so tweak the logging a little bit more +in order to ensure we emit it. In this change, logging is added to +various loading-related NetworkConnectionToWebProcess entry points +(not just scheduleResourceLoad) in order to (a) ensure we emit the +logging we want and (b) to give a clearer picture of what operations +are being invoked in the Network process. + +No new tests -- no new or changed functionality. + +* NetworkProcess/NetworkConnectionToWebProcess.cpp: +(WebKit::NetworkConnectionToWebProcess::hasUploadStateChanged): +(WebKit::NetworkConnectionToWebProcess::resolveBlobReferences): +(WebKit::NetworkConnectionToWebProcess::scheduleResourceLoad): +(WebKit::NetworkConnectionToWebProcess::performSynchronousLoad): +(WebKit::NetworkConnectionToWebProcess::loadPing): +(WebKit::NetworkConnectionToWebProcess::preconnectTo): +(WebKit::NetworkConnectionToWebProcess::serverToContextConnectionNoLongerNeeded): +* NetworkProcess/NetworkResourceLoader.cpp: +(WebKit::NetworkResourceLoader::start): + 2020-05-06 Wenson Hsieh Cut and paste from Google Doc to Notes in several (non-Latin) languages doesn't work Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (261248 => 261249) --- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2020-05-06 20:11:39 UTC (rev 261248) +++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2020-05-06 20:35:11 UTC (rev 261249) @@ -81,7 +81,7 @@ #endif #undef RELEASE_LOG_IF_ALLOWED -#define RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(m_sessionID.isAlwaysOnLoggingAllowed(), channel, "%p - NetworkConnectionToWebProcess::" fmt, this, ##__VA_ARGS__) +#define RELEASE_LOG_IF_ALLOWED(channel, fmt, ...)
[webkit-changes] [259826] trunk
Title: [259826] trunk Revision 259826 Author krol...@apple.com Date 2020-04-09 13:51:59 -0700 (Thu, 09 Apr 2020) Log Message Set ENTITLEMENTS_REQUIRED=NO for some Xcode build targets https://bugs.webkit.org/show_bug.cgi?id=210250 Reviewed by Jonathan Bedard. When building with the public version of Xcode 11.4, with XCBuild enabled, and targeting the iOS device, some build targets issue an error like: error: An empty identity is not valid when signing a binary for the product type 'Command-line Tool'. (in target 'yasm' from project 'libwebrtc') A comment in suggests setting ENTITLEMENTS_REQUIRED=NO to relax the requirement. To that end, when building with the public Xcode, establish that setting for the affected targets. Source/ThirdParty/libwebrtc: * Configurations/Base.xcconfig: Source/WebCore: No new tests -- no changed functionality. * Configurations/WebCoreTestShim.xcconfig: * Configurations/WebCoreTestSupport.xcconfig: Source/WebKit: * Configurations/GPUService.xcconfig: * Configurations/NetworkService.xcconfig: * Configurations/PluginProcessShim.xcconfig: * Configurations/PluginService.64.xcconfig: * Configurations/SecItemShim.xcconfig: * Configurations/WebContentService.xcconfig: Tools: With this change, we can also remove IDEProvisioningProfileSupportRelaxed=YES from webkitdirs.pm. * Scripts/webkitdirs.pm: (XcodeOptions): * TestWebKitAPI/Configurations/TestWTF.xcconfig: * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig: Modified Paths trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/GPUService.xcconfig trunk/Source/WebKit/Configurations/NetworkService.xcconfig trunk/Source/WebKit/Configurations/PluginProcessShim.xcconfig trunk/Source/WebKit/Configurations/PluginService.64.xcconfig trunk/Source/WebKit/Configurations/SecItemShim.xcconfig trunk/Source/WebKit/Configurations/WebContentService.xcconfig trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitdirs.pm trunk/Tools/TestWebKitAPI/Configurations/TestWTF.xcconfig trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig Diff Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (259825 => 259826) --- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-04-09 20:51:22 UTC (rev 259825) +++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-04-09 20:51:59 UTC (rev 259826) @@ -1,3 +1,26 @@ +2020-04-09 Keith Rollin + +Set ENTITLEMENTS_REQUIRED=NO for some Xcode build targets +https://bugs.webkit.org/show_bug.cgi?id=210250 + + +Reviewed by Jonathan Bedard. + +When building with the public version of Xcode 11.4, with XCBuild +enabled, and targeting the iOS device, some build targets issue an +error like: + +error: An empty identity is not valid when signing a binary for +the product type 'Command-line Tool'. (in target 'yasm' from +project 'libwebrtc') + +A comment in suggests setting +ENTITLEMENTS_REQUIRED=NO to relax the requirement. To that end, when +building with the public Xcode, establish that setting for the +affected targets. + +* Configurations/Base.xcconfig: + 2020-04-08 Truitt Savell Unreviewed, reverting r259708. Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig (259825 => 259826) --- trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig 2020-04-09 20:51:22 UTC (rev 259825) +++ trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig 2020-04-09 20:51:59 UTC (rev 259826) @@ -61,6 +61,11 @@ STRIP_INSTALLED_PRODUCT = NO; WARNING_CFLAGS = -Wexit-time-destructors -Wglobal-constructors -Wthread-safety; +ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK)) +ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO; +ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO; +ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED); + SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx; VALID_ARCHS = $(ARCHS_STANDARD_64_BIT); Modified: trunk/Source/WebCore/ChangeLog (259825 => 259826) --- trunk/Source/WebCore/ChangeLog 2020-04-09 20:51:22 UTC (rev 259825) +++ trunk/Source/WebCore/ChangeLog 2020-04-09 20:51:59 UTC (rev 259826) @@ -1,3 +1,29 @@ +2020-04-09 Keith Rollin + +Set ENTITLEMENTS_REQUIRED=NO for some Xcode build targets +https://bugs.webkit.org/show_bug.cgi?id=210250 + + +Reviewed by Jonathan Bedard. + +When building with the public version of Xcode 11.4, with XCBuild +enabled, and targeting the iOS device, some build targets issue an +error like: + +error: An empty identity is not valid when signing a binary for +
[webkit-changes] [259708] trunk
Title: [259708] trunk Revision 259708 Author krol...@apple.com Date 2020-04-08 02:12:07 -0700 (Wed, 08 Apr 2020) Log Message Enable the use of XCBuild by default in Apple builds https://bugs.webkit.org/show_bug.cgi?id=209890 Reviewed by Darin Adler. Switch from the "legacy" Xcode build system to the "new" build system (also known as "XCBuild"). Switching to the new system speeds up builds by a small percentage, better validates projects for build-related issues (such as dependency cycles), lets WebKit benefit from future improvements in XCBuild such as those coming from the underlying llbuild open source project, and prepares us for any other tools built for this new ecosystem. Specific changes: - Remove Xcode project and workspace settings that selected the Build system, allowing the default to take hold (which is currently the New build system). - Updated webkitdirs.pm with a terser check for Xcode version. - Update build-webkit and Makefile.shared to be explicit when using the old build system (no longer treat it as a default or fall-back configuration). - Update various xcconfig files similarly to treat the default as using the new build system. - Update various post-processing build steps to check for Xcode 11.4 and to no longer treat the default as using the old build system. .: * Makefile.shared: * WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings: Source/_javascript_Core: * Configurations/_javascript_Core.xcconfig: * _javascript_Core.xcodeproj/project.pbxproj: Source/ThirdParty/ANGLE: * ANGLE.xcodeproj/project.pbxproj: * Configurations/ANGLE.xcconfig: Source/ThirdParty/libwebrtc: * libwebrtc.xcodeproj/project.pbxproj: Source/WebCore: No new tests -- no changed functionality. * WebCore.xcodeproj/project.pbxproj: Source/WebKit: * Configurations/WebKit.xcconfig: * WebKit.xcodeproj/project.pbxproj: Source/WebKitLegacy: * WebKitLegacy.xcodeproj/project.pbxproj: Source/WebKitLegacy/mac: * Configurations/WebKitLegacy.xcconfig: Tools: * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: * Scripts/build-webkit: * Scripts/webkitdirs.pm: (canUseXCBuild): * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: Modified Paths trunk/ChangeLog trunk/Makefile.shared trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/WebKit.xcconfig trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj trunk/Source/WebKitLegacy/ChangeLog trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj trunk/Tools/Scripts/build-webkit trunk/Tools/Scripts/webkitdirs.pm trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj trunk/WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings Diff Modified: trunk/ChangeLog (259707 => 259708) --- trunk/ChangeLog 2020-04-08 08:40:19 UTC (rev 259707) +++ trunk/ChangeLog 2020-04-08 09:12:07 UTC (rev 259708) @@ -1,3 +1,36 @@ +2020-04-08 Keith Rollin + +Enable the use of XCBuild by default in Apple builds +https://bugs.webkit.org/show_bug.cgi?id=209890 + + +Reviewed by Darin Adler. + +Switch from the "legacy" Xcode build system to the "new" build system +(also known as "XCBuild"). Switching to the new system speeds up +builds by a small percentage, better validates projects for +build-related issues (such as dependency cycles), lets WebKit benefit +from future improvements in XCBuild such as those coming from the +underlying llbuild open source project, and prepares us for any other +tools built for this new ecosystem. + +Specific changes: + +- Remove Xcode project and workspace settings that selected the Build + system, allowing the default to take hold (which is currently the + New build system). +- Updated webkitdirs.pm with a terser check for Xcode version. +- Update build-webkit and Makefile.shared to be explicit when using + the old build system (no longer treat it as a default or fall-back + configuration). +- Update various xcconfig files similarly to treat the default as + using the new build system. +- Update various post-processing build steps to check for Xcode 11.4
[webkit-changes] [259475] trunk/Source/ThirdParty/ANGLE
Title: [259475] trunk/Source/ThirdParty/ANGLE Revision 259475 Author krol...@apple.com Date 2020-04-03 11:00:32 -0700 (Fri, 03 Apr 2020) Log Message Do not link with OpenGL on Apple platforms https://bugs.webkit.org/show_bug.cgi?id=209946 Reviewed by Sam Weinig. OpenGL is not used in our build of ANGLE. Attempting to link with it causes warnings, which can turn into errors in some cases (in particular, when building with Xcode's "new" build system). * ANGLE.xcodeproj/project.pbxproj: Modified Paths trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ChangeLog Diff Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (259474 => 259475) --- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2020-04-03 17:55:09 UTC (rev 259474) +++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2020-04-03 18:00:32 UTC (rev 259475) @@ -452,7 +452,6 @@ 5CB301461DE39F1A00D2C405 /* VertexArrayGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB301131DE39F1A00D2C405 /* VertexArrayGL.h */; }; 5CB3014F1DE39F4700D2C405 /* DisplayCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB301491DE39F4700D2C405 /* DisplayCGL.h */; }; 5CB301511DE39F4700D2C405 /* PbufferSurfaceCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB3014B1DE39F4700D2C405 /* PbufferSurfaceCGL.h */; }; - 5CB304921DE4156200D2C405 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048D1DE4144400D2C405 /* OpenGL.framework */; }; 5CB304931DE4156B00D2C405 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048F1DE4145500D2C405 /* QuartzCore.framework */; }; 5CB304941DE4157200D2C405 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB3048B1DE4143500D2C405 /* CoreGraphics.framework */; }; 5CB304961DE4157B00D2C405 /* entry_points_egl_ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB300BC1DE39E7500D2C405 /* entry_points_egl_ext.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1518,7 +1517,6 @@ buildActionMask = 2147483647; files = ( 5CB304941DE4157200D2C405 /* CoreGraphics.framework in Frameworks */, -5CB304921DE4156200D2C405 /* OpenGL.framework in Frameworks */, 5CB304931DE4156B00D2C405 /* QuartzCore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (259474 => 259475) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-04-03 17:55:09 UTC (rev 259474) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-04-03 18:00:32 UTC (rev 259475) @@ -1,3 +1,17 @@ +2020-04-03 Keith Rollin + +Do not link with OpenGL on Apple platforms +https://bugs.webkit.org/show_bug.cgi?id=209946 + + +Reviewed by Sam Weinig. + +OpenGL is not used in our build of ANGLE. Attempting to link with it +causes warnings, which can turn into errors in some cases (in +particular, when building with Xcode's "new" build system). + +* ANGLE.xcodeproj/project.pbxproj: + 2020-04-03 David Kilzer [Xcode] Replace ASAN_OTHER_CFLAGS and ASAN_OTHER_CPLUSPLUSFLAGS with $(inherited) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [259400] trunk/Source/WTF
Title: [259400] trunk/Source/WTF Revision 259400 Author krol...@apple.com Date 2020-04-02 11:44:57 -0700 (Thu, 02 Apr 2020) Log Message Address static analysis warning in DataLog.cpp: Value stored to 'pathCharactersAvailable' is never read https://bugs.webkit.org/show_bug.cgi?id=202153 Reviewed by David Kilzer. Bug 168914 introduced some code that will initialize a variable to zero, but then never use that variable afterwards. Address this by removing the assignment. * wtf/DataLog.cpp: (WTF::setDataFile): Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/DataLog.cpp Diff Modified: trunk/Source/WTF/ChangeLog (259399 => 259400) --- trunk/Source/WTF/ChangeLog 2020-04-02 18:37:04 UTC (rev 259399) +++ trunk/Source/WTF/ChangeLog 2020-04-02 18:44:57 UTC (rev 259400) @@ -1,3 +1,18 @@ +2020-04-02 Keith Rollin + +Address static analysis warning in DataLog.cpp: Value stored to 'pathCharactersAvailable' is never read +https://bugs.webkit.org/show_bug.cgi?id=202153 + + +Reviewed by David Kilzer. + +Bug 168914 introduced some code that will initialize a variable to +zero, but then never use that variable afterwards. Address this by +removing the assignment. + +* wtf/DataLog.cpp: +(WTF::setDataFile): + 2020-03-31 Michael Catanzaro Update check for aarch64 Modified: trunk/Source/WTF/wtf/DataLog.cpp (259399 => 259400) --- trunk/Source/WTF/wtf/DataLog.cpp 2020-04-02 18:37:04 UTC (rev 259399) +++ trunk/Source/WTF/wtf/DataLog.cpp 2020-04-02 18:44:57 UTC (rev 259400) @@ -133,9 +133,7 @@ if (pathCharactersAvailable) { int pidTextLength = snprintf(nextDest, pathCharactersAvailable, "%d", getCurrentProcessID()); -if (pidTextLength < 0 || static_cast(pidTextLength) >= pathCharactersAvailable) -pathCharactersAvailable = 0; -else { +if (pidTextLength >= 0 && static_cast(pidTextLength) < pathCharactersAvailable) { pathCharactersAvailable -= static_cast(pidTextLength); nextDest += pidTextLength; strncpy(nextDest, pidFormat + 4, pathCharactersAvailable); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [258815] trunk/Source/ThirdParty/ANGLE
Title: [258815] trunk/Source/ThirdParty/ANGLE Revision 258815 Author krol...@apple.com Date 2020-03-21 19:57:36 -0700 (Sat, 21 Mar 2020) Log Message Set INSTALLHDRS_SCRIPT_PHASE in ANGLE builds https://bugs.webkit.org/show_bug.cgi?id=209384 Reviewed by Dan Bernstein. Production ANGLE builds are technically non-compliant. During the installhdrs build action, ANGLE headers are exported but are not post-processed. This differs from the install build action, where the exported headers *are* post-processed. The headers need to be treated identically under both actions. The post-processing is enabled by setting the INSTALLHDRS_SCRIPT_PHASE build setting to YES. Most other WebKit projects already set this setting (see, for example, https://trac.webkit.org/changeset/155787, https://trac.webkit.org/changeset/110327, and https://trac.webkit.org/changeset/41417). * Configurations/ANGLE.xcconfig: Modified Paths trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig Diff Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (258814 => 258815) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-03-22 01:31:25 UTC (rev 258814) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-03-22 02:57:36 UTC (rev 258815) @@ -1,3 +1,24 @@ +2020-03-21 Keith Rollin + +Set INSTALLHDRS_SCRIPT_PHASE in ANGLE builds +https://bugs.webkit.org/show_bug.cgi?id=209384 + + +Reviewed by Dan Bernstein. + +Production ANGLE builds are technically non-compliant. During the +installhdrs build action, ANGLE headers are exported but are not +post-processed. This differs from the install build action, where the +exported headers *are* post-processed. The headers need to be treated +identically under both actions. The post-processing is enabled by +setting the INSTALLHDRS_SCRIPT_PHASE build setting to YES. Most other +WebKit projects already set this setting (see, for example, +https://trac.webkit.org/changeset/155787, +https://trac.webkit.org/changeset/110327, and +https://trac.webkit.org/changeset/41417). + +* Configurations/ANGLE.xcconfig: + 2020-03-15 Michael Catanzaro [ANGLE] Source/ThirdParty/ANGLE/src/common/utilities.cpp:10: warning: ignoring #pragma clang diagnostic [-Wunknown-pragmas] Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig (258814 => 258815) --- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig 2020-03-22 01:31:25 UTC (rev 258814) +++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig 2020-03-22 02:57:36 UTC (rev 258815) @@ -3,6 +3,7 @@ PRODUCT_NAME = ANGLE; +INSTALLHDRS_SCRIPT_PHASE = YES; APPLY_RULES_IN_COPY_HEADERS = $(USE_NEW_BUILD_SYSTEM); CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [258520] trunk
Title: [258520] trunk Revision 258520 Author krol...@apple.com Date 2020-03-16 14:50:22 -0700 (Mon, 16 Mar 2020) Log Message Remove support for WebKitSystemInterface https://bugs.webkit.org/show_bug.cgi?id=208894 Reviewed by Brent Fulgham. This project provided support for facilities that are now handled elsewhere and is no longer needed. .: * .gitignore: * Source/PlatformWin.cmake: * Source/cmake/OptionsAppleWin.cmake: Tools: * Scripts/copy-webkitlibraries-to-product-directory: WebKitLibraries: * Makefile: * WebKitSystemInterface.h: Removed. * win/include/WebKitSystemInterface/WebKitSystemInterface.h: Removed. * win/lib32/WebKitSystemInterface.lib: Removed. Modified Paths trunk/.gitignore trunk/ChangeLog trunk/Source/PlatformWin.cmake trunk/Source/cmake/OptionsAppleWin.cmake trunk/Tools/ChangeLog trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory trunk/WebKitLibraries/ChangeLog trunk/WebKitLibraries/Makefile Removed Paths trunk/WebKitLibraries/WebKitSystemInterface.h trunk/WebKitLibraries/win/include/ trunk/WebKitLibraries/win/lib32/ Diff Modified: trunk/.gitignore (258519 => 258520) --- trunk/.gitignore 2020-03-16 21:41:31 UTC (rev 258519) +++ trunk/.gitignore 2020-03-16 21:50:22 UTC (rev 258520) @@ -33,8 +33,6 @@ # Ignore files installed by WebKitSupportLibrary/WebKitAuxiliaryLibrary/WinCairoRequirements /WebKitSupportLibrary.zip /WebKitLibraries/win/ -!/WebKitLibraries/win/include/WebKitSystemInterface/ -!/WebKitLibraries/win/lib32/WebKitSystemInterface.lib !/WebKitLibraries/win/tools/scripts/ # Ignore files generated by Qt Creator: Modified: trunk/ChangeLog (258519 => 258520) --- trunk/ChangeLog 2020-03-16 21:41:31 UTC (rev 258519) +++ trunk/ChangeLog 2020-03-16 21:50:22 UTC (rev 258520) @@ -1,3 +1,18 @@ +2020-03-16 Keith Rollin + +Remove support for WebKitSystemInterface +https://bugs.webkit.org/show_bug.cgi?id=208894 + + +Reviewed by Brent Fulgham. + +This project provided support for facilities that are now handled +elsewhere and is no longer needed. + +* .gitignore: +* Source/PlatformWin.cmake: +* Source/cmake/OptionsAppleWin.cmake: + 2020-03-13 Sergio Villar Senin [WebXR] IDLs, stubs and build configuration for WPE Modified: trunk/Source/PlatformWin.cmake (258519 => 258520) --- trunk/Source/PlatformWin.cmake 2020-03-16 21:41:31 UTC (rev 258519) +++ trunk/Source/PlatformWin.cmake 2020-03-16 21:50:22 UTC (rev 258520) @@ -10,10 +10,6 @@ WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) -if (EXISTS ${CMAKE_SOURCE_DIR}/../Internal/WebKit/WebKitSystemInterface/win/CMakeLists.txt) -add_subdirectory(${CMAKE_SOURCE_DIR}/../Internal/WebKit/WebKitSystemInterface/win ${CMAKE_CURRENT_BINARY_DIR}/WebKitSystemInterface) -endif () - if (EXISTS ${CMAKE_SOURCE_DIR}/../Internal/Tools/WKTestBrowser/CMakeLists.txt) add_subdirectory(${CMAKE_SOURCE_DIR}/../Internal/Tools/WKTestBrowser ${CMAKE_CURRENT_BINARY_DIR}/WKTestBrowser) endif () Modified: trunk/Source/cmake/OptionsAppleWin.cmake (258519 => 258520) --- trunk/Source/cmake/OptionsAppleWin.cmake 2020-03-16 21:41:31 UTC (rev 258519) +++ trunk/Source/cmake/OptionsAppleWin.cmake 2020-03-16 21:50:22 UTC (rev 258520) @@ -1,5 +1,8 @@ -# The static runtime is required for AppleWin due to WebKitSystemInterface.lib -# being compiled with a static runtime. +# The static runtime used to be required for AppleWin due to +# WebKitSystemInterface.lib being compiled with a static runtime. That library +# is no longer used, but we keep building with static runtime for backward +# compatibility. But if someone decides that it's OK to require existing +# projects to build with the runtime DLLs, that's now technically possible. set(MSVC_STATIC_RUNTIME ON) if (DEFINED ENV{AppleApplicationSupportSDK}) Modified: trunk/Tools/ChangeLog (258519 => 258520) --- trunk/Tools/ChangeLog 2020-03-16 21:41:31 UTC (rev 258519) +++ trunk/Tools/ChangeLog 2020-03-16 21:50:22 UTC (rev 258520) @@ -1,3 +1,16 @@ +2020-03-16 Keith Rollin + +Remove support for WebKitSystemInterface +https://bugs.webkit.org/show_bug.cgi?id=208894 + + +Reviewed by Brent Fulgham. + +This project provided support for facilities that are now handled +elsewhere and is no longer needed. + +* Scripts/copy-webkitlibraries-to-product-directory: + 2020-03-16 Per Arne Vollan [macOS] Accessibility sandbox regressions Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (258519 => 258520) --- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2020-03-16 21:41:31 UTC (rev 258519) +++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2020-03-16 21:50:22 UTC (rev 258520) @@ -32,7 +32,6 @@ use webkitdirs; my $showHelp = 0; -my $wksi = 0; my $clean = 0; my $useFullLibPaths = 0; my $osxVersion; @@ -44,7 +43,6 @@ my $usage = < Usage: $programName [options]
[webkit-changes] [257648] trunk/Source
Title: [257648] trunk/Source Revision 257648 Author krol...@apple.com Date 2020-02-28 11:43:33 -0800 (Fri, 28 Feb 2020) Log Message Convert frame address in logging statements to pageID+frameID https://bugs.webkit.org/show_bug.cgi?id=208325 Reviewed by Alex Christensen. Some old logging prints the address of the associated frame object. Annotating logging statements this way makes it difficult to match up that logging with other logging that uses pageID+frameID. Update the logging to consistently use the latter format. Source/WebCore: No new tests -- no new or changed functionality. * loader/DocumentLoader.cpp: (WebCore::DocumentLoader::setRequest): (WebCore::DocumentLoader::setMainDocumentError): (WebCore::DocumentLoader::mainReceivedError): (WebCore::DocumentLoader::stopLoading): (WebCore::DocumentLoader::notifyFinished): (WebCore::DocumentLoader::willSendRequest): (WebCore::DocumentLoader::tryLoadingSubstituteData): (WebCore::DocumentLoader::disallowDataRequest const): (WebCore::DocumentLoader::continueAfterContentPolicy): (WebCore::DocumentLoader::startLoadingMainResource): (WebCore::DocumentLoader::loadMainResource): (WebCore::DocumentLoader::cancelMainResourceLoad): * loader/FrameLoader.cpp: (WebCore::FrameLoader::pageID const): (WebCore::FrameLoader::frameID const): (WebCore::FrameLoader::retryAfterFailedCacheOnlyMainResourceLoad): * loader/FrameLoader.h: * loader/ResourceLoader.cpp: * loader/SubresourceLoader.cpp: * loader/cache/CachedResource.cpp: (WebCore::CachedResource::load): * loader/cache/CachedResourceLoader.cpp: (WebCore::CachedResourceLoader::requestResource): * page/Frame.cpp: (WebCore::Frame::pageID const): (WebCore::Frame::frameID const): * page/Frame.h: * page/FrameView.cpp: Source/WebKit: * WebProcess/Network/WebLoaderStrategy.cpp: (WebKit::WebLoaderStrategy::loadResource): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/DocumentLoader.cpp trunk/Source/WebCore/loader/FrameLoader.cpp trunk/Source/WebCore/loader/FrameLoader.h trunk/Source/WebCore/loader/ResourceLoader.cpp trunk/Source/WebCore/loader/SubresourceLoader.cpp trunk/Source/WebCore/loader/cache/CachedResource.cpp trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp trunk/Source/WebCore/page/Frame.cpp trunk/Source/WebCore/page/Frame.h trunk/Source/WebCore/page/FrameView.cpp trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (257647 => 257648) --- trunk/Source/WebCore/ChangeLog 2020-02-28 19:31:30 UTC (rev 257647) +++ trunk/Source/WebCore/ChangeLog 2020-02-28 19:43:33 UTC (rev 257648) @@ -1,3 +1,48 @@ +2020-02-28 Keith Rollin + +Convert frame address in logging statements to pageID+frameID +https://bugs.webkit.org/show_bug.cgi?id=208325 + + +Reviewed by Alex Christensen. + +Some old logging prints the address of the associated frame object. +Annotating logging statements this way makes it difficult to match up +that logging with other logging that uses pageID+frameID. Update the +logging to consistently use the latter format. + +No new tests -- no new or changed functionality. + +* loader/DocumentLoader.cpp: +(WebCore::DocumentLoader::setRequest): +(WebCore::DocumentLoader::setMainDocumentError): +(WebCore::DocumentLoader::mainReceivedError): +(WebCore::DocumentLoader::stopLoading): +(WebCore::DocumentLoader::notifyFinished): +(WebCore::DocumentLoader::willSendRequest): +(WebCore::DocumentLoader::tryLoadingSubstituteData): +(WebCore::DocumentLoader::disallowDataRequest const): +(WebCore::DocumentLoader::continueAfterContentPolicy): +(WebCore::DocumentLoader::startLoadingMainResource): +(WebCore::DocumentLoader::loadMainResource): +(WebCore::DocumentLoader::cancelMainResourceLoad): +* loader/FrameLoader.cpp: +(WebCore::FrameLoader::pageID const): +(WebCore::FrameLoader::frameID const): +(WebCore::FrameLoader::retryAfterFailedCacheOnlyMainResourceLoad): +* loader/FrameLoader.h: +* loader/ResourceLoader.cpp: +* loader/SubresourceLoader.cpp: +* loader/cache/CachedResource.cpp: +(WebCore::CachedResource::load): +* loader/cache/CachedResourceLoader.cpp: +(WebCore::CachedResourceLoader::requestResource): +* page/Frame.cpp: +(WebCore::Frame::pageID const): +(WebCore::Frame::frameID const): +* page/Frame.h: +* page/FrameView.cpp: + 2020-02-28 Eric Carlson No port uses USE_NATIVE_FULLSCREEN_VIDEO, remove it Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (257647 => 257648) --- trunk/Source/WebCore/loader/DocumentLoader.cpp 2020-02-28 19:31:30 UTC (rev 257647) +++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2020-02-28 19:43:33 UTC (rev 257648) @@ -111,7 +111,10 @@
[webkit-changes] [257505] trunk/Source
Title: [257505] trunk/Source Revision 257505 Author krol...@apple.com Date 2020-02-26 13:12:54 -0800 (Wed, 26 Feb 2020) Log Message Add logging to help diagnose redirect issue https://bugs.webkit.org/show_bug.cgi?id=207916 Reviewed by Chris Dumez. We're seeing an issue where communication between the WebContent process and the Network process seems to come to a stop between NetworkResourceLoader::continueWillSendRedirectedRequest and NetworkResourceLoader::continueWillSendRequest. We do see a WebResourceLoader::willSendRequest log line between those two NetworkResourceLoader logging lines, but nothing else. Add a bunch of logging in this area to help determine what's happening. Source/WebCore: No new tests -- no new or changed functionality. * loader/PolicyChecker.cpp: (WebCore::PolicyChecker::checkNavigationPolicy): * loader/ResourceLoader.cpp: (WebCore::ResourceLoader::loadDataURL): (WebCore::ResourceLoader::willSendRequestInternal): (WebCore::ResourceLoader::didFinishLoading): (WebCore::ResourceLoader::didFail): (WebCore::ResourceLoader::willSendRequestAsync): (WebCore::ResourceLoader::wasBlocked): (WebCore::ResourceLoader::cannotShowURL): * loader/SubresourceLoader.cpp: (WebCore::SubresourceLoader::init): (WebCore::SubresourceLoader::willSendRequestInternal): (WebCore::SubresourceLoader::didReceiveResponse): (WebCore::SubresourceLoader::didFinishLoading): (WebCore::SubresourceLoader::didFail): (WebCore::SubresourceLoader::willCancel): * loader/cache/CachedRawResource.cpp: (WebCore::CachedRawResource::redirectReceived): * loader/cache/CachedResource.cpp: (WebCore::CachedResource::redirectReceived): * loader/cache/CachedResourceLoader.cpp: (WebCore::CachedResourceLoader::canRequestAfterRedirection const): Source/WebKit: * WebProcess/Network/WebResourceLoader.cpp: (WebKit::WebResourceLoader::willSendRequest): * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/PolicyChecker.cpp trunk/Source/WebCore/loader/ResourceLoader.cpp trunk/Source/WebCore/loader/SubresourceLoader.cpp trunk/Source/WebCore/loader/cache/CachedRawResource.cpp trunk/Source/WebCore/loader/cache/CachedResource.cpp trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (257504 => 257505) --- trunk/Source/WebCore/ChangeLog 2020-02-26 21:10:53 UTC (rev 257504) +++ trunk/Source/WebCore/ChangeLog 2020-02-26 21:12:54 UTC (rev 257505) @@ -1,3 +1,45 @@ +2020-02-26 Keith Rollin + +Add logging to help diagnose redirect issue +https://bugs.webkit.org/show_bug.cgi?id=207916 + + +Reviewed by Chris Dumez. + +We're seeing an issue where communication between the WebContent +process and the Network process seems to come to a stop between +NetworkResourceLoader::continueWillSendRedirectedRequest and +NetworkResourceLoader::continueWillSendRequest. We do see a +WebResourceLoader::willSendRequest log line between those two +NetworkResourceLoader logging lines, but nothing else. Add a bunch of +logging in this area to help determine what's happening. + +No new tests -- no new or changed functionality. + +* loader/PolicyChecker.cpp: +(WebCore::PolicyChecker::checkNavigationPolicy): +* loader/ResourceLoader.cpp: +(WebCore::ResourceLoader::loadDataURL): +(WebCore::ResourceLoader::willSendRequestInternal): +(WebCore::ResourceLoader::didFinishLoading): +(WebCore::ResourceLoader::didFail): +(WebCore::ResourceLoader::willSendRequestAsync): +(WebCore::ResourceLoader::wasBlocked): +(WebCore::ResourceLoader::cannotShowURL): +* loader/SubresourceLoader.cpp: +(WebCore::SubresourceLoader::init): +(WebCore::SubresourceLoader::willSendRequestInternal): +(WebCore::SubresourceLoader::didReceiveResponse): +(WebCore::SubresourceLoader::didFinishLoading): +(WebCore::SubresourceLoader::didFail): +(WebCore::SubresourceLoader::willCancel): +* loader/cache/CachedRawResource.cpp: +(WebCore::CachedRawResource::redirectReceived): +* loader/cache/CachedResource.cpp: +(WebCore::CachedResource::redirectReceived): +* loader/cache/CachedResourceLoader.cpp: +(WebCore::CachedResourceLoader::canRequestAfterRedirection const): + 2020-02-26 Daniel Bates Clean up HitTestLocation.h Modified: trunk/Source/WebCore/loader/PolicyChecker.cpp (257504 => 257505) --- trunk/Source/WebCore/loader/PolicyChecker.cpp 2020-02-26 21:10:53 UTC (rev 257504) +++ trunk/Source/WebCore/loader/PolicyChecker.cpp 2020-02-26 21:12:54 UTC (rev 257505) @@
[webkit-changes] [256765] trunk/Tools
Title: [256765] trunk/Tools Revision 256765 Author krol...@apple.com Date 2020-02-17 13:22:23 -0800 (Mon, 17 Feb 2020) Log Message Unreviewed build fix after r256715. Fix tvOS and watchOS builds. * TestWebKitAPI/Tests/WebKitCocoa/WKWebViewEvaluateJavaScript.mm: Modified Paths trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewEvaluateJavaScript.mm Diff Modified: trunk/Tools/ChangeLog (256764 => 256765) --- trunk/Tools/ChangeLog 2020-02-17 21:13:03 UTC (rev 256764) +++ trunk/Tools/ChangeLog 2020-02-17 21:22:23 UTC (rev 256765) @@ -1,3 +1,11 @@ +2020-02-17 Keith Rollin + +Unreviewed build fix after r256715. + +Fix tvOS and watchOS builds. + +* TestWebKitAPI/Tests/WebKitCocoa/WKWebViewEvaluateJavaScript.mm: + 2020-02-17 Per Arne Vollan Use CF prefs direct mode in the WebContent process Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewEvaluateJavaScript.mm (256764 => 256765) --- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewEvaluateJavaScript.mm 2020-02-17 21:13:03 UTC (rev 256764) +++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewEvaluateJavaScript.mm 2020-02-17 21:22:23 UTC (rev 256765) @@ -258,6 +258,7 @@ TestWebKitAPI::Util::run(); } +#if HAVE(NETWORK_FRAMEWORK) TEST(WebKit, AllowsContentJavaScript) { RetainPtr webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); @@ -334,6 +335,7 @@ }]; TestWebKitAPI::Util::run(); } +#endif TEST(WebKit, SPIJavascriptMarkupVsAPIContentJavaScript) { ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [256569] trunk/Source/WebCore
Title: [256569] trunk/Source/WebCore Revision 256569 Author krol...@apple.com Date 2020-02-13 15:53:37 -0800 (Thu, 13 Feb 2020) Log Message Add missing call to completionHandler https://bugs.webkit.org/show_bug.cgi?id=207720 Reviewed by Chris Dumez. Bug 179641 (r225702) updated SubresourceLoader::willSendRequestInternal with a return call without first calling the completionHandler. Address this by adding the call to the completionHandler. No new tests -- it's not possible to control execution into the affected code path. * loader/SubresourceLoader.cpp: (WebCore::SubresourceLoader::willSendRequestInternal): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/SubresourceLoader.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (256568 => 256569) --- trunk/Source/WebCore/ChangeLog 2020-02-13 23:51:25 UTC (rev 256568) +++ trunk/Source/WebCore/ChangeLog 2020-02-13 23:53:37 UTC (rev 256569) @@ -1,3 +1,22 @@ +2020-02-13 Keith Rollin + +Add missing call to completionHandler +https://bugs.webkit.org/show_bug.cgi?id=207720 + + +Reviewed by Chris Dumez. + +Bug 179641 (r225702) updated +SubresourceLoader::willSendRequestInternal with a return call without +first calling the completionHandler. Address this by adding the call +to the completionHandler. + +No new tests -- it's not possible to control execution into the +affected code path. + +* loader/SubresourceLoader.cpp: +(WebCore::SubresourceLoader::willSendRequestInternal): + 2020-02-13 Tim Horton iOS: Autoscrolling is too fast and way too aggressive Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (256568 => 256569) --- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2020-02-13 23:51:25 UTC (rev 256568) +++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2020-02-13 23:53:37 UTC (rev 256569) @@ -239,7 +239,7 @@ m_resource->responseReceived(opaqueRedirectedResponse); if (reachedTerminalState()) { RELEASE_LOG_IF_ALLOWED("willSendRequestinternal: reached terminal state (frame = %p, frameLoader = %p, resourceID = %lu)", frame(), frameLoader(), identifier()); -return; +return completionHandler(WTFMove(newRequest)); } RELEASE_LOG_IF_ALLOWED("willSendRequestinternal: resource load completed (frame = %p, frameLoader = %p, resourceID = %lu)", frame(), frameLoader(), identifier()); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [256108] trunk/Source
Title: [256108] trunk/Source Revision 256108 Author krol...@apple.com Date 2020-02-09 18:04:36 -0800 (Sun, 09 Feb 2020) Log Message Re-enable LTO for ARM builds https://bugs.webkit.org/show_bug.cgi?id=207402 Reviewed by Sam Weinig. Bug 190758 re-enabled LTO for Production builds for x86-family CPUs. Enabling it for ARM was left out due to a compiler issue. That issue has been fixed, and so now we can re-enable LTO for ARM. Source/bmalloc: * Configurations/Base.xcconfig: Source/_javascript_Core: * Configurations/Base.xcconfig: Source/ThirdParty/ANGLE: * Configurations/Base.xcconfig: Source/ThirdParty/libwebrtc: * Configurations/Base.xcconfig: Source/WebCore: No new tests -- no new or changed functionality. * Configurations/Base.xcconfig: Source/WebCore/PAL: * Configurations/Base.xcconfig: Source/WebInspectorUI: * Configurations/Base.xcconfig: Source/WebKit: * Configurations/Base.xcconfig: Source/WebKitLegacy/mac: * Configurations/Base.xcconfig: Source/WTF: * Configurations/Base.xcconfig: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/Base.xcconfig trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig trunk/Source/WTF/ChangeLog trunk/Source/WTF/Configurations/Base.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/Base.xcconfig trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/Configurations/Base.xcconfig trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/Configurations/Base.xcconfig trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/Base.xcconfig trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig trunk/Source/bmalloc/ChangeLog trunk/Source/bmalloc/Configurations/Base.xcconfig Diff Modified: trunk/Source/_javascript_Core/ChangeLog (256107 => 256108) --- trunk/Source/_javascript_Core/ChangeLog 2020-02-10 01:51:43 UTC (rev 256107) +++ trunk/Source/_javascript_Core/ChangeLog 2020-02-10 02:04:36 UTC (rev 256108) @@ -1,3 +1,17 @@ +2020-02-09 Keith Rollin + +Re-enable LTO for ARM builds +https://bugs.webkit.org/show_bug.cgi?id=207402 + + +Reviewed by Sam Weinig. + +Bug 190758 re-enabled LTO for Production builds for x86-family CPUs. +Enabling it for ARM was left out due to a compiler issue. That issue +has been fixed, and so now we can re-enable LTO for ARM. + +* Configurations/Base.xcconfig: + 2020-02-08 Sam Weinig Move _javascript_Core related feature defines from FeatureDefines.xcconfig to PlatformEnableCocoa.h Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (256107 => 256108) --- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2020-02-10 01:51:43 UTC (rev 256107) +++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2020-02-10 02:04:36 UTC (rev 256108) @@ -178,15 +178,15 @@ WK_COCOA_TOUCH_appletvsimulator = cocoatouch; WK_IS_COCOA_TOUCH = $(WK_NOT_$(WK_EMPTY_$(WK_COCOA_TOUCH))); -// Disable on all platforms other than macOS, due to . +// Disable LTO for _javascript_Core, due to . Add back the following line and delete the one that says "LLVM_LTO = NO" when that issue is resolved. +// LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO)); LLVM_LTO = NO; -// Disable LTO for _javascript_Core, due to . Add back the following line when that issue is resolved. -// LLVM_LTO[sdk=macosx*] = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO)); WK_LLVM_LTO_NO = NO; WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE); WK_XCODE_SUPPORTS_LTO = $(WK_NOT_$(WK_XCODE_VERSION_BEFORE_10_2_$(XCODE_VERSION_MAJOR))); -WK_XCODE_VERSION_BEFORE_10_2_0700 = YES; +WK_XCODE_SUPPORTS_LTO[arch=arm*] = $(WK_NOT_$(WK_XCODE_VERSION_BEFORE_11_4_$(XCODE_VERSION_MAJOR))); + WK_XCODE_VERSION_BEFORE_10_2_0800 = YES; WK_XCODE_VERSION_BEFORE_10_2_0900 = YES; WK_XCODE_VERSION_BEFORE_10_2_1000 = $(WK_XCODE_VERSION_BEFORE_10_2_1000_$(XCODE_VERSION_MINOR)); @@ -193,6 +193,15 @@ WK_XCODE_VERSION_BEFORE_10_2_1000_1000 = YES; WK_XCODE_VERSION_BEFORE_10_2_1000_1010 = YES; +WK_XCODE_VERSION_BEFORE_11_4_0800 = YES; +WK_XCODE_VERSION_BEFORE_11_4_0900 = YES; +WK_XCODE_VERSION_BEFORE_11_4_1000 = YES; +WK_XCODE_VERSION_BEFORE_11_4_1100 = $(WK_XCODE_VERSION_BEFORE_11_4_1100_$(XCODE_VERSION_MINOR)); +WK_XCODE_VERSION_BEFORE_11_4_1100_1100 = YES; +WK_XCODE_VERSION_BEFORE_11_4_1100_1110 = YES; +WK_XCODE_VERSION_BEFORE_11_4_1100_1120 = YES; +WK_XCODE_VERSION_BEFORE_11_4_1100_1130 = YES; + WK_USER_LTO_MODE = $(WK_USER_LTO_MODE_$(WK_LTO_MODE)); WK_USER_LTO_MODE_full = YES; WK_USER_LTO_MODE_thin = YES_THIN; Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (256107 => 256108) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-02-10 01:51:43 UTC (rev 256107) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog
[webkit-changes] [255567] trunk/Source/WebKit
Title: [255567] trunk/Source/WebKit Revision 255567 Author krol...@apple.com Date 2020-02-03 09:21:17 -0800 (Mon, 03 Feb 2020) Log Message Unreviewed watchOS build fix after r29- add missing semi-colon. * UIProcess/ios/forms/WKFocusedFormControlView.mm: (-[WKFocusedFormControlView scrollOffsetForCrownInputOffset:]): Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm Diff Modified: trunk/Source/WebKit/ChangeLog (255566 => 255567) --- trunk/Source/WebKit/ChangeLog 2020-02-03 17:10:07 UTC (rev 255566) +++ trunk/Source/WebKit/ChangeLog 2020-02-03 17:21:17 UTC (rev 255567) @@ -1,3 +1,10 @@ +2020-02-03 Keith Rollin + +Unreviewed watchOS build fix after r29- add missing semi-colon. + +* UIProcess/ios/forms/WKFocusedFormControlView.mm: +(-[WKFocusedFormControlView scrollOffsetForCrownInputOffset:]): + 2020-02-03 Zan Dobersek Use std::hypot() where possible Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm (255566 => 255567) --- trunk/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm 2020-02-03 17:10:07 UTC (rev 255566) +++ trunk/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm 2020-02-03 17:21:17 UTC (rev 255567) @@ -396,7 +396,7 @@ } if (targetHighlightedFrameDeltaX || targetHighlightedFrameDeltaY) { -CGFloat distanceToTarget = std::hypot(targetHighlightedFrameDeltaX, targetHighlightedFrameDeltaY) +CGFloat distanceToTarget = std::hypot(targetHighlightedFrameDeltaX, targetHighlightedFrameDeltaY); unitVectorToTarget = CGVector { targetHighlightedFrameDeltaX / distanceToTarget, targetHighlightedFrameDeltaY / distanceToTarget }; } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [255163] trunk/Tools
Title: [255163] trunk/Tools Revision 255163 Author krol...@apple.com Date 2020-01-27 13:14:01 -0800 (Mon, 27 Jan 2020) Log Message Fix internal builds https://bugs.webkit.org/show_bug.cgi?id=206790 Reviewed by Maciej Stachowiak. TestRunner.cpp in DumpRenderTree includes ExecutableAllocator.h. In some circumstances, this file can include , which in turn includes . This latter file does not exist at a standard location, and the build fails due to not being able to find the file. Fix this by adding a path to it to the build command line. * DumpRenderTree/mac/Configurations/Base.xcconfig: Modified Paths trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig Diff Modified: trunk/Tools/ChangeLog (255162 => 255163) --- trunk/Tools/ChangeLog 2020-01-27 20:54:54 UTC (rev 255162) +++ trunk/Tools/ChangeLog 2020-01-27 21:14:01 UTC (rev 255163) @@ -1,3 +1,20 @@ +2020-01-27 Keith Rollin + +Fix internal builds +https://bugs.webkit.org/show_bug.cgi?id=206790 + + +Reviewed by Maciej Stachowiak. + +TestRunner.cpp in DumpRenderTree includes ExecutableAllocator.h. In +some circumstances, this file can include , +which in turn includes . This latter file +does not exist at a standard location, and the build fails due to not +being able to find the file. Fix this by adding a path to it to the +build command line. + +* DumpRenderTree/mac/Configurations/Base.xcconfig: + 2020-01-27 Robin Morisset Tools/Scripts/set-webkit-configuration should accept --coverage/--no-coverage Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (255162 => 255163) --- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2020-01-27 20:54:54 UTC (rev 255162) +++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2020-01-27 21:14:01 UTC (rev 255163) @@ -107,8 +107,8 @@ SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator; -OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS); -OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS); +OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders; +OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders; OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS); WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [255094] trunk/Source/WebKitLegacy
Title: [255094] trunk/Source/WebKitLegacy Revision 255094 Author krol...@apple.com Date 2020-01-24 14:19:02 -0800 (Fri, 24 Jan 2020) Log Message Remove check-xcfilelists.sh from WebKitLegacy Xcode build target https://bugs.webkit.org/show_bug.cgi?id=206762 Reviewed by Alexey Proskuryakov. When check-xcfilelists.sh got added to the WebKitLegacy Xcode project, it was also accidentally added to the WebKitLegacy build target. This caused it to be treated as a "resource", and so was copied to the output directory in the Resources sub-folder during the build. This copying is not expected, needed, or desired. Remove check-xcfilelists.sh from the target, which also removes it from the Copy Resources build phase, which removes it from the WebKitLegacy.framework/Resources directory. * WebKitLegacy.xcodeproj/project.pbxproj: Modified Paths trunk/Source/WebKitLegacy/ChangeLog trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj Diff Modified: trunk/Source/WebKitLegacy/ChangeLog (255093 => 255094) --- trunk/Source/WebKitLegacy/ChangeLog 2020-01-24 21:58:33 UTC (rev 255093) +++ trunk/Source/WebKitLegacy/ChangeLog 2020-01-24 22:19:02 UTC (rev 255094) @@ -1,3 +1,22 @@ +2020-01-24 Keith Rollin + +Remove check-xcfilelists.sh from WebKitLegacy Xcode build target +https://bugs.webkit.org/show_bug.cgi?id=206762 + + +Reviewed by Alexey Proskuryakov. + +When check-xcfilelists.sh got added to the WebKitLegacy Xcode project, +it was also accidentally added to the WebKitLegacy build target. This +caused it to be treated as a "resource", and so was copied to the +output directory in the Resources sub-folder during the build. This +copying is not expected, needed, or desired. Remove +check-xcfilelists.sh from the target, which also removes it from the +Copy Resources build phase, which removes it from the +WebKitLegacy.framework/Resources directory. + +* WebKitLegacy.xcodeproj/project.pbxproj: + 2020-01-20 David Kilzer Fix missing header guards and clean up empty files in WebCore, WebKitLegacy, WebKit, Tools Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (255093 => 255094) --- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2020-01-24 21:58:33 UTC (rev 255093) +++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2020-01-24 22:19:02 UTC (rev 255094) @@ -160,7 +160,6 @@ 535E08CE225463B200DF00CA /* WebKitPluginClient.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588C0EDCCEA3008D883D /* WebKitPluginClient.defs */; }; 535E08CF225463B200DF00CA /* WebKitPluginHost.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588D0EDCCEA3008D883D /* WebKitPluginHost.defs */; }; 535E08D0225463B200DF00CA /* WebKitPluginHostTypes.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588E0EDCCEA3008D883D /* WebKitPluginHostTypes.defs */; }; - 537CF83C22EFC13D00C6EBB3 /* check-xcfilelists.sh in Resources */ = {isa = PBXBuildFile; fileRef = 537CF83B22EFC13D00C6EBB3 /* check-xcfilelists.sh */; }; 598AD91A1201CEC900ABAE4E /* WebDeviceOrientationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 598AD9191201CEC900ABAE4E /* WebDeviceOrientationClient.h */; }; 598AD91E1201CECF00ABAE4E /* WebDeviceOrientationClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 598AD91D1201CECF00ABAE4E /* WebDeviceOrientationClient.mm */; }; 598AD9201201CF0700ABAE4E /* WebDeviceOrientation.h in Headers */ = {isa = PBXBuildFile; fileRef = 598AD91F1201CF0700ABAE4E /* WebDeviceOrientation.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -3220,7 +3219,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( -537CF83C22EFC13D00C6EBB3 /* check-xcfilelists.sh in Resources */, 29AEF960134C76FB00FE5096 /* OutlookQuirksUserScript.js in Resources */, 5C9D925A22D7E8AD008E9266 /* Sources.txt in Resources */, 5C9D925B22D7E8AD008E9266 /* SourcesCocoa.txt in Resources */, ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [255087] trunk/Source/WTF
Title: [255087] trunk/Source/WTF Revision 255087 Author krol...@apple.com Date 2020-01-24 12:25:19 -0800 (Fri, 24 Jan 2020) Log Message Fix internal Apple builds after r254411 https://bugs.webkit.org/show_bug.cgi?id=206723 Reviewed by Maciej Stachowiak. The default Xcode build configuration has changed between macOS 10.13 and macOS 10.15, such that references to some frameworks when bulding for the latter don't work when building for the former. Fix this by explicitly adding support for the desired build location rather than assuming such support will be provided for us. * Configurations/WTF.xcconfig: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/Configurations/WTF.xcconfig Diff Modified: trunk/Source/WTF/ChangeLog (255086 => 255087) --- trunk/Source/WTF/ChangeLog 2020-01-24 20:00:16 UTC (rev 255086) +++ trunk/Source/WTF/ChangeLog 2020-01-24 20:25:19 UTC (rev 255087) @@ -1,3 +1,19 @@ +2020-01-24 Keith Rollin + +Fix internal Apple builds after r254411 +https://bugs.webkit.org/show_bug.cgi?id=206723 + + +Reviewed by Maciej Stachowiak. + +The default Xcode build configuration has changed between macOS 10.13 +and macOS 10.15, such that references to some frameworks when bulding +for the latter don't work when building for the former. Fix this by +explicitly adding support for the desired build location rather than +assuming such support will be provided for us. + +* Configurations/WTF.xcconfig: + 2020-01-24 Jonathan Bedard WTF: Remove old iOS version macros Modified: trunk/Source/WTF/Configurations/WTF.xcconfig (255086 => 255087) --- trunk/Source/WTF/Configurations/WTF.xcconfig 2020-01-24 20:00:16 UTC (rev 255086) +++ trunk/Source/WTF/Configurations/WTF.xcconfig 2020-01-24 20:25:19 UTC (rev 255087) @@ -31,3 +31,5 @@ EXCLUDED_SOURCE_FILE_NAMES_ = MachExceptions.defs EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(USE_INTERNAL_SDK)) EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator10*] = + +SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [254938] trunk/Source/WebKit
Title: [254938] trunk/Source/WebKit Revision 254938 Author krol...@apple.com Date 2020-01-22 12:52:50 -0800 (Wed, 22 Jan 2020) Log Message Fix SDK availability macros https://bugs.webkit.org/show_bug.cgi?id=206463 Reviewed by Timothy Hatcher. Bug 197841 updated WebKit.xcconfig with regards to when it runs a header post-processing script. This post-processing script grovels over our exported headers, changing macros like WK_API_AVAILABLE to the standard API_AVAILABLE. Because of the change in Bug 197841, the script was no longer being run when preparing macOS 10.15 SDKs, which was breaking those SDKs. Fix this by reverting the change, allowing the macros to be replaced for macOS 10.15. We also need to touch WKFoundation.h in order to support incremental builds. If we don't, then the version of WKFoundation.h that was exported in the previous build and that was incorrectly post-processed would remain incorrectly post-processed. Touch the file so that it will get re-exported and re-post-processed. No new tests - no added or changed functionality. * Configurations/WebKit.xcconfig: * Shared/API/Cocoa/WKFoundation.h: Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/WebKit.xcconfig trunk/Source/WebKit/Shared/API/Cocoa/WKFoundation.h Diff Modified: trunk/Source/WebKit/ChangeLog (254937 => 254938) --- trunk/Source/WebKit/ChangeLog 2020-01-22 20:49:13 UTC (rev 254937) +++ trunk/Source/WebKit/ChangeLog 2020-01-22 20:52:50 UTC (rev 254938) @@ -1,3 +1,30 @@ +2020-01-22 Keith Rollin + +Fix SDK availability macros +https://bugs.webkit.org/show_bug.cgi?id=206463 + + +Reviewed by Timothy Hatcher. + +Bug 197841 updated WebKit.xcconfig with regards to when it runs a +header post-processing script. This post-processing script grovels +over our exported headers, changing macros like WK_API_AVAILABLE to +the standard API_AVAILABLE. Because of the change in Bug 197841, the +script was no longer being run when preparing macOS 10.15 SDKs, which +was breaking those SDKs. Fix this by reverting the change, allowing +the macros to be replaced for macOS 10.15. + +We also need to touch WKFoundation.h in order to support incremental +builds. If we don't, then the version of WKFoundation.h that was +exported in the previous build and that was incorrectly post-processed +would remain incorrectly post-processed. Touch the file so that it +will get re-exported and re-post-processed. + +No new tests - no added or changed functionality. + +* Configurations/WebKit.xcconfig: +* Shared/API/Cocoa/WKFoundation.h: + 2020-01-22 Chris Dumez Frequent NetworkConnectionToWebProcess::CookiesEnabled sync IPC when browsing reddit.com Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (254937 => 254938) --- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2020-01-22 20:49:13 UTC (rev 254937) +++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2020-01-22 20:52:50 UTC (rev 254938) @@ -156,8 +156,8 @@ INSTALLHDRS_SCRIPT_PHASE = YES; APPLY_RULES_IN_COPY_HEADERS = $(USE_NEW_BUILD_SYSTEM); -WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_MACOS_1016)); -WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_MACOS_BEFORE_1016 = YES; +WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_MACOS_1015)); +WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_MACOS_BEFORE_1015 = YES; WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphone*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_IOS_1013)); WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_IOS_BEFORE_1300 = YES; Modified: trunk/Source/WebKit/Shared/API/Cocoa/WKFoundation.h (254937 => 254938) --- trunk/Source/WebKit/Shared/API/Cocoa/WKFoundation.h 2020-01-22 20:49:13 UTC (rev 254937) +++ trunk/Source/WebKit/Shared/API/Cocoa/WKFoundation.h 2020-01-22 20:52:50 UTC (rev 254938) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Apple Inc. All rights reserved. + * Copyright (C) 2013-2020 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -34,7 +34,7 @@ #ifndef WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED -#define WK_API_AVAILABLE(...) +#define WK_API_AVAILABLE(...) #define WK_CLASS_AVAILABLE(...) __attribute__((visibility("default"))) WK_API_AVAILABLE(__VA_ARGS__) #define WK_API_DEPRECATED(_message, ...) __attribute__((deprecated(_message))) #define WK_API_DEPRECATED_WITH_REPLACEMENT(_replacement, ...) __attribute__((deprecated("use " #_replacement))) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [254876] trunk/Source/WebKit
Title: [254876] trunk/Source/WebKit Revision 254876 Author krol...@apple.com Date 2020-01-21 13:12:12 -0800 (Tue, 21 Jan 2020) Log Message Fix SDK availability macros https://bugs.webkit.org/show_bug.cgi?id=206463 Reviewed by Timothy Hatcher. Bug 197841 updated WebKit.xcconfig with regards to when it runs a header post-processing script. This post-processing script grovels over our exported headers, changing macros like WK_API_AVAILABLE to the standard API_AVAILABLE. Because of the change in Bug 197841, the script was no longer being run when preparing macOS 10.15 SDKs, which was breaking those SDKs. Fix this by reverting the change, allowing the macros to be replaced for macOS 10.15. No new tests - no added or changed functionality. * Configurations/WebKit.xcconfig: Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/WebKit.xcconfig Diff Modified: trunk/Source/WebKit/ChangeLog (254875 => 254876) --- trunk/Source/WebKit/ChangeLog 2020-01-21 21:08:55 UTC (rev 254875) +++ trunk/Source/WebKit/ChangeLog 2020-01-21 21:12:12 UTC (rev 254876) @@ -1,3 +1,23 @@ +2020-01-21 Keith Rollin + +Fix SDK availability macros +https://bugs.webkit.org/show_bug.cgi?id=206463 + + +Reviewed by Timothy Hatcher. + +Bug 197841 updated WebKit.xcconfig with regards to when it runs a +header post-processing script. This post-processing script grovels +over our exported headers, changing macros like WK_API_AVAILABLE to +the standard API_AVAILABLE. Because of the change in Bug 197841, the +script was no longer being run when preparing macOS 10.15 SDKs, which +was breaking those SDKs. Fix this by reverting the change, allowing +the macros to be replaced for macOS 10.15. + +No new tests - no added or changed functionality. + +* Configurations/WebKit.xcconfig: + 2020-01-21 Tim Horton macCatalyst: Two-finger click is dispatched to DOM as left click Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (254875 => 254876) --- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2020-01-21 21:08:55 UTC (rev 254875) +++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2020-01-21 21:12:12 UTC (rev 254876) @@ -156,8 +156,8 @@ INSTALLHDRS_SCRIPT_PHASE = YES; APPLY_RULES_IN_COPY_HEADERS = $(USE_NEW_BUILD_SYSTEM); -WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_MACOS_1016)); -WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_MACOS_BEFORE_1016 = YES; +WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_MACOS_1015)); +WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_MACOS_BEFORE_1015 = YES; WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphone*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_IOS_1013)); WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_IOS_BEFORE_1300 = YES; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [254868] trunk
Title: [254868] trunk Revision 254868 Author krol...@apple.com Date 2020-01-21 11:40:47 -0800 (Tue, 21 Jan 2020) Log Message Fix tvOS values in SUPPORTED_PLATFORMS https://bugs.webkit.org/show_bug.cgi?id=206435 Reviewed by Alexey Proskuryakov. A number of targets in WebKit have 'tvos' and 'tvsimulator' in SUPPORTED_PLATFORMS. The correct values are 'appletvos' and 'appletvsimulator'. These should be updated to the correct ones as the wrong values prevent the tvOS run destination from being usable in the UI to build for tvOS. Source/ThirdParty: * gtest/xcode/Config/General.xcconfig: Source/WebInspectorUI: * Configurations/Base.xcconfig: Tools: * DumpRenderTree/mac/Configurations/Base.xcconfig: * ImageDiff/cg/Configurations/Base.xcconfig: * MiniBrowser/Configurations/Base.xcconfig: * WebKitTestRunner/Configurations/Base.xcconfig: Modified Paths trunk/Source/ThirdParty/ChangeLog trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/Configurations/Base.xcconfig trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig trunk/Tools/MiniBrowser/Configurations/Base.xcconfig trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig Diff Modified: trunk/Source/ThirdParty/ChangeLog (254867 => 254868) --- trunk/Source/ThirdParty/ChangeLog 2020-01-21 19:36:52 UTC (rev 254867) +++ trunk/Source/ThirdParty/ChangeLog 2020-01-21 19:40:47 UTC (rev 254868) @@ -1,3 +1,19 @@ +2020-01-21 Keith Rollin + +Fix tvOS values in SUPPORTED_PLATFORMS +https://bugs.webkit.org/show_bug.cgi?id=206435 + + +Reviewed by Alexey Proskuryakov. + +A number of targets in WebKit have 'tvos' and 'tvsimulator' in +SUPPORTED_PLATFORMS. The correct values are 'appletvos' and +'appletvsimulator'. These should be updated to the correct ones as the +wrong values prevent the tvOS run destination from being usable in the +UI to build for tvOS. + +* gtest/xcode/Config/General.xcconfig: + 2020-01-08 Mark Lam Rename testing build configuration to release+assert, and add new testing build configuration. Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (254867 => 254868) --- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2020-01-21 19:36:52 UTC (rev 254867) +++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2020-01-21 19:40:47 UTC (rev 254868) @@ -72,4 +72,4 @@ OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS); OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS); -SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator; +SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator; Modified: trunk/Source/WebInspectorUI/ChangeLog (254867 => 254868) --- trunk/Source/WebInspectorUI/ChangeLog 2020-01-21 19:36:52 UTC (rev 254867) +++ trunk/Source/WebInspectorUI/ChangeLog 2020-01-21 19:40:47 UTC (rev 254868) @@ -1,3 +1,19 @@ +2020-01-21 Keith Rollin + +Fix tvOS values in SUPPORTED_PLATFORMS +https://bugs.webkit.org/show_bug.cgi?id=206435 + + +Reviewed by Alexey Proskuryakov. + +A number of targets in WebKit have 'tvos' and 'tvsimulator' in +SUPPORTED_PLATFORMS. The correct values are 'appletvos' and +'appletvsimulator'. These should be updated to the correct ones as the +wrong values prevent the tvOS run destination from being usable in the +UI to build for tvOS. + +* Configurations/Base.xcconfig: + 2020-01-17 Nikita Vasilyev Web Inspector: Unchecking Enable Preview Features on Engineering and Preview builds does not affect WI.arePreviewFeaturesEnabled() Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (254867 => 254868) --- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2020-01-21 19:36:52 UTC (rev 254867) +++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2020-01-21 19:40:47 UTC (rev 254868) @@ -69,7 +69,7 @@ ENGINEERING_BUILD_DEFINES = $(ENGINEERING_BUILD_DEFINES_$(ENGINEERING_BUILD)); ENGINEERING_BUILD_DEFINES_1 = ENGINEERING_BUILD=1; -SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator; +SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator; TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)); TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300; Modified: trunk/Tools/ChangeLog (254867 => 254868) --- trunk/Tools/ChangeLog 2020-01-21 19:36:52 UTC (rev 254867) +++ trunk/Tools/ChangeLog 2020-01-21 19:40:47 UTC (rev 254868) @@ -1,3 +1,22 @@ +2020-01-21 Keith Rollin + +Fix tvOS values in SUPPORTED_PLATFORMS +https://bugs.webkit.org/show_bug.cgi?id=206435 + + +
[webkit-changes] [254487] trunk/Source/WebKit
Title: [254487] trunk/Source/WebKit Revision 254487 Author krol...@apple.com Date 2020-01-13 20:21:33 -0800 (Mon, 13 Jan 2020) Log Message Reformat WebProcessPool logging https://bugs.webkit.org/show_bug.cgi?id=205882 Reviewed by Brent Fulgham. Update the format used by WebProcessPool in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: - [] ::: So, for example: Using prewarmed process 0 becomes: 0x7f81e8804008 - WebProcessPool::processForRegistrableDomain: Using prewarmed process (process=0x1471c2a00, PID=64197) No new tests - no added or changed functionality. * UIProcess/Cocoa/WebProcessPoolCocoa.mm: (WebKit::WebProcessPool::applicationIsAboutToSuspend): * UIProcess/WebProcessPool.cpp: (WebKit::WebProcessPool::establishWorkerContextConnectionToNetworkProcess): (WebKit::WebProcessPool::tryTakePrewarmedProcess): (WebKit::WebProcessPool::prewarmProcess): (WebKit::WebProcessPool::processForRegistrableDomain): (WebKit::WebProcessPool::didReachGoodTimeToPrewarm): (WebKit::WebProcessPool::handleMemoryPressureWarning): (WebKit::WebProcessPool::processForNavigation): (WebKit::WebProcessPool::processForNavigationInternal): (WebKit::WebProcessPool::setWebProcessHasUploads): (WebKit::WebProcessPool::clearWebProcessHasUploads): (WebKit::WebProcessPool::setWebProcessIsPlayingAudibleMedia): (WebKit::WebProcessPool::clearWebProcessIsPlayingAudibleMedia): (WebKit::WebProcessPool::setUseSeparateServiceWorkerProcess): Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm trunk/Source/WebKit/UIProcess/WebProcessPool.cpp Diff Modified: trunk/Source/WebKit/ChangeLog (254486 => 254487) --- trunk/Source/WebKit/ChangeLog 2020-01-14 04:05:50 UTC (rev 254486) +++ trunk/Source/WebKit/ChangeLog 2020-01-14 04:21:33 UTC (rev 254487) @@ -1,3 +1,44 @@ +2020-01-13 Keith Rollin + +Reformat WebProcessPool logging +https://bugs.webkit.org/show_bug.cgi?id=205882 + + +Reviewed by Brent Fulgham. + +Update the format used by WebProcessPool in its RELEASE_LOG logging. +Use the format used by WebPageProxy and NetworkResourceLoader, which +is generally of the form: + + - [] ::: + +So, for example: + +Using prewarmed process 0 + +becomes: + +0x7f81e8804008 - WebProcessPool::processForRegistrableDomain: Using prewarmed process (process=0x1471c2a00, PID=64197) + +No new tests - no added or changed functionality. + +* UIProcess/Cocoa/WebProcessPoolCocoa.mm: +(WebKit::WebProcessPool::applicationIsAboutToSuspend): +* UIProcess/WebProcessPool.cpp: +(WebKit::WebProcessPool::establishWorkerContextConnectionToNetworkProcess): +(WebKit::WebProcessPool::tryTakePrewarmedProcess): +(WebKit::WebProcessPool::prewarmProcess): +(WebKit::WebProcessPool::processForRegistrableDomain): +(WebKit::WebProcessPool::didReachGoodTimeToPrewarm): +(WebKit::WebProcessPool::handleMemoryPressureWarning): +(WebKit::WebProcessPool::processForNavigation): +(WebKit::WebProcessPool::processForNavigationInternal): +(WebKit::WebProcessPool::setWebProcessHasUploads): +(WebKit::WebProcessPool::clearWebProcessHasUploads): +(WebKit::WebProcessPool::setWebProcessIsPlayingAudibleMedia): +(WebKit::WebProcessPool::clearWebProcessIsPlayingAudibleMedia): +(WebKit::WebProcessPool::setUseSeparateServiceWorkerProcess): + 2020-01-13 Kate Cheney _WKResourceLoadStatisticsFirstParty should be forward declared not imported in _WKResourceLoadStatisticsThirdParty Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (254486 => 254487) --- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-01-14 04:05:50 UTC (rev 254486) +++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-01-14 04:21:33 UTC (rev 254487) @@ -107,6 +107,8 @@ SOFT_LINK(BackBoardServices, BKSDisplayBrightnessGetCurrent, float, (), ()); #endif +#define WEBPROCESSPOOL_RELEASE_LOG(channel, fmt, ...) RELEASE_LOG(channel, "%p - WebProcessPool::" fmt, this, ##__VA_ARGS__) + namespace WebKit { using namespace WebCore; @@ -688,7 +690,7 @@ #if PLATFORM(IOS_FAMILY) void WebProcessPool::applicationIsAboutToSuspend() { -RELEASE_LOG(ProcessSuspension, "WebProcessPool::applicationIsAboutToSuspend() Terminating non-critical processes"); +WEBPROCESSPOOL_RELEASE_LOG(ProcessSuspension, "applicationIsAboutToSuspend: Terminating non-critical processes"); m_backForwardCache->pruneToSize(1); m_webProcessCache->clear(); Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (254486 => 254487) --- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2020-01-14 04:05:50 UTC (rev 254486) +++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2020-01-14 04:21:33 UTC (rev
[webkit-changes] [254267] trunk/Source/WebCore
Title: [254267] trunk/Source/WebCore Revision 254267 Author krol...@apple.com Date 2020-01-09 10:02:18 -0800 (Thu, 09 Jan 2020) Log Message Reformat FrameView logging https://bugs.webkit.org/show_bug.cgi?id=205984 Reviewed by Brent Fulgham. Update the format used by FrameView in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: - [] ::: So, for example: 0x4a1cf8010 - FrameView::fireLayoutRelatedMilestonesIfNeeded() - firing first visually non-empty layout milestone on the main frame becomes: 0x561be8010 - [frame=0x55d47e000, main=1] FrameView::fireLayoutRelatedMilestonesIfNeeded: Firing first visually non-empty layout milestone on the main frame No new tests -- no new or changed functionality. * page/FrameView.cpp: (WebCore::FrameView::paintContents): (WebCore::FrameView::fireLayoutRelatedMilestonesIfNeeded): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/page/FrameView.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (254266 => 254267) --- trunk/Source/WebCore/ChangeLog 2020-01-09 17:59:33 UTC (rev 254266) +++ trunk/Source/WebCore/ChangeLog 2020-01-09 18:02:18 UTC (rev 254267) @@ -1,3 +1,31 @@ +2020-01-09 Keith Rollin + +Reformat FrameView logging +https://bugs.webkit.org/show_bug.cgi?id=205984 + + +Reviewed by Brent Fulgham. + +Update the format used by FrameView in its RELEASE_LOG logging. Use +the format used by WebPageProxy and NetworkResourceLoader, which is +generally of the form: + + - [] ::: + +So, for example: + +0x4a1cf8010 - FrameView::fireLayoutRelatedMilestonesIfNeeded() - firing first visually non-empty layout milestone on the main frame + +becomes: + +0x561be8010 - [frame=0x55d47e000, main=1] FrameView::fireLayoutRelatedMilestonesIfNeeded: Firing first visually non-empty layout milestone on the main frame + +No new tests -- no new or changed functionality. + +* page/FrameView.cpp: +(WebCore::FrameView::paintContents): +(WebCore::FrameView::fireLayoutRelatedMilestonesIfNeeded): + 2020-01-09 Zalan Bujtas [LFC] computeHeightAndMargin/placeInFlowPositionedChildren should take UsedHorizontalValues::Constraints Modified: trunk/Source/WebCore/page/FrameView.cpp (254266 => 254267) --- trunk/Source/WebCore/page/FrameView.cpp 2020-01-09 17:59:33 UTC (rev 254266) +++ trunk/Source/WebCore/page/FrameView.cpp 2020-01-09 18:02:18 UTC (rev 254267) @@ -132,7 +132,7 @@ #include "LayoutContext.h" #endif -#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(frame().page() && frame().page()->isAlwaysOnLoggingAllowed(), Layout, "%p - FrameView::" fmt, this, ##__VA_ARGS__) +#define FRAMEVIEW_RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(frame().page() && frame().page()->isAlwaysOnLoggingAllowed(), channel, "%p - [frame=%p, main=%d] FrameView::" fmt, this, (), frame().isMainFrame(), ##__VA_ARGS__) namespace WebCore { @@ -4185,7 +4185,7 @@ ASSERT(!needsLayout()); if (needsLayout()) { -RELEASE_LOG_IF_ALLOWED("FrameView::paintContents() - not painting because render tree needs layout (is main frame %d)", frame().isMainFrame()); +FRAMEVIEW_RELEASE_LOG_IF_ALLOWED(Layout, "paintContents: Not painting because render tree needs layout"); return; } @@ -5155,7 +5155,7 @@ if (milestonesAchieved && frame().isMainFrame()) { if (milestonesAchieved.contains(DidFirstVisuallyNonEmptyLayout)) -RELEASE_LOG_IF_ALLOWED("fireLayoutRelatedMilestonesIfNeeded() - firing first visually non-empty layout milestone on the main frame"); +FRAMEVIEW_RELEASE_LOG_IF_ALLOWED(Layout, "fireLayoutRelatedMilestonesIfNeeded: Firing first visually non-empty layout milestone on the main frame"); frame().loader().didReachLayoutMilestone(milestonesAchieved); } } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [254179] trunk/Source/WebCore
Title: [254179] trunk/Source/WebCore Revision 254179 Author krol...@apple.com Date 2020-01-07 17:31:20 -0800 (Tue, 07 Jan 2020) Log Message Reformat FrameLoader logging https://bugs.webkit.org/show_bug.cgi?id=205884 Reviewed by Brent Fulgham. Update the format used by FrameLoader in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: - [] ::: So, for example: 0x4aa2df000 - FrameLoader::allAllLoaders: Clearing provisional document loader (frame = 0x4a8ad3550, main = 0 m_provisionalDocumentLoader=0x0) becomes: 0x465fb61a0 - [frame=0x465c98a20, main=0] FrameLoader::stopAllLoaders: Clearing provisional document loader (m_provisionalDocumentLoader=0x0) No new tests -- no new or changed functionality. * loader/FrameLoader.cpp: (WebCore::FrameLoader::urlSelected): (WebCore::FrameLoader::finishedParsing): (WebCore::FrameLoader::loadURLIntoChildFrame): (WebCore::FrameLoader::loadArchive): (WebCore::FrameLoader::loadInSameDocument): (WebCore::FrameLoader::prepareForLoadStart): (WebCore::FrameLoader::setupForReplace): (WebCore::FrameLoader::loadFrameRequest): (WebCore::FrameLoader::loadURL): (WebCore::FrameLoader::load): (WebCore::FrameLoader::loadWithNavigationAction): (WebCore::FrameLoader::loadWithDocumentLoader): (WebCore::FrameLoader::clearProvisionalLoadForPolicyCheck): (WebCore::FrameLoader::reloadWithOverrideEncoding): (WebCore::FrameLoader::reload): (WebCore::FrameLoader::stopAllLoaders): (WebCore::FrameLoader::stopForBackForwardCache): (WebCore::FrameLoader::setProvisionalDocumentLoader): (WebCore::FrameLoader::setState): (WebCore::FrameLoader::clearProvisionalLoad): (WebCore::FrameLoader::commitProvisionalLoad): (WebCore::FrameLoader::transitionToCommitted): (WebCore::FrameLoader::checkLoadCompleteForThisFrame): (WebCore::FrameLoader::loadPostRequest): (WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy): (WebCore::FrameLoader::continueLoadAfterNavigationPolicy): (WebCore::FrameLoader::loadDifferentDocumentItem): (WebCore::FrameLoader::retryAfterFailedCacheOnlyMainResourceLoad): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/FrameLoader.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (254178 => 254179) --- trunk/Source/WebCore/ChangeLog 2020-01-08 01:07:25 UTC (rev 254178) +++ trunk/Source/WebCore/ChangeLog 2020-01-08 01:31:20 UTC (rev 254179) @@ -1,3 +1,57 @@ +2020-01-07 Keith Rollin + +Reformat FrameLoader logging +https://bugs.webkit.org/show_bug.cgi?id=205884 + + +Reviewed by Brent Fulgham. + +Update the format used by FrameLoader in its RELEASE_LOG logging. Use +the format used by WebPageProxy and NetworkResourceLoader, which is +generally of the form: + + - [] ::: + +So, for example: + +0x4aa2df000 - FrameLoader::allAllLoaders: Clearing provisional document loader (frame = 0x4a8ad3550, main = 0 m_provisionalDocumentLoader=0x0) + +becomes: + +0x465fb61a0 - [frame=0x465c98a20, main=0] FrameLoader::stopAllLoaders: Clearing provisional document loader (m_provisionalDocumentLoader=0x0) + +No new tests -- no new or changed functionality. + +* loader/FrameLoader.cpp: +(WebCore::FrameLoader::urlSelected): +(WebCore::FrameLoader::finishedParsing): +(WebCore::FrameLoader::loadURLIntoChildFrame): +(WebCore::FrameLoader::loadArchive): +(WebCore::FrameLoader::loadInSameDocument): +(WebCore::FrameLoader::prepareForLoadStart): +(WebCore::FrameLoader::setupForReplace): +(WebCore::FrameLoader::loadFrameRequest): +(WebCore::FrameLoader::loadURL): +(WebCore::FrameLoader::load): +(WebCore::FrameLoader::loadWithNavigationAction): +(WebCore::FrameLoader::loadWithDocumentLoader): +(WebCore::FrameLoader::clearProvisionalLoadForPolicyCheck): +(WebCore::FrameLoader::reloadWithOverrideEncoding): +(WebCore::FrameLoader::reload): +(WebCore::FrameLoader::stopAllLoaders): +(WebCore::FrameLoader::stopForBackForwardCache): +(WebCore::FrameLoader::setProvisionalDocumentLoader): +(WebCore::FrameLoader::setState): +(WebCore::FrameLoader::clearProvisionalLoad): +(WebCore::FrameLoader::commitProvisionalLoad): +(WebCore::FrameLoader::transitionToCommitted): +(WebCore::FrameLoader::checkLoadCompleteForThisFrame): +(WebCore::FrameLoader::loadPostRequest): +(WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy): +(WebCore::FrameLoader::continueLoadAfterNavigationPolicy): +(WebCore::FrameLoader::loadDifferentDocumentItem): +(WebCore::FrameLoader::retryAfterFailedCacheOnlyMainResourceLoad): + 2020-01-07 Chris Dumez Using Web Share API preceded by an AJAX call Modified: trunk/Source/WebCore/loader/FrameLoader.cpp
[webkit-changes] [254147] trunk/Source/WebKit
Title: [254147] trunk/Source/WebKit Revision 254147 Author krol...@apple.com Date 2020-01-07 12:38:48 -0800 (Tue, 07 Jan 2020) Log Message Reformat WebFrameLoaderClient logging https://bugs.webkit.org/show_bug.cgi?id=205869 Reviewed by Brent Fulgham. Update the format used by WebFrameLoaderClient in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: - [] ::: So, for example: 0x4a1d7c310 - WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition, page = 0x7f83ba009208 becomes: 0x4a1d7c310 - [webFrame=0x7ff703f03b68, webFrameID=3, webPage=0x7ff704831808, webPageID=15] WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition No new tests - no added or changed functionality. * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad): (WebKit::WebFrameLoaderClient::dispatchDidFailProvisionalLoad): (WebKit::WebFrameLoaderClient::dispatchDidFailLoad): (WebKit::WebFrameLoaderClient::dispatchDidReachLayoutMilestone): Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp Diff Modified: trunk/Source/WebKit/ChangeLog (254146 => 254147) --- trunk/Source/WebKit/ChangeLog 2020-01-07 20:38:43 UTC (rev 254146) +++ trunk/Source/WebKit/ChangeLog 2020-01-07 20:38:48 UTC (rev 254147) @@ -1,3 +1,33 @@ +2020-01-07 Keith Rollin + +Reformat WebFrameLoaderClient logging +https://bugs.webkit.org/show_bug.cgi?id=205869 + + +Reviewed by Brent Fulgham. + +Update the format used by WebFrameLoaderClient in its RELEASE_LOG +logging. Use the format used by WebPageProxy and +NetworkResourceLoader, which is generally of the form: + + - [] ::: + +So, for example: + +0x4a1d7c310 - WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition, page = 0x7f83ba009208 + +becomes: + +0x4a1d7c310 - [webFrame=0x7ff703f03b68, webFrameID=3, webPage=0x7ff704831808, webPageID=15] WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition + +No new tests - no added or changed functionality. + +* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: +(WebKit::WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad): +(WebKit::WebFrameLoaderClient::dispatchDidFailProvisionalLoad): +(WebKit::WebFrameLoaderClient::dispatchDidFailLoad): +(WebKit::WebFrameLoaderClient::dispatchDidReachLayoutMilestone): + 2020-01-07 Daniel Bates First character in each word-wrapped line has incorrect character rect when requested range spans multiple lines Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (254146 => 254147) --- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2020-01-07 20:38:43 UTC (rev 254146) +++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2020-01-07 20:38:48 UTC (rev 254147) @@ -96,6 +96,16 @@ #include #include +#define PREFIX_PARAMETERS "%p - [webFrame=%p, webFrameID=%" PRIu64 ", webPage=%p, webPageID=%" PRIu64 "] WebFrameLoaderClient::" +#define WEBFRAME (webFrame()) +#define WEBFRAMEID (WEBFRAME ? WEBFRAME->frameID().toUInt64() : 0) +#define WEBPAGE (WEBFRAME ? WEBFRAME->page() : nullptr) +#define WEBPAGEID (WEBPAGE ? WEBPAGE->identifier().toUInt64() : 0) + +#define WEBFRAMELOADERCLIENT_RELEASE_LOG(channel, fmt, ...) RELEASE_LOG(channel, PREFIX_PARAMETERS fmt, this, WEBFRAME, WEBFRAMEID, WEBPAGE, WEBPAGEID, ##__VA_ARGS__) +#define WEBFRAMELOADERCLIENT_RELEASE_LOG_ERROR(channel, fmt, ...) RELEASE_LOG_ERROR(channel, PREFIX_PARAMETERS fmt, this, WEBFRAME, WEBFRAMEID, WEBPAGE, WEBPAGEID, ##__VA_ARGS__) +#define WEBFRAMELOADERCLIENT_RELEASE_LOG_FAULT(channel, fmt, ...) RELEASE_LOG_FAULT(channel, PREFIX_PARAMETERS fmt, this, WEBFRAME, WEBFRAMEID, WEBPAGE, WEBPAGEID, ##__VA_ARGS__) + namespace WebKit { using namespace WebCore; @@ -326,7 +336,7 @@ WebDocumentLoader* documentLoader = static_cast(m_frame->coreFrame()->loader().provisionalDocumentLoader()); if (!documentLoader) { -RELEASE_LOG_FAULT(Loading, "WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad called with no provisional DocumentLoader. FrameState is %i. FrameLoaderStateMachine stateForDebugging - %i", m_frame->coreFrame()->loader().state(), m_frame->coreFrame()->loader().stateMachine().stateForDebugging()); +WEBFRAMELOADERCLIENT_RELEASE_LOG_FAULT(Loading, "dispatchDidReceiveServerRedirectForProvisionalLoad: Called with no provisional DocumentLoader (frameState=%i, stateForDebugging=%i)", m_frame->coreFrame()->loader().state(), m_frame->coreFrame()->loader().stateMachine().stateForDebugging());
[webkit-changes] [254078] trunk/Source/WebKit
Title: [254078] trunk/Source/WebKit Revision 254078 Author krol...@apple.com Date 2020-01-06 12:46:38 -0800 (Mon, 06 Jan 2020) Log Message Reformat WebPage logging https://bugs.webkit.org/show_bug.cgi?id=205709 Reviewed by Brent Fulgham. Update the format used by WebPage in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: - [] ::: So, for example: 0x4a1df5000 - WebLoaderStrategy::scheduleLoad: Resource is being scheduled with the NetworkProcess (frame=0x4a1db0220, priority=0, webPageID=15, frameID=3, resourceID=32)', becomes: 0x4a1df5000 - [resourceLoader=0x1418b7200, frameLoader=0x1326d7340, frame=0x4a1db0220, webPageID=15, frameID=3, resourceID=32] WebLoaderStrategy::scheduleLoad: Resource is being scheduled with the NetworkProcess (priority=2) This new form is a lot more verbose, but it really helps in tracing activity from the top of our page/frame/resource load stack to the bottom. No new tests - no added or changed functionality. * WebProcess/Network/WebLoaderStrategy.cpp: (WebKit::WebLoaderStrategy::scheduleLoad): (WebKit::WebLoaderStrategy::tryLoadingUsingURLSchemeHandler): (WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess): (WebKit::WebLoaderStrategy::networkProcessCrashed): (WebKit::WebLoaderStrategy::loadResourceSynchronously): * WebProcess/Network/WebLoaderStrategy.h: Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h Diff Modified: trunk/Source/WebKit/ChangeLog (254077 => 254078) --- trunk/Source/WebKit/ChangeLog 2020-01-06 20:42:31 UTC (rev 254077) +++ trunk/Source/WebKit/ChangeLog 2020-01-06 20:46:38 UTC (rev 254078) @@ -1,3 +1,39 @@ +2020-01-06 Keith Rollin + +Reformat WebPage logging +https://bugs.webkit.org/show_bug.cgi?id=205709 + + +Reviewed by Brent Fulgham. + +Update the format used by WebPage in its RELEASE_LOG logging. Use the +format used by WebPageProxy and NetworkResourceLoader, which is +generally of the form: + + - [] ::: + +So, for example: + +0x4a1df5000 - WebLoaderStrategy::scheduleLoad: Resource is being scheduled with the NetworkProcess (frame=0x4a1db0220, priority=0, webPageID=15, frameID=3, resourceID=32)', + +becomes: + +0x4a1df5000 - [resourceLoader=0x1418b7200, frameLoader=0x1326d7340, frame=0x4a1db0220, webPageID=15, frameID=3, resourceID=32] WebLoaderStrategy::scheduleLoad: Resource is being scheduled with the NetworkProcess (priority=2) + +This new form is a lot more verbose, but it really helps in tracing +activity from the top of our page/frame/resource load stack to the +bottom. + +No new tests - no added or changed functionality. + +* WebProcess/Network/WebLoaderStrategy.cpp: +(WebKit::WebLoaderStrategy::scheduleLoad): +(WebKit::WebLoaderStrategy::tryLoadingUsingURLSchemeHandler): +(WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess): +(WebKit::WebLoaderStrategy::networkProcessCrashed): +(WebKit::WebLoaderStrategy::loadResourceSynchronously): +* WebProcess/Network/WebLoaderStrategy.h: + 2020-01-06 Luming Yin Add WKWebView SPI to query _WKMediaMutedState Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (254077 => 254078) --- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2020-01-06 20:42:31 UTC (rev 254077) +++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2020-01-06 20:46:38 UTC (rev 254078) @@ -76,9 +76,22 @@ #include #endif -#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(WebProcess::singleton().sessionID().isAlwaysOnLoggingAllowed(), Network, "%p - WebLoaderStrategy::" fmt, this, ##__VA_ARGS__) -#define RELEASE_LOG_ERROR_IF_ALLOWED(fmt, ...) RELEASE_LOG_ERROR_IF(WebProcess::singleton().sessionID().isAlwaysOnLoggingAllowed(), Network, "%p - WebLoaderStrategy::" fmt, this, ##__VA_ARGS__) +#define RELEASE_LOG_IS_ALLOWED (WebProcess::singleton().sessionID().isAlwaysOnLoggingAllowed()) + +#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(RELEASE_LOG_IS_ALLOWED, Network, "%p - WebLoaderStrategy::" fmt, this, ##__VA_ARGS__) +#define RELEASE_LOG_ERROR_IF_ALLOWED(fmt, ...) RELEASE_LOG_ERROR_IF(RELEASE_LOG_IS_ALLOWED, Network, "%p - WebLoaderStrategy::" fmt, this, ##__VA_ARGS__) + +#define WEBLOADERSTRATEGY_RELEASE_LOG_STANDARD_TEMPLATE "%p - [resourceLoader=%p, frameLoader=%p, frame=%p, webPageID=%" PRIu64 ", frameID=%" PRIu64 ", resourceID=%" PRIu64 "] WebLoaderStrategy::" +#define WEBLOADERSTRATEGY_RELEASE_LOG_STANDARD_PARAMETERS this, , resourceLoader.frameLoader(), resourceLoader.frame(), trackingParameters.pageID.toUInt64(), trackingParameters.frameID.toUInt64(), trackingParameters.resourceID +#define
[webkit-changes] [254033] trunk/Source/WebKit
Title: [254033] trunk/Source/WebKit Revision 254033 Author krol...@apple.com Date 2020-01-04 10:23:08 -0800 (Sat, 04 Jan 2020) Log Message Reformat WebPage logging https://bugs.webkit.org/show_bug.cgi?id=205705 Reviewed by Alex Christensen. Update the format used by WebPage in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: - [] ::: So, for example: 0x7f83ba009208 - WebPage (webPageID=15) - Adding a reason 1 to freeze layer tree (now 1); old reasons were 0 becomes: 0x7f83ba009208 - [webPageID=15] WebPage::freezeLayerTree: Adding a reason to freeze layer tree (reason=1, new=1, old=0) No new tests - no added or changed functionality. * WebProcess/WebPage/WebPage.cpp: (WebKit::m_overriddenMediaType): (WebKit::WebPage::createPlugin): (WebKit::WebPage::freezeLayerTree): (WebKit::WebPage::unfreezeLayerTree): (WebKit::WebPage::markLayersVolatile): (WebKit::WebPage::cancelMarkLayersVolatile): (WebKit::WebPage::touchEventSync): Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp Diff Modified: trunk/Source/WebKit/ChangeLog (254032 => 254033) --- trunk/Source/WebKit/ChangeLog 2020-01-04 14:54:43 UTC (rev 254032) +++ trunk/Source/WebKit/ChangeLog 2020-01-04 18:23:08 UTC (rev 254033) @@ -1,3 +1,36 @@ +2020-01-04 Keith Rollin + +Reformat WebPage logging +https://bugs.webkit.org/show_bug.cgi?id=205705 + + +Reviewed by Alex Christensen. + +Update the format used by WebPage in its RELEASE_LOG logging. Use the +format used by WebPageProxy and NetworkResourceLoader, which is +generally of the form: + + - [] ::: + +So, for example: + +0x7f83ba009208 - WebPage (webPageID=15) - Adding a reason 1 to freeze layer tree (now 1); old reasons were 0 + +becomes: + +0x7f83ba009208 - [webPageID=15] WebPage::freezeLayerTree: Adding a reason to freeze layer tree (reason=1, new=1, old=0) + +No new tests - no added or changed functionality. + +* WebProcess/WebPage/WebPage.cpp: +(WebKit::m_overriddenMediaType): +(WebKit::WebPage::createPlugin): +(WebKit::WebPage::freezeLayerTree): +(WebKit::WebPage::unfreezeLayerTree): +(WebKit::WebPage::markLayersVolatile): +(WebKit::WebPage::cancelMarkLayersVolatile): +(WebKit::WebPage::touchEventSync): + 2020-01-03 Chris Dumez Add support for DragEvent Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (254032 => 254033) --- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-01-04 14:54:43 UTC (rev 254032) +++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-01-04 18:23:08 UTC (rev 254033) @@ -325,8 +325,8 @@ static const Seconds initialLayerVolatilityTimerInterval { 20_ms }; static const Seconds maximumLayerVolatilityTimerInterval { 2_s }; -#define RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), channel, "%p - WebPage::" fmt, this, ##__VA_ARGS__) -#define RELEASE_LOG_ERROR_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), channel, "%p - WebPage::" fmt, this, ##__VA_ARGS__) +#define RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), channel, "%p - [webPageID=%" PRIu64 "] WebPage::" fmt, this, m_identifier.toUInt64(), ##__VA_ARGS__) +#define RELEASE_LOG_ERROR_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), channel, "%p - [webPageID=%" PRIu64 "] WebPage::" fmt, this, m_identifier.toUInt64(), ##__VA_ARGS__) class SendStopResponsivenessTimer { public: @@ -702,7 +702,7 @@ m_contextForVisibilityPropagation = LayerHostingContext::createForExternalHostingProcess({ m_canShowWhileLocked }); -RELEASE_LOG(Process, "Created context with ID %d for visibility propagation from UIProcess", m_contextForVisibilityPropagation->contextID()); +RELEASE_LOG_IF_ALLOWED(Process, "WebPage: Created context with ID %d for visibility propagation from UIProcess", m_contextForVisibilityPropagation->contextID()); send(Messages::WebPageProxy::DidCreateContextForVisibilityPropagation(m_contextForVisibilityPropagation->contextID())); #endif @@ -1000,7 +1000,7 @@ return nullptr; if (m_page->settings().blockingOfSmallPluginsEnabled() && pluginIsSmall(*pluginElement)) { -RELEASE_LOG(Plugins, "Blocking a plugin because it is too small"); +RELEASE_LOG_IF_ALLOWED(Plugins, "createPlugin: Blocking a plugin because it is too small"); pluginElement->setReplacement(RenderEmbeddedObject::PluginTooSmall, pluginTooSmallText()); return nullptr; } @@ -2526,7 +2526,7 @@ auto oldReasons = m_layerTreeFreezeReasons.toRaw(); UNUSED_PARAM(oldReasons); m_layerTreeFreezeReasons.add(reason); -RELEASE_LOG(ProcessSuspension, "%p - WebPage
[webkit-changes] [253990] trunk/Source/WebKit
Title: [253990] trunk/Source/WebKit Revision 253990 Author krol...@apple.com Date 2020-01-02 19:52:14 -0800 (Thu, 02 Jan 2020) Log Message Reformat WebProcess logging https://bugs.webkit.org/show_bug.cgi?id=205691 Reviewed by Chris Dumez. Update the format used by WebProcess in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: - [] ::: So, for example: 0x6f1df7000 - WebProcess::destroyRenderingResources() took 0.02ms becomes: 0x6f1df7000 - [sessionID=2] WebProcess::destroyRenderingResources: took 0.02ms While we're at it, also convert over to the RELEASE_LOG_IF_ALLOWED style of logging macro. We didn't used to be able to do this since the decision on whether or not to allow logging is typically based on SessionID, which didn't used to be an attribute of WebProcess. Now WebProcesses do (or can) have a SessionID, so use that to support the hiding of logging in private sessions. No new tests - no added or changed functionality. * WebProcess/WebProcess.cpp: (WebKit::WebProcess::initializeWebProcess): (WebKit::WebProcess::prepareToSuspend): (WebKit::WebProcess::markAllLayersVolatile): (WebKit::WebProcess::freezeAllLayerTrees): (WebKit::WebProcess::unfreezeAllLayerTrees): (WebKit::WebProcess::processDidResume): (WebKit::WebProcess::grantUserMediaDeviceSandboxExtensions): (WebKit::WebProcess::revokeUserMediaDeviceSandboxExtensions): * WebProcess/WebProcess.h: (WebKit::WebProcess::isAlwaysOnLoggingAllowed): * WebProcess/cocoa/WebProcessCocoa.mm: (WebKit::WebProcess::updateProcessName): (WebKit::WebProcess::updateCPUMonitorState): (WebKit::WebProcess::destroyRenderingResources): (WebKit::WebProcess::updateFreezerStatus): Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebProcess/WebProcess.cpp trunk/Source/WebKit/WebProcess/WebProcess.h trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm Diff Modified: trunk/Source/WebKit/ChangeLog (253989 => 253990) --- trunk/Source/WebKit/ChangeLog 2020-01-03 03:31:33 UTC (rev 253989) +++ trunk/Source/WebKit/ChangeLog 2020-01-03 03:52:14 UTC (rev 253990) @@ -1,3 +1,51 @@ +2020-01-02 Keith Rollin + +Reformat WebProcess logging +https://bugs.webkit.org/show_bug.cgi?id=205691 + + +Reviewed by Chris Dumez. + +Update the format used by WebProcess in its RELEASE_LOG logging. Use +the format used by WebPageProxy and NetworkResourceLoader, which is +generally of the form: + + - [] ::: + +So, for example: + +0x6f1df7000 - WebProcess::destroyRenderingResources() took 0.02ms + +becomes: + +0x6f1df7000 - [sessionID=2] WebProcess::destroyRenderingResources: took 0.02ms + +While we're at it, also convert over to the RELEASE_LOG_IF_ALLOWED +style of logging macro. We didn't used to be able to do this since the +decision on whether or not to allow logging is typically based on +SessionID, which didn't used to be an attribute of WebProcess. Now +WebProcesses do (or can) have a SessionID, so use that to support the +hiding of logging in private sessions. + +No new tests - no added or changed functionality. + +* WebProcess/WebProcess.cpp: +(WebKit::WebProcess::initializeWebProcess): +(WebKit::WebProcess::prepareToSuspend): +(WebKit::WebProcess::markAllLayersVolatile): +(WebKit::WebProcess::freezeAllLayerTrees): +(WebKit::WebProcess::unfreezeAllLayerTrees): +(WebKit::WebProcess::processDidResume): +(WebKit::WebProcess::grantUserMediaDeviceSandboxExtensions): +(WebKit::WebProcess::revokeUserMediaDeviceSandboxExtensions): +* WebProcess/WebProcess.h: +(WebKit::WebProcess::isAlwaysOnLoggingAllowed): +* WebProcess/cocoa/WebProcessCocoa.mm: +(WebKit::WebProcess::updateProcessName): +(WebKit::WebProcess::updateCPUMonitorState): +(WebKit::WebProcess::destroyRenderingResources): +(WebKit::WebProcess::updateFreezerStatus): + 2020-01-02 Yusuke Suzuki and Simon Fraser Experiment: create lots of different malloc zones for easier accounting of memory use Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (253989 => 253990) --- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2020-01-03 03:31:33 UTC (rev 253989) +++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2020-01-03 03:52:14 UTC (rev 253990) @@ -173,6 +173,9 @@ #include "LibWebRTCCodecs.h" #endif +#define RELEASE_LOG_SESSION_ID (m_sessionID ? m_sessionID->toUInt64() : 0) +#define RELEASE_LOG_IF_ALLOWED(channel, fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), channel, "%p - [sessionID=%" PRIu64 "] WebProcess::" fmt, this, RELEASE_LOG_SESSION_ID, ##__VA_ARGS__) + // This should be less than plugInAutoStartExpirationTimeThreshold in PlugInAutoStartProvider. static const Seconds
[webkit-changes] [253981] trunk/Source/WebKit
Title: [253981] trunk/Source/WebKit Revision 253981 Author krol...@apple.com Date 2020-01-02 13:43:29 -0800 (Thu, 02 Jan 2020) Log Message Reformat WebProcessCache logging https://bugs.webkit.org/show_bug.cgi?id=205683 Reviewed by Alex Christensen. Update the format used by WebProcessCache in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: - [] ::: So, for example: 0x1145ed208 - WebProcessCache::canCacheProcess(): Not caching process 83671 because it does not have an associated registrable domain becomes: 0x1145ed208 - [PID=83671] WebProcessCache::canCacheProcess: Not caching process because it does not have an associated registrable domain No new tests - no added or changed functionality. * UIProcess/WebProcessCache.cpp: (WebKit::WebProcessCache::canCacheProcess const): (WebKit::WebProcessCache::addProcessIfPossible): (WebKit::WebProcessCache::addProcess): (WebKit::WebProcessCache::takeProcess): (WebKit::WebProcessCache::updateCapacity): (WebKit::WebProcessCache::clear): (WebKit::WebProcessCache::clearAllProcessesForSession): (WebKit::WebProcessCache::setApplicationIsActive): (WebKit::WebProcessCache::removeProcess): Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/UIProcess/WebProcessCache.cpp Diff Modified: trunk/Source/WebKit/ChangeLog (253980 => 253981) --- trunk/Source/WebKit/ChangeLog 2020-01-02 21:24:54 UTC (rev 253980) +++ trunk/Source/WebKit/ChangeLog 2020-01-02 21:43:29 UTC (rev 253981) @@ -1,5 +1,40 @@ 2020-01-02 Keith Rollin +Reformat WebProcessCache logging +https://bugs.webkit.org/show_bug.cgi?id=205683 + + +Reviewed by Alex Christensen. + +Update the format used by WebProcessCache in its RELEASE_LOG logging. +Use the format used by WebPageProxy and NetworkResourceLoader, which +is generally of the form: + + - [] ::: + +So, for example: + +0x1145ed208 - WebProcessCache::canCacheProcess(): Not caching process 83671 because it does not have an associated registrable domain + +becomes: + +0x1145ed208 - [PID=83671] WebProcessCache::canCacheProcess: Not caching process because it does not have an associated registrable domain + +No new tests - no added or changed functionality. + +* UIProcess/WebProcessCache.cpp: +(WebKit::WebProcessCache::canCacheProcess const): +(WebKit::WebProcessCache::addProcessIfPossible): +(WebKit::WebProcessCache::addProcess): +(WebKit::WebProcessCache::takeProcess): +(WebKit::WebProcessCache::updateCapacity): +(WebKit::WebProcessCache::clear): +(WebKit::WebProcessCache::clearAllProcessesForSession): +(WebKit::WebProcessCache::setApplicationIsActive): +(WebKit::WebProcessCache::removeProcess): + +2020-01-02 Keith Rollin + Reformat ProcessThrottler logging https://bugs.webkit.org/show_bug.cgi?id=205679 Modified: trunk/Source/WebKit/UIProcess/WebProcessCache.cpp (253980 => 253981) --- trunk/Source/WebKit/UIProcess/WebProcessCache.cpp 2020-01-02 21:24:54 UTC (rev 253980) +++ trunk/Source/WebKit/UIProcess/WebProcessCache.cpp 2020-01-02 21:43:29 UTC (rev 253981) @@ -33,6 +33,9 @@ #include #include +#define WEBPROCESSCACHE_RELEASE_LOG(fmt, ...) RELEASE_LOG(ProcessSwapping, "%p - [PID=%d] WebProcessCache::" fmt, this, ##__VA_ARGS__) +#define WEBPROCESSCACHE_RELEASE_LOG_ERROR(fmt, ...) RELEASE_LOG_ERROR(ProcessSwapping, "%p - [PID=%d] WebProcessCache::" fmt, this, ##__VA_ARGS__) + namespace WebKit { Seconds WebProcessCache::cachedProcessLifetime { 30_min }; @@ -53,22 +56,24 @@ bool WebProcessCache::canCacheProcess(WebProcessProxy& process) const { -if (!capacity()) +if (!capacity()) { +WEBPROCESSCACHE_RELEASE_LOG("canCacheProcess: Not caching process because the cache has no capacity", process.processIdentifier()); return false; +} if (process.registrableDomain().isEmpty()) { -RELEASE_LOG(ProcessSwapping, "%p - WebProcessCache::canCacheProcess(): Not caching process %i because it does not have an associated registrable domain", this, process.processIdentifier()); +WEBPROCESSCACHE_RELEASE_LOG("canCacheProcess: Not caching process because it does not have an associated registrable domain", process.processIdentifier()); return false; } if (MemoryPressureHandler::singleton().isUnderMemoryPressure()) { -RELEASE_LOG(ProcessSwapping, "%p - WebProcessCache::canCacheProcess(): Not caching process %i because we are under memory pressure", this, process.processIdentifier()); +WEBPROCESSCACHE_RELEASE_LOG("canCacheProcess: Not caching process because we are under memory pressure", process.processIdentifier()); return false; } auto sessionID = process.websiteDataStore().sessionID(); if
[webkit-changes] [253980] trunk/Source/WebKit
Title: [253980] trunk/Source/WebKit Revision 253980 Author krol...@apple.com Date 2020-01-02 13:24:54 -0800 (Thu, 02 Jan 2020) Log Message Reformat ProcessThrottler logging https://bugs.webkit.org/show_bug.cgi?id=205679 Reviewed by Alex Christensen. Update the format used by ProcessThrottler in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: - [] ::: So, for example: [PID: 0] 0x1145ce5e8 - ProcessThrottler::invalidateAllActivities() BEGIN becomes: 0x1145ce5e8 - [PID: 0] ProcessThrottler::invalidateAllActivities: BEGIN No new tests - no added or changed functionality. * UIProcess/ProcessThrottler.cpp: (WebKit::ProcessThrottler::invalidateAllActivities): (WebKit::ProcessThrottler::setAssertionState): (WebKit::ProcessThrottler::updateAssertionIfNeeded): (WebKit::ProcessThrottler::didConnectToProcess): (WebKit::ProcessThrottler::prepareToSuspendTimeoutTimerFired): (WebKit::ProcessThrottler::processReadyToSuspend): (WebKit::ProcessThrottler::sendPrepareToSuspendIPC): (WebKit::ProcessThrottler::uiAssertionWillExpireImminently): * UIProcess/ProcessThrottler.h: (WebKit::ProcessThrottler::Activity::Activity): (WebKit::ProcessThrottler::Activity::invalidate): Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/UIProcess/ProcessThrottler.cpp trunk/Source/WebKit/UIProcess/ProcessThrottler.h Diff Modified: trunk/Source/WebKit/ChangeLog (253979 => 253980) --- trunk/Source/WebKit/ChangeLog 2020-01-02 21:21:01 UTC (rev 253979) +++ trunk/Source/WebKit/ChangeLog 2020-01-02 21:24:54 UTC (rev 253980) @@ -1,5 +1,42 @@ 2020-01-02 Keith Rollin +Reformat ProcessThrottler logging +https://bugs.webkit.org/show_bug.cgi?id=205679 + + +Reviewed by Alex Christensen. + +Update the format used by ProcessThrottler in its RELEASE_LOG logging. +Use the format used by WebPageProxy and NetworkResourceLoader, which +is generally of the form: + + - [] ::: + +So, for example: + +[PID: 0] 0x1145ce5e8 - ProcessThrottler::invalidateAllActivities() BEGIN + +becomes: + +0x1145ce5e8 - [PID: 0] ProcessThrottler::invalidateAllActivities: BEGIN + +No new tests - no added or changed functionality. + +* UIProcess/ProcessThrottler.cpp: +(WebKit::ProcessThrottler::invalidateAllActivities): +(WebKit::ProcessThrottler::setAssertionState): +(WebKit::ProcessThrottler::updateAssertionIfNeeded): +(WebKit::ProcessThrottler::didConnectToProcess): +(WebKit::ProcessThrottler::prepareToSuspendTimeoutTimerFired): +(WebKit::ProcessThrottler::processReadyToSuspend): +(WebKit::ProcessThrottler::sendPrepareToSuspendIPC): +(WebKit::ProcessThrottler::uiAssertionWillExpireImminently): +* UIProcess/ProcessThrottler.h: +(WebKit::ProcessThrottler::Activity::Activity): +(WebKit::ProcessThrottler::Activity::invalidate): + +2020-01-02 Keith Rollin + Reformat WebResourceLoader logging https://bugs.webkit.org/show_bug.cgi?id=205680 Modified: trunk/Source/WebKit/UIProcess/ProcessThrottler.cpp (253979 => 253980) --- trunk/Source/WebKit/UIProcess/ProcessThrottler.cpp 2020-01-02 21:21:01 UTC (rev 253979) +++ trunk/Source/WebKit/UIProcess/ProcessThrottler.cpp 2020-01-02 21:24:54 UTC (rev 253980) @@ -78,12 +78,12 @@ void ProcessThrottler::invalidateAllActivities() { -RELEASE_LOG(ProcessSuspension, "[PID: %d] %p - ProcessThrottler::invalidateAllActivities() BEGIN", m_processIdentifier, this); +PROCESSTHROTTLER_RELEASE_LOG("invalidateAllActivities: BEGIN"); while (!m_foregroundActivities.isEmpty()) (*m_foregroundActivities.begin())->invalidate(); while (!m_backgroundActivities.isEmpty()) (*m_backgroundActivities.begin())->invalidate(); -RELEASE_LOG(ProcessSuspension, "[PID: %d] %p - ProcessThrottler::invalidateAllActivities() END", m_processIdentifier, this); +PROCESSTHROTTLER_RELEASE_LOG("invalidateAllActivities: END"); } AssertionState ProcessThrottler::expectedAssertionState() @@ -106,7 +106,7 @@ if (m_assertion->state() == newState) return; -RELEASE_LOG(ProcessSuspension, "[PID: %d] %p - ProcessThrottler::setAssertionState() Updating process assertion state to %u (foregroundActivities: %u, backgroundActivities: %u)", m_processIdentifier, this, newState, m_foregroundActivities.size(), m_backgroundActivities.size()); +PROCESSTHROTTLER_RELEASE_LOG("setAssertionState: Updating process assertion state to %u (foregroundActivities: %u, backgroundActivities: %u)", newState, m_foregroundActivities.size(), m_backgroundActivities.size()); m_assertion->setState(newState); m_process.didSetAssertionState(newState); } @@ -119,9 +119,9 @@ if (shouldBeRunnable()) { if (m_assertion->state() == AssertionState::Suspended ||
[webkit-changes] [253979] trunk/Source/WebKit
Title: [253979] trunk/Source/WebKit Revision 253979 Author krol...@apple.com Date 2020-01-02 13:21:01 -0800 (Thu, 02 Jan 2020) Log Message Reformat WebResourceLoader logging https://bugs.webkit.org/show_bug.cgi?id=205680 Reviewed by Alex Christensen. Update the format used by WebResourceLoader in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: - [] ::: So, for example: 0x4a1dbcb58 - WebResourceLoader::didFinishResourceLoad: (webPageID=15, frameID=3, resourceID=1, length=212132) becomes: 0x4a1dbcb58 - [webPageID=15, frameID=3, resourceID=1] WebResourceLoader::didFinishResourceLoad: (length=212132) No new tests - no added or changed functionality. * WebProcess/Network/WebResourceLoader.cpp: (WebKit::WebResourceLoader::willSendRequest): (WebKit::WebResourceLoader::didReceiveResponse): (WebKit::WebResourceLoader::didReceiveData): (WebKit::WebResourceLoader::didFinishResourceLoad): (WebKit::WebResourceLoader::serviceWorkerDidNotHandle): (WebKit::WebResourceLoader::didFailResourceLoad): (WebKit::WebResourceLoader::didBlockAuthenticationChallenge): (WebKit::WebResourceLoader::stopLoadingAfterXFrameOptionsOrContentSecurityPolicyDenied): (WebKit::WebResourceLoader::didReceiveResource): Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp Diff Modified: trunk/Source/WebKit/ChangeLog (253978 => 253979) --- trunk/Source/WebKit/ChangeLog 2020-01-02 21:14:02 UTC (rev 253978) +++ trunk/Source/WebKit/ChangeLog 2020-01-02 21:21:01 UTC (rev 253979) @@ -1,3 +1,38 @@ +2020-01-02 Keith Rollin + +Reformat WebResourceLoader logging +https://bugs.webkit.org/show_bug.cgi?id=205680 + + +Reviewed by Alex Christensen. + +Update the format used by WebResourceLoader in its RELEASE_LOG +logging. Use the format used by WebPageProxy and +NetworkResourceLoader, which is generally of the form: + + - [] ::: + +So, for example: + +0x4a1dbcb58 - WebResourceLoader::didFinishResourceLoad: (webPageID=15, frameID=3, resourceID=1, length=212132) + +becomes: + +0x4a1dbcb58 - [webPageID=15, frameID=3, resourceID=1] WebResourceLoader::didFinishResourceLoad: (length=212132) + +No new tests - no added or changed functionality. + +* WebProcess/Network/WebResourceLoader.cpp: +(WebKit::WebResourceLoader::willSendRequest): +(WebKit::WebResourceLoader::didReceiveResponse): +(WebKit::WebResourceLoader::didReceiveData): +(WebKit::WebResourceLoader::didFinishResourceLoad): +(WebKit::WebResourceLoader::serviceWorkerDidNotHandle): +(WebKit::WebResourceLoader::didFailResourceLoad): +(WebKit::WebResourceLoader::didBlockAuthenticationChallenge): +(WebKit::WebResourceLoader::stopLoadingAfterXFrameOptionsOrContentSecurityPolicyDenied): +(WebKit::WebResourceLoader::didReceiveResource): + 2020-01-02 Alex Christensen Add SPI to disable CORS on requests to URLs matching a pattern Modified: trunk/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp (253978 => 253979) --- trunk/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp 2020-01-02 21:14:02 UTC (rev 253978) +++ trunk/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp 2020-01-02 21:21:01 UTC (rev 253979) @@ -55,7 +55,7 @@ #include #include -#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - WebResourceLoader::" fmt, this, ##__VA_ARGS__) +#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - [webPageID=%" PRIu64 ", frameID=%" PRIu64 ", resourceID=%" PRIu64 "] WebResourceLoader::" fmt, this, m_trackingParameters.pageID.toUInt64(), m_trackingParameters.frameID.toUInt64(), m_trackingParameters.resourceID, ##__VA_ARGS__) namespace WebKit { using namespace WebCore; @@ -101,16 +101,16 @@ proposedRequest.setHTTPBody(proposedRequestBody.takeData()); LOG(Network, "(WebProcess) WebResourceLoader::willSendRequest to '%s'", proposedRequest.url().string().latin1().data()); -RELEASE_LOG_IF_ALLOWED("willSendRequest: (webPageID=%" PRIu64 ", frameID=%" PRIu64 ", resourceID=%" PRIu64 ")", m_trackingParameters.pageID.toUInt64(), m_trackingParameters.frameID.toUInt64(), m_trackingParameters.resourceID); +RELEASE_LOG_IF_ALLOWED("willSendRequest:"); if (m_coreLoader->documentLoader()->applicationCacheHost().maybeLoadFallbackForRedirect(m_coreLoader.get(), proposedRequest, redirectResponse)) { -RELEASE_LOG_IF_ALLOWED("willSendRequest: exiting early because maybeLoadFallbackForRedirect returned false (webPageID=%" PRIu64 ", frameID=%" PRIu64 ", resourceID=%" PRIu64 ")", m_trackingParameters.pageID.toUInt64(), m_trackingParameters.frameID.toUInt64(), m_trackingParameters.resourceID); +
[webkit-changes] [253601] trunk/Tools
Title: [253601] trunk/Tools Revision 253601 Author krol...@apple.com Date 2019-12-16 17:12:22 -0800 (Mon, 16 Dec 2019) Log Message Unreviewed follow-up fix. jsc-ta-payload fails consistently on YukonE Device Builds Bug caused by [safari-root] CrashTracer: [USER] jsc at jsc: jscmain run-jsc-stress-tests still looked for jsc in _javascript_Core.framework/Resources. Change this to also look in _javascript_Core.framework/Helpers. * Scripts/run-jsc-stress-tests: Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/run-jsc-stress-tests Diff Modified: trunk/Tools/ChangeLog (253600 => 253601) --- trunk/Tools/ChangeLog 2019-12-17 00:55:37 UTC (rev 253600) +++ trunk/Tools/ChangeLog 2019-12-17 01:12:22 UTC (rev 253601) @@ -1,3 +1,16 @@ +2019-12-16 Keith Rollin + +Unreviewed follow-up fix. + jsc-ta-payload fails consistently on YukonE Device Builds + +Bug caused by [safari-root] CrashTracer: [USER] jsc at jsc: jscmain + +run-jsc-stress-tests still looked for jsc in +_javascript_Core.framework/Resources. Change this to also look in +_javascript_Core.framework/Helpers. + +* Scripts/run-jsc-stress-tests: + 2019-12-16 Jonathan Bedard results.webkit.org: Make default limit 1000 Modified: trunk/Tools/Scripts/run-jsc-stress-tests (253600 => 253601) --- trunk/Tools/Scripts/run-jsc-stress-tests 2019-12-17 00:55:37 UTC (rev 253600) +++ trunk/Tools/Scripts/run-jsc-stress-tests 2019-12-17 01:12:22 UTC (rev 253601) @@ -513,7 +513,7 @@ def frameworkFromJSCPath(jscPath) parentDirectory = jscPath.dirname -if parentDirectory.basename.to_s == "Resources" and parentDirectory.dirname.basename.to_s == "_javascript_Core.framework" +if (parentDirectory.basename.to_s == "Resources" or parentDirectory.basename.to_s == "Helpers") and parentDirectory.dirname.basename.to_s == "_javascript_Core.framework" parentDirectory.dirname elsif $hostOS == "playstation" jscPath.dirname ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [252564] trunk
Title: [252564] trunk Revision 252564 Author krol...@apple.com Date 2019-11-18 13:47:59 -0800 (Mon, 18 Nov 2019) Log Message Move jsc from Resources to Helpers https://bugs.webkit.org/show_bug.cgi?id=203970 Reviewed by Keith Miller. 'jsc' is a supporting application or tool, not a resource. As such, it should go into Helpers, per Source/_javascript_Core: * Configurations/Base.xcconfig: * Configurations/JSC.xcconfig: * Configurations/ToolExecutable.xcconfig: * _javascript_Core.xcodeproj/project.pbxproj: Tools: * Scripts/run-jsc-stress-tests: * Scripts/run-layout-jsc: * Scripts/sunspider-compare-results: (pathToSystemJSC): * Scripts/test262/Runner.pm: (getBuildPath): * Scripts/webkitdirs.pm: (jscPath): Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/Base.xcconfig trunk/Source/_javascript_Core/Configurations/JSC.xcconfig trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj trunk/Tools/ChangeLog trunk/Tools/Scripts/run-jsc-stress-tests trunk/Tools/Scripts/run-layout-jsc trunk/Tools/Scripts/sunspider-compare-results trunk/Tools/Scripts/test262/Runner.pm trunk/Tools/Scripts/webkitdirs.pm Diff Modified: trunk/Source/_javascript_Core/ChangeLog (252563 => 252564) --- trunk/Source/_javascript_Core/ChangeLog 2019-11-18 21:45:40 UTC (rev 252563) +++ trunk/Source/_javascript_Core/ChangeLog 2019-11-18 21:47:59 UTC (rev 252564) @@ -1,3 +1,20 @@ +2019-11-18 Keith Rollin + +Move jsc from Resources to Helpers +https://bugs.webkit.org/show_bug.cgi?id=203970 + + +Reviewed by Keith Miller. + +'jsc' is a supporting application or tool, not a resource. As such, it +should go into Helpers, per + + +* Configurations/Base.xcconfig: +* Configurations/JSC.xcconfig: +* Configurations/ToolExecutable.xcconfig: +* _javascript_Core.xcodeproj/project.pbxproj: + 2019-11-18 Keith Miller Enable Nullish operators by default Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (252563 => 252564) --- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2019-11-18 21:45:40 UTC (rev 252563) +++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2019-11-18 21:47:59 UTC (rev 252564) @@ -127,7 +127,7 @@ _javascript_CORE_CONTENTS_DIR[sdk=iphone*] = _javascript_Core.framework; _javascript_CORE_CONTENTS_DIR[sdk=macosx*] = _javascript_Core.framework/Versions/A; -_javascript_CORE_RESOURCES_DIR = $(_javascript_CORE_CONTENTS_DIR)/Resources; +_javascript_CORE_HELPERS_DIR = $(_javascript_CORE_CONTENTS_DIR)/Helpers; _javascript_CORE_LIBRARIES_DIR = $(_javascript_CORE_CONTENTS_DIR)/Libraries; // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants. Modified: trunk/Source/_javascript_Core/Configurations/JSC.xcconfig (252563 => 252564) --- trunk/Source/_javascript_Core/Configurations/JSC.xcconfig 2019-11-18 21:45:40 UTC (rev 252563) +++ trunk/Source/_javascript_Core/Configurations/JSC.xcconfig 2019-11-18 21:47:59 UTC (rev 252564) @@ -24,7 +24,7 @@ #include "FeatureDefines.xcconfig" #include "Version.xcconfig" -INSTALL_PATH = $(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_RESOURCES_DIR); +INSTALL_PATH = $(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_HELPERS_DIR); OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS); WK_RELOCATABLE_FRAMEWORKS_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS)); Modified: trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig (252563 => 252564) --- trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2019-11-18 21:45:40 UTC (rev 252563) +++ trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2019-11-18 21:47:59 UTC (rev 252564) @@ -25,7 +25,7 @@ #include "FeatureDefines.xcconfig" #include "Version.xcconfig" -INSTALL_PATH = $(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_RESOURCES_DIR); +INSTALL_PATH = $(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_HELPERS_DIR); PRODUCT_NAME = $(TARGET_NAME); USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION)); Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (252563 => 252564) --- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2019-11-18 21:45:40 UTC (rev 252563) +++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2019-11-18 21:47:59 UTC (rev 252564) @@ -102,6 +102,7 @@ buildConfigurationList = 149C276C08902AFE008A9EFC /* Build configuration list for PBXAggregateTarget "All" */; buildPhases = ( 5DF7E1CC188E6B87003F9A46 /* Copy jsc into _javascript_Core.framework */, +539966E3237CD6740033B0D2 /* Create Versions/Current/Helpers symlink */, ); dependencies = (
[webkit-changes] [252174] trunk/Source/WebKit
Title: [252174] trunk/Source/WebKit Revision 252174 Author krol...@apple.com Date 2019-11-06 22:37:33 -0800 (Wed, 06 Nov 2019) Log Message Update availability annotations to match the macOS 10.15 and iOS 13.0 GM SDKs https://bugs.webkit.org/show_bug.cgi?id=202243 Reviewed by Brent Fulgham. Changed WK_MAC_TBA and WK_IOS_TBA to 10.15 and 13.0, respectively, in all declarations that appear in the GM SDKs. * Configurations/WebKit.xcconfig: * Shared/API/Cocoa/WKMain.h: * UIProcess/API/Cocoa/NSAttributedString.h: * UIProcess/API/Cocoa/WKContextMenuElementInfo.h: * UIProcess/API/Cocoa/WKError.h: * UIProcess/API/Cocoa/WKErrorPrivate.h: * UIProcess/API/Cocoa/WKNavigation.h: * UIProcess/API/Cocoa/WKNavigationActionPrivate.h: * UIProcess/API/Cocoa/WKNavigationDelegate.h: * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h: * UIProcess/API/Cocoa/WKNavigationResponsePrivate.h: * UIProcess/API/Cocoa/WKPreferences.h: * UIProcess/API/Cocoa/WKPreferencesPrivate.h: * UIProcess/API/Cocoa/WKPreviewActionItem.h: * UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h: * UIProcess/API/Cocoa/WKPreviewElementInfo.h: * UIProcess/API/Cocoa/WKProcessPoolPrivate.h: * UIProcess/API/Cocoa/WKSnapshotConfiguration.h: * UIProcess/API/Cocoa/WKUIDelegate.h: * UIProcess/API/Cocoa/WKUIDelegatePrivate.h: * UIProcess/API/Cocoa/WKURLSchemeTaskPrivate.h: * UIProcess/API/Cocoa/WKWebViewConfiguration.h: * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h: * UIProcess/API/Cocoa/WKWebViewPrivate.h: * UIProcess/API/Cocoa/WKWebpagePreferences.h: * UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h: * UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h: * UIProcess/API/Cocoa/_WKActivatedElementInfo.h: * UIProcess/API/Cocoa/_WKAutomationSessionDelegate.h: * UIProcess/API/Cocoa/_WKContentRuleListAction.h: * UIProcess/API/Cocoa/_WKCustomHeaderFields.h: * UIProcess/API/Cocoa/_WKDiagnosticLoggingDelegate.h: * UIProcess/API/Cocoa/_WKElementAction.h: * UIProcess/API/Cocoa/_WKInspectorWindow.h: * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h: * UIProcess/API/Cocoa/_WKTextInputContext.h: * UIProcess/API/Cocoa/_WKUserContentExtensionStorePrivate.h: * UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h: * UIProcess/API/Cocoa/_WKWebsiteDataStoreDelegate.h: * UIProcess/API/Cocoa/_WKWebsitePolicies.h: * UIProcess/_WKTouchEventGenerator.h: * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h: Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/WebKit.xcconfig trunk/Source/WebKit/Shared/API/Cocoa/WKMain.h trunk/Source/WebKit/UIProcess/API/Cocoa/NSAttributedString.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKContextMenuElementInfo.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKError.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKErrorPrivate.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigation.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationActionPrivate.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegate.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationResponsePrivate.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItem.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreviewElementInfo.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKSnapshotConfiguration.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKURLSchemeTaskPrivate.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h trunk/Source/WebKit/UIProcess/API/Cocoa/_WKActivatedElementInfo.h trunk/Source/WebKit/UIProcess/API/Cocoa/_WKAutomationSessionDelegate.h trunk/Source/WebKit/UIProcess/API/Cocoa/_WKContentRuleListAction.h trunk/Source/WebKit/UIProcess/API/Cocoa/_WKCustomHeaderFields.h trunk/Source/WebKit/UIProcess/API/Cocoa/_WKDiagnosticLoggingDelegate.h trunk/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorWindow.h trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextInputContext.h trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStorePrivate.h trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreDelegate.h
[webkit-changes] [252152] trunk/Tools
Title: [252152] trunk/Tools Revision 252152 Author krol...@apple.com Date 2019-11-06 14:42:10 -0800 (Wed, 06 Nov 2019) Log Message Unreviewed build fix: fix TestWebKitAPI in macCatalyst, tvOS, and watchOS builds by conditionalizing some code on HAVE_UIWEBVIEW and HAVE_PDFKIT. Follow-up to r251976. * TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm: * TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm: * TestWebKitAPI/Tests/WebKitLegacy/ios/JSLockTakesWebThreadLock.mm: * TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollToRevealSelection.mm: * TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollingDoesNotPauseMedia.mm: * TestWebKitAPI/Tests/WebKitLegacy/ios/SnapshotViaRenderInContext.mm: * TestWebKitAPI/Tests/ios/SetTimeoutFunction.mm: * TestWebKitAPI/config.h: Modified Paths trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/JSLockTakesWebThreadLock.mm trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollToRevealSelection.mm trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollingDoesNotPauseMedia.mm trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/SnapshotViaRenderInContext.mm trunk/Tools/TestWebKitAPI/Tests/ios/SetTimeoutFunction.mm trunk/Tools/TestWebKitAPI/config.h Diff Modified: trunk/Tools/ChangeLog (252151 => 252152) --- trunk/Tools/ChangeLog 2019-11-06 22:38:56 UTC (rev 252151) +++ trunk/Tools/ChangeLog 2019-11-06 22:42:10 UTC (rev 252152) @@ -1,3 +1,18 @@ +2019-11-06 Keith Rollin + +Unreviewed build fix: fix TestWebKitAPI in macCatalyst, tvOS, and +watchOS builds by conditionalizing some code on HAVE_UIWEBVIEW and +HAVE_PDFKIT. Follow-up to r251976. + +* TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm: +* TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm: +* TestWebKitAPI/Tests/WebKitLegacy/ios/JSLockTakesWebThreadLock.mm: +* TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollToRevealSelection.mm: +* TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollingDoesNotPauseMedia.mm: +* TestWebKitAPI/Tests/WebKitLegacy/ios/SnapshotViaRenderInContext.mm: +* TestWebKitAPI/Tests/ios/SetTimeoutFunction.mm: +* TestWebKitAPI/config.h: + 2019-11-06 Aakash Jain All EWS status-bubbles shows #1 on security patches when patch is uploaded with webkit-patch --no-review Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm (252151 => 252152) --- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm 2019-11-06 22:38:56 UTC (rev 252151) +++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm 2019-11-06 22:42:10 UTC (rev 252152) @@ -34,7 +34,7 @@ #import #import -#if PLATFORM(IOS_FAMILY) +#if HAVE(PDFKIT) && PLATFORM(IOS) @interface PDFHostViewController : UIViewController + (void)createHostView:(void(^)(id hostViewController))callback forExtensionIdentifier:(NSString *)extensionIdentifier; Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm (252151 => 252152) --- trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm 2019-11-06 22:38:56 UTC (rev 252151) +++ trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm 2019-11-06 22:42:10 UTC (rev 252152) @@ -25,7 +25,7 @@ #import "config.h" -#if PLATFORM(IOS_FAMILY) +#if HAVE(UIWEBVIEW) #import "PlatformUtilities.h" #import Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/JSLockTakesWebThreadLock.mm (252151 => 252152) --- trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/JSLockTakesWebThreadLock.mm 2019-11-06 22:38:56 UTC (rev 252151) +++ trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/JSLockTakesWebThreadLock.mm 2019-11-06 22:42:10 UTC (rev 252152) @@ -25,7 +25,7 @@ #import "config.h" -#if PLATFORM(IOS_FAMILY) +#if HAVE(UIWEBVIEW) #import "PlatformUtilities.h" #import <_javascript_Core/JSVirtualMachine.h> Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollToRevealSelection.mm (252151 => 252152) --- trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollToRevealSelection.mm 2019-11-06 22:38:56 UTC (rev 252151) +++ trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollToRevealSelection.mm 2019-11-06 22:42:10 UTC (rev 252152) @@ -25,7 +25,7 @@ #import "config.h" -#if PLATFORM(IOS_FAMILY) +#if HAVE(UIWEBVIEW) IGNORE_WARNINGS_BEGIN("deprecated-implementations") Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollingDoesNotPauseMedia.mm (252151 => 252152) --- trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollingDoesNotPauseMedia.mm 2019-11-06 22:38:56 UTC (rev 252151) +++ trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollingDoesNotPauseMedia.mm 2019-11-06 22:42:10 UTC (rev 252152) @@ -25,7 +25,7 @@ #include "config.h" -#if PLATFORM(IOS_FAMILY) +#if HAVE(UIWEBVIEW) #import "PlatformUtilities.h" #import Modified:
[webkit-changes] [251096] trunk/Source/WTF
Title: [251096] trunk/Source/WTF Revision 251096 Author krol...@apple.com Date 2019-10-14 14:14:03 -0700 (Mon, 14 Oct 2019) Log Message Remove some support for < iOS 13 https://bugs.webkit.org/show_bug.cgi?id=202820 Reviewed by Anders Carlsson. Remove some support for iOS versions less than 13.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 13. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. This removal is part of a series of patches effecting the removal of dead code for old versions of iOS. This particular pass involves changes in which Devin Rousso was involved. These changes are isolated from other similar changes in order to facilitate the reviewing process. * wtf/Platform.h: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Platform.h Diff Modified: trunk/Source/WTF/ChangeLog (251095 => 251096) --- trunk/Source/WTF/ChangeLog 2019-10-14 21:05:45 UTC (rev 251095) +++ trunk/Source/WTF/ChangeLog 2019-10-14 21:14:03 UTC (rev 251096) @@ -1,3 +1,27 @@ +2019-10-14 Keith Rollin + +Remove some support for < iOS 13 +https://bugs.webkit.org/show_bug.cgi?id=202820 + + +Reviewed by Anders Carlsson. + +Remove some support for iOS versions less than 13.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 13. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. + +This removal is part of a series of patches effecting the removal of +dead code for old versions of iOS. This particular pass involves +changes in which Devin Rousso was involved. These changes are isolated +from other similar changes in order to facilitate the reviewing +process. + +* wtf/Platform.h: + 2019-10-14 Alex Christensen REGRESSION: [iOS 13?] TestWebKitAPI.SharedBufferTest.tryCreateArrayBufferLargeSegments is failing Modified: trunk/Source/WTF/wtf/Platform.h (251095 => 251096) --- trunk/Source/WTF/wtf/Platform.h 2019-10-14 21:05:45 UTC (rev 251095) +++ trunk/Source/WTF/wtf/Platform.h 2019-10-14 21:14:03 UTC (rev 251096) @@ -1512,7 +1512,7 @@ #define HAVE_CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE 1 #endif -#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 13) +#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || PLATFORM(IOS_FAMILY) #define HAVE_CFNETWORK_NEGOTIATED_SSL_PROTOCOL_CIPHER 1 #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [251010] trunk/Source/WTF
Title: [251010] trunk/Source/WTF Revision 251010 Author krol...@apple.com Date 2019-10-11 09:29:23 -0700 (Fri, 11 Oct 2019) Log Message Remove some support for < iOS 13 https://bugs.webkit.org/show_bug.cgi?id=202819 Reviewed by Anders Carlsson. Remove some support for iOS versions less than 13.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 13. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. This removal is part of a series of patches effecting the removal of dead code for old versions of iOS. This particular pass involves changes in which Jiewen Tan was involved. These changes are isolated from other similar changes in order to facilitate the reviewing process. * wtf/Platform.h: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Platform.h Diff Modified: trunk/Source/WTF/ChangeLog (251009 => 251010) --- trunk/Source/WTF/ChangeLog 2019-10-11 15:20:53 UTC (rev 251009) +++ trunk/Source/WTF/ChangeLog 2019-10-11 16:29:23 UTC (rev 251010) @@ -1,3 +1,27 @@ +2019-10-11 Keith Rollin + +Remove some support for < iOS 13 +https://bugs.webkit.org/show_bug.cgi?id=202819 + + +Reviewed by Anders Carlsson. + +Remove some support for iOS versions less than 13.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 13. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. + +This removal is part of a series of patches effecting the removal of +dead code for old versions of iOS. This particular pass involves +changes in which Jiewen Tan was involved. These changes are isolated +from other similar changes in order to facilitate the reviewing +process. + +* wtf/Platform.h: + 2019-10-11 Jonathan Bedard Unreviewed, rolling out r250945. Modified: trunk/Source/WTF/wtf/Platform.h (251009 => 251010) --- trunk/Source/WTF/wtf/Platform.h 2019-10-11 15:20:53 UTC (rev 251009) +++ trunk/Source/WTF/wtf/Platform.h 2019-10-11 16:29:23 UTC (rev 251010) @@ -1607,7 +1607,7 @@ #define HAVE_NSFONT_WITH_OPTICAL_SIZING_BUG 1 #endif -#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 13 || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) +#if (PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)) #define HAVE_APP_SSO 1 #endif @@ -1643,10 +1643,10 @@ #define HAVE_DEVICE_IDENTITY 1 #endif -#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 13) +#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || PLATFORM(IOS_FAMILY) #define HAVE_DATA_PROTECTION_KEYCHAIN 1 #endif -#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 13) +#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)) #define HAVE_NEAR_FIELD 1 #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [250953] trunk/Source/WTF
Title: [250953] trunk/Source/WTF Revision 250953 Author krol...@apple.com Date 2019-10-09 19:23:05 -0700 (Wed, 09 Oct 2019) Log Message Remove some support for < iOS 13 https://bugs.webkit.org/show_bug.cgi?id=202371 Reviewed by Youenn Fablet. Remove some support for iOS versions less than 13.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 13. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. This removal is part of a series of patches effecting the removal of dead code for old versions of iOS. This particular pass involves changes in which Dean Jackson was involved. These changes are isolated from other similar changes in order to facilitate the reviewing process. * wtf/FeatureDefines.h: * wtf/Platform.h: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/FeatureDefines.h trunk/Source/WTF/wtf/Platform.h Diff Modified: trunk/Source/WTF/ChangeLog (250952 => 250953) --- trunk/Source/WTF/ChangeLog 2019-10-10 02:02:19 UTC (rev 250952) +++ trunk/Source/WTF/ChangeLog 2019-10-10 02:23:05 UTC (rev 250953) @@ -1,3 +1,28 @@ +2019-10-09 Keith Rollin + +Remove some support for < iOS 13 +https://bugs.webkit.org/show_bug.cgi?id=202371 + + +Reviewed by Youenn Fablet. + +Remove some support for iOS versions less than 13.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 13. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. + +This removal is part of a series of patches effecting the removal of +dead code for old versions of iOS. This particular pass involves +changes in which Dean Jackson was involved. These changes are isolated +from other similar changes in order to facilitate the reviewing +process. + +* wtf/FeatureDefines.h: +* wtf/Platform.h: + 2019-10-09 Daniel Bates Add support for CompactPointerTuple<..., OptionSet<...>> Modified: trunk/Source/WTF/wtf/FeatureDefines.h (250952 => 250953) --- trunk/Source/WTF/wtf/FeatureDefines.h 2019-10-10 02:02:19 UTC (rev 250952) +++ trunk/Source/WTF/wtf/FeatureDefines.h 2019-10-10 02:23:05 UTC (rev 250953) @@ -179,7 +179,7 @@ #endif #endif -#if PLATFORM(MACCATALYST) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 13) +#if PLATFORM(MACCATALYST) || PLATFORM(IOS) #if !defined(USE_UIKIT_KEYBOARD_ADDITIONS) #define USE_UIKIT_KEYBOARD_ADDITIONS 1 #endif Modified: trunk/Source/WTF/wtf/Platform.h (250952 => 250953) --- trunk/Source/WTF/wtf/Platform.h 2019-10-10 02:02:19 UTC (rev 250952) +++ trunk/Source/WTF/wtf/Platform.h 2019-10-10 02:23:05 UTC (rev 250953) @@ -1444,7 +1444,7 @@ #define HAVE_CG_FONT_RENDERING_GET_FONT_SMOOTHING_DISABLED 1 #endif -#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 13) +#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || PLATFORM(IOS_FAMILY) #define HAVE_CA_WHERE_ADDITIVE_TRANSFORMS_ARE_REVERSED 1 #endif @@ -1615,7 +1615,7 @@ #define HAVE_TLS_PROTOCOL_VERSION_T 1 #endif -#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 13 +#if PLATFORM(IOS) || PLATFORM(MACCATALYST) #define USE_UICONTEXTMENU 1 #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [250798] trunk/Source/WebCore
Title: [250798] trunk/Source/WebCore Revision 250798 Author krol...@apple.com Date 2019-10-07 15:14:27 -0700 (Mon, 07 Oct 2019) Log Message Unreviewed, build fix after r250666. Fix 32- vs. 64-bit mismatch on 32-bit builds. * Modules/indexeddb/server/UniqueIDBDatabase.cpp: (WebCore::IDBServer::estimateSize): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (250797 => 250798) --- trunk/Source/WebCore/ChangeLog 2019-10-07 22:12:16 UTC (rev 250797) +++ trunk/Source/WebCore/ChangeLog 2019-10-07 22:14:27 UTC (rev 250798) @@ -1,3 +1,11 @@ +2019-10-07 Keith Rollin + +Unreviewed, build fix after r250666. Fix 32- vs. 64-bit mismatch on +32-bit builds. + +* Modules/indexeddb/server/UniqueIDBDatabase.cpp: +(WebCore::IDBServer::estimateSize): + 2019-10-07 Ross Kirsling Unreviewed WinCairo build fix for r250786. Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (250797 => 250798) --- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2019-10-07 22:12:16 UTC (rev 250797) +++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2019-10-07 22:14:27 UTC (rev 250798) @@ -91,7 +91,7 @@ static inline uint64_t estimateSize(const IDBKeyPath& keyPath) { return WTF::switchOn(keyPath, [](const String& path) { -return path.sizeInBytes(); +return static_cast(path.sizeInBytes()); }, [](const Vector& paths) { uint64_t size = 0; for (auto path : paths) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [250745] trunk/Source/WebKit
Title: [250745] trunk/Source/WebKit Revision 250745 Author krol...@apple.com Date 2019-10-04 14:17:22 -0700 (Fri, 04 Oct 2019) Log Message Fix determination of the top-level resource https://bugs.webkit.org/show_bug.cgi?id=202491 Reviewed by Youenn Fablet. When loading the resources associated with a page, the Networking process needs to know the main resource for the main frame. It uses this information to keep track of page loads and the resources that are loaded in those pages. By keeping track of this information, WebKit can track and report difficult (slow or incomplete) resource loads and their impact on the overall page. The initial determination of the top resource only looked at whether the resource was the "main" resource of a frame or not. However, this determination was insufficient, and would confuse the tracking mechanism when sub-frames also had main frames. Therefore, augment the test by also looking to see if the hosting frame is the main frame. * NetworkProcess/NetworkConnectionToWebProcess.cpp: (WebKit::NetworkConnectionToWebProcess::startTrackingResourceLoad): * NetworkProcess/NetworkConnectionToWebProcess.h: * NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::start): Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp Diff Modified: trunk/Source/WebKit/ChangeLog (250744 => 250745) --- trunk/Source/WebKit/ChangeLog 2019-10-04 20:58:32 UTC (rev 250744) +++ trunk/Source/WebKit/ChangeLog 2019-10-04 21:17:22 UTC (rev 250745) @@ -1,3 +1,30 @@ +2019-10-04 Keith Rollin + +Fix determination of the top-level resource +https://bugs.webkit.org/show_bug.cgi?id=202491 + + +Reviewed by Youenn Fablet. + +When loading the resources associated with a page, the Networking +process needs to know the main resource for the main frame. It uses +this information to keep track of page loads and the resources that +are loaded in those pages. By keeping track of this information, +WebKit can track and report difficult (slow or incomplete) resource +loads and their impact on the overall page. + +The initial determination of the top resource only looked at whether +the resource was the "main" resource of a frame or not. However, this +determination was insufficient, and would confuse the tracking +mechanism when sub-frames also had main frames. Therefore, augment the +test by also looking to see if the hosting frame is the main frame. + +* NetworkProcess/NetworkConnectionToWebProcess.cpp: +(WebKit::NetworkConnectionToWebProcess::startTrackingResourceLoad): +* NetworkProcess/NetworkConnectionToWebProcess.h: +* NetworkProcess/NetworkResourceLoader.cpp: +(WebKit::NetworkResourceLoader::start): + 2019-10-04 Ross Kirsling Unreviewed WinCairo build fix for r250717. Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (250744 => 250745) --- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2019-10-04 20:58:32 UTC (rev 250744) +++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2019-10-04 21:17:22 UTC (rev 250745) @@ -761,7 +761,7 @@ SecurityPolicy::resetOriginAccessWhitelists(); } -Optional NetworkConnectionToWebProcess::startTrackingResourceLoad(PageIdentifier pageID, ResourceLoadIdentifier resourceID, bool isMainResource) +Optional NetworkConnectionToWebProcess::startTrackingResourceLoad(PageIdentifier pageID, ResourceLoadIdentifier resourceID, bool isTopResource) { if (m_sessionID.isEphemeral()) return WTF::nullopt; @@ -770,7 +770,7 @@ // new one if this is the main resource. size_t rootActivityIndex; -if (isMainResource) { +if (isTopResource) { // If we're loading a page from the top, make sure any tracking of // previous activity for this page is stopped. Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h (250744 => 250745) --- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2019-10-04 20:58:32 UTC (rev 250744) +++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2019-10-04 21:17:22 UTC (rev 250745) @@ -144,7 +144,7 @@ m_networkLoadInformationByID.remove(identifier); } -Optional startTrackingResourceLoad(WebCore::PageIdentifier, ResourceLoadIdentifier resourceID, bool isMainResource); +Optional startTrackingResourceLoad(WebCore::PageIdentifier, ResourceLoadIdentifier resourceID, bool isTopResource); void stopTrackingResourceLoad(ResourceLoadIdentifier resourceID, NetworkActivityTracker::CompletionCode); Vector> resolveBlobReferences(const NetworkResourceLoadParameters&);
[webkit-changes] [250698] trunk/Source/WTF
Title: [250698] trunk/Source/WTF Revision 250698 Author krol...@apple.com Date 2019-10-03 20:49:21 -0700 (Thu, 03 Oct 2019) Log Message Remove some support for < iOS 13 https://bugs.webkit.org/show_bug.cgi?id=202549 Reviewed by Alex Christensen. Remove some support for iOS versions less than 13.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 13. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. This removal is part of a series of patches effecting the removal of dead code for old versions of iOS. This particular pass involves changes in which Michael Saboff was involved. These changes are isolated from other similar changes in order to facilitate the reviewing process. * wtf/spi/darwin/ProcessMemoryFootprint.h: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/spi/darwin/ProcessMemoryFootprint.h Diff Modified: trunk/Source/WTF/ChangeLog (250697 => 250698) --- trunk/Source/WTF/ChangeLog 2019-10-04 03:48:11 UTC (rev 250697) +++ trunk/Source/WTF/ChangeLog 2019-10-04 03:49:21 UTC (rev 250698) @@ -1,3 +1,27 @@ +2019-10-03 Keith Rollin + +Remove some support for < iOS 13 +https://bugs.webkit.org/show_bug.cgi?id=202549 + + +Reviewed by Alex Christensen. + +Remove some support for iOS versions less than 13.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 13. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. + +This removal is part of a series of patches effecting the removal of +dead code for old versions of iOS. This particular pass involves +changes in which Michael Saboff was involved. These changes are +isolated from other similar changes in order to facilitate the +reviewing process. + +* wtf/spi/darwin/ProcessMemoryFootprint.h: + 2019-10-03 Per Arne Vollan REGRESSION(249649): Unable to open local files in MiniBrowser on macOS Modified: trunk/Source/WTF/wtf/spi/darwin/ProcessMemoryFootprint.h (250697 => 250698) --- trunk/Source/WTF/wtf/spi/darwin/ProcessMemoryFootprint.h 2019-10-04 03:48:11 UTC (rev 250697) +++ trunk/Source/WTF/wtf/spi/darwin/ProcessMemoryFootprint.h 2019-10-04 03:49:21 UTC (rev 250698) @@ -32,7 +32,7 @@ #if RUSAGE_INFO_CURRENT >= 4 #define HAS_MAX_FOOTPRINT #if defined(RLIMIT_FOOTPRINT_INTERVAL) && __has_include() \ - && ((PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 12) \ + && (PLATFORM(IOS_FAMILY) \ || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400)) #define HAS_RESET_FOOTPRINT_INTERVAL #define MAX_FOOTPRINT_FIELD ri_interval_max_phys_footprint ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [250614] trunk/Source/WebKit
Title: [250614] trunk/Source/WebKit Revision 250614 Author krol...@apple.com Date 2019-10-02 10:43:01 -0700 (Wed, 02 Oct 2019) Log Message Properly mark canceled resources in NetworkActivityTracker https://bugs.webkit.org/show_bug.cgi?id=202440 Reviewed by Brent Fulgham. The nw_activity facility tracking resource loads did not originally have support for reporting resources that were canceled. It now has that support (since late MacOS 14-aligned SDKs), so add support for it in NetworkActivityTracker and use it in places where we were previously reporting the status of canceled resources as "None". * NetworkProcess/NetworkActivityTracker.h: * NetworkProcess/NetworkConnectionToWebProcess.cpp: (WebKit::NetworkConnectionToWebProcess::stopAllNetworkActivityTracking): (WebKit::NetworkConnectionToWebProcess::stopAllNetworkActivityTrackingForPage): * NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::cleanup): * NetworkProcess/cocoa/NetworkActivityTrackerCocoa.mm: (WebKit::NetworkActivityTracker::complete): Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/NetworkProcess/NetworkActivityTracker.h trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp trunk/Source/WebKit/NetworkProcess/cocoa/NetworkActivityTrackerCocoa.mm Diff Modified: trunk/Source/WebKit/ChangeLog (250613 => 250614) --- trunk/Source/WebKit/ChangeLog 2019-10-02 17:31:08 UTC (rev 250613) +++ trunk/Source/WebKit/ChangeLog 2019-10-02 17:43:01 UTC (rev 250614) @@ -1,3 +1,26 @@ +2019-10-02 Keith Rollin + +Properly mark canceled resources in NetworkActivityTracker +https://bugs.webkit.org/show_bug.cgi?id=202440 + + +Reviewed by Brent Fulgham. + +The nw_activity facility tracking resource loads did not originally +have support for reporting resources that were canceled. It now has +that support (since late MacOS 14-aligned SDKs), so add support for it +in NetworkActivityTracker and use it in places where we were +previously reporting the status of canceled resources as "None". + +* NetworkProcess/NetworkActivityTracker.h: +* NetworkProcess/NetworkConnectionToWebProcess.cpp: +(WebKit::NetworkConnectionToWebProcess::stopAllNetworkActivityTracking): +(WebKit::NetworkConnectionToWebProcess::stopAllNetworkActivityTrackingForPage): +* NetworkProcess/NetworkResourceLoader.cpp: +(WebKit::NetworkResourceLoader::cleanup): +* NetworkProcess/cocoa/NetworkActivityTrackerCocoa.mm: +(WebKit::NetworkActivityTracker::complete): + 2019-10-02 Zan Dobersek Unreviewed build fix for non-Mac ports after r250600. Modified: trunk/Source/WebKit/NetworkProcess/NetworkActivityTracker.h (250613 => 250614) --- trunk/Source/WebKit/NetworkProcess/NetworkActivityTracker.h 2019-10-02 17:31:08 UTC (rev 250613) +++ trunk/Source/WebKit/NetworkProcess/NetworkActivityTracker.h 2019-10-02 17:43:01 UTC (rev 250614) @@ -62,6 +62,7 @@ None, Success, Failure, +Cancel, }; NetworkActivityTracker() = default; Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (250613 => 250614) --- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2019-10-02 17:31:08 UTC (rev 250613) +++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2019-10-02 17:43:01 UTC (rev 250614) @@ -825,7 +825,7 @@ void NetworkConnectionToWebProcess::stopAllNetworkActivityTracking() { for (auto& activityTracker : m_networkActivityTrackers) -activityTracker.networkActivity.complete(NetworkActivityTracker::CompletionCode::None); +activityTracker.networkActivity.complete(NetworkActivityTracker::CompletionCode::Cancel); m_networkActivityTrackers.clear(); } @@ -834,7 +834,7 @@ { for (auto& activityTracker : m_networkActivityTrackers) { if (activityTracker.pageID == pageID) -activityTracker.networkActivity.complete(NetworkActivityTracker::CompletionCode::None); +activityTracker.networkActivity.complete(NetworkActivityTracker::CompletionCode::Cancel); } m_networkActivityTrackers.removeAllMatching([&](const auto& activityTracker) { Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (250613 => 250614) --- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2019-10-02 17:31:08 UTC (rev 250613) +++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2019-10-02 17:43:01 UTC (rev 250614) @@ -323,11 +323,24 @@ { ASSERT(RunLoop::isMain()); -m_connection->stopTrackingResourceLoad(m_parameters.identifier, -result == LoadResult::Success ? NetworkActivityTracker::CompletionCode::Success : -result == LoadResult::Failure ? NetworkActivityTracker::CompletionCode::Failure : -
[webkit-changes] [250610] trunk/Source/WebCore
Title: [250610] trunk/Source/WebCore Revision 250610 Author krol...@apple.com Date 2019-10-02 09:34:04 -0700 (Wed, 02 Oct 2019) Log Message Unreviewed build fix after r250595. macCatalyst appears to have triggered the the problem where the build can sometimes fail if the unified sources mechanism doesn't group together the right set of files. * css/typedom/TypedOMCSSImageValue.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.h Diff Modified: trunk/Source/WebCore/ChangeLog (250609 => 250610) --- trunk/Source/WebCore/ChangeLog 2019-10-02 16:26:48 UTC (rev 250609) +++ trunk/Source/WebCore/ChangeLog 2019-10-02 16:34:04 UTC (rev 250610) @@ -1,3 +1,13 @@ +2019-10-02 Keith Rollin + +Unreviewed build fix after r250595. + +macCatalyst appears to have triggered the the problem where the build +can sometimes fail if the unified sources mechanism doesn't group +together the right set of files. + +* css/typedom/TypedOMCSSImageValue.h: + 2019-10-02 Truitt Savell Unreviewed, rolling out r250603. Modified: trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.h (250609 => 250610) --- trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.h 2019-10-02 16:26:48 UTC (rev 250609) +++ trunk/Source/WebCore/css/typedom/TypedOMCSSImageValue.h 2019-10-02 16:34:04 UTC (rev 250610) @@ -28,6 +28,7 @@ #if ENABLE(CSS_TYPED_OM) #include "CSSImageValue.h" +#include "Document.h" #include "TypedOMCSSStyleValue.h" #include #include ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [250566] trunk/Source
Title: [250566] trunk/Source Revision 250566 Author krol...@apple.com Date 2019-10-01 11:12:49 -0700 (Tue, 01 Oct 2019) Log Message Remove some support for < iOS 13 https://bugs.webkit.org/show_bug.cgi?id=202386 Reviewed by Eric Carlson. Remove some support for iOS versions less than 13.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 13. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. This removal is part of a series of patches effecting the removal of dead code for old versions of iOS. This particular pass involves changes in which Jer Noble was involved. These changes are isolated from other similar changes in order to facilitate the reviewing process. Source/WebCore: No new tests -- no new or changed functionality. * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: (WebCore::MediaPlayerPrivateAVFoundationObjC::seekableTimeRangesLastModifiedTime const): (WebCore::MediaPlayerPrivateAVFoundationObjC::liveUpdateInterval const): Source/WebCore/PAL: * pal/spi/cocoa/AVKitSPI.h: * pal/spi/mac/AVFoundationSPI.h: Source/WTF: * wtf/Platform.h: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Platform.h trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm Diff Modified: trunk/Source/WTF/ChangeLog (250565 => 250566) --- trunk/Source/WTF/ChangeLog 2019-10-01 17:36:39 UTC (rev 250565) +++ trunk/Source/WTF/ChangeLog 2019-10-01 18:12:49 UTC (rev 250566) @@ -1,4 +1,28 @@ +2019-10-01 Keith Rollin +Remove some support for < iOS 13 +https://bugs.webkit.org/show_bug.cgi?id=202386 + + +Reviewed by Eric Carlson. + +Remove some support for iOS versions less than 13.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 13. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. + +This removal is part of a series of patches effecting the removal of +dead code for old versions of iOS. This particular pass involves +changes in which Jer Noble was involved. These changes are isolated +from other similar changes in order to facilitate the reviewing +process. + +* wtf/Platform.h: + + 2019-09-30 Alex Christensen Resurrect Mac CMake build Modified: trunk/Source/WTF/wtf/Platform.h (250565 => 250566) --- trunk/Source/WTF/wtf/Platform.h 2019-10-01 17:36:39 UTC (rev 250565) +++ trunk/Source/WTF/wtf/Platform.h 2019-10-01 18:12:49 UTC (rev 250566) @@ -1558,8 +1558,11 @@ #define HAVE_HOVER_GESTURE_RECOGNIZER 1 #endif -#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 13) || PLATFORM(WATCHOS) || PLATFORM(APPLETV) +#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || PLATFORM(IOS_FAMILY) #define HAVE_ALLOWS_SENSITIVE_LOGGING 1 +#endif + +#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || PLATFORM(IOS_FAMILY) #define HAVE_FAIRPLAYSTREAMING_CENC_INITDATA 1 #endif Modified: trunk/Source/WebCore/ChangeLog (250565 => 250566) --- trunk/Source/WebCore/ChangeLog 2019-10-01 17:36:39 UTC (rev 250565) +++ trunk/Source/WebCore/ChangeLog 2019-10-01 18:12:49 UTC (rev 250566) @@ -1,3 +1,31 @@ +2019-10-01 Keith Rollin + +Remove some support for < iOS 13 +https://bugs.webkit.org/show_bug.cgi?id=202386 + + +Reviewed by Eric Carlson. + +Remove some support for iOS versions less than 13.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 13. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. + +This removal is part of a series of patches effecting the removal of +dead code for old versions of iOS. This particular pass involves +changes in which Jer Noble was involved. These changes are isolated +from other similar changes in order to facilitate the reviewing +process. + +No new tests -- no new or changed functionality. + +* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: +
[webkit-changes] [250522] trunk/Source/WebCore
Title: [250522] trunk/Source/WebCore Revision 250522 Author krol...@apple.com Date 2019-09-30 12:10:57 -0700 (Mon, 30 Sep 2019) Log Message Coalesce or remove PLATFORM(MAC) || PLATFORM(IOS_FAMILY) https://bugs.webkit.org/show_bug.cgi?id=202119 Unreviewed, address post landing review comments for r248533 from Darin Adler. Source/WebCore: No new tests -- no new or changed functionality. * Modules/applepay/cocoa/PaymentContactCocoa.mm: (WebCore::convert): (WebCore::subLocality): Deleted. (WebCore::setSubLocality): Deleted. (WebCore::subAdministrativeArea): Deleted. (WebCore::setSubAdministrativeArea): Deleted. Source/WebCore/PAL: * pal/spi/cf/CFNetworkSPI.h: * pal/spi/cocoa/NEFilterSourceSPI.h: * pal/spi/mac/AVFoundationSPI.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h trunk/Source/WebCore/PAL/pal/spi/cocoa/NEFilterSourceSPI.h trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h Diff Modified: trunk/Source/WebCore/ChangeLog (250521 => 250522) --- trunk/Source/WebCore/ChangeLog 2019-09-30 18:49:19 UTC (rev 250521) +++ trunk/Source/WebCore/ChangeLog 2019-09-30 19:10:57 UTC (rev 250522) @@ -1,3 +1,21 @@ +2019-09-27 Keith Rollin + +Coalesce or remove PLATFORM(MAC) || PLATFORM(IOS_FAMILY) +https://bugs.webkit.org/show_bug.cgi?id=202119 + + +Unreviewed, address post landing review comments for r248533 from +Darin Adler. + +No new tests -- no new or changed functionality. + +* Modules/applepay/cocoa/PaymentContactCocoa.mm: +(WebCore::convert): +(WebCore::subLocality): Deleted. +(WebCore::setSubLocality): Deleted. +(WebCore::subAdministrativeArea): Deleted. +(WebCore::setSubAdministrativeArea): Deleted. + 2019-09-30 Antti Koivisto RenderLineBreak should use LineLayoutTraversal Modified: trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm (250521 => 250522) --- trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm 2019-09-30 18:49:19 UTC (rev 250521) +++ trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm 2019-09-30 19:10:57 UTC (rev 250522) @@ -40,26 +40,6 @@ namespace WebCore { -static NSString *subLocality(CNPostalAddress *address) -{ -return address.subLocality; -} - -static void setSubLocality(CNMutablePostalAddress *address, NSString *subLocality) -{ -address.subLocality = subLocality; -} - -static NSString *subAdministrativeArea(CNPostalAddress *address) -{ -return address.subAdministrativeArea; -} - -static void setSubAdministrativeArea(CNMutablePostalAddress *address, NSString *subAdministrativeArea) -{ -address.subAdministrativeArea = subAdministrativeArea; -} - static RetainPtr convert(unsigned version, const ApplePayPaymentContact& contact) { auto result = adoptNS([PAL::allocPKContactInstance() init]); @@ -113,13 +93,13 @@ [address setStreet:builder.toString()]; if (!contact.subLocality.isEmpty()) -setSubLocality(address.get(), contact.subLocality); +[address setSubLocality:contact.subLocality]; if (!contact.locality.isEmpty()) [address setCity:contact.locality]; if (!contact.postalCode.isEmpty()) [address setPostalCode:contact.postalCode]; if (!contact.subAdministrativeArea.isEmpty()) -setSubAdministrativeArea(address.get(), contact.subAdministrativeArea); +[address setSubAdministrativeArea:contact.subAdministrativeArea]; if (!contact.administrativeArea.isEmpty()) [address setState:contact.administrativeArea]; if (!contact.country.isEmpty()) @@ -161,10 +141,10 @@ Vector addressLines = String(postalAddress.street).split('\n'); result.addressLines = WTFMove(addressLines); } -result.subLocality = subLocality(postalAddress); +result.subLocality = postalAddress.subLocality; result.locality = postalAddress.city; result.postalCode = postalAddress.postalCode; -result.subAdministrativeArea = subAdministrativeArea(postalAddress); +result.subAdministrativeArea = postalAddress.subAdministrativeArea; result.administrativeArea = postalAddress.state; result.country = postalAddress.country; result.countryCode = postalAddress.ISOCountryCode; Modified: trunk/Source/WebCore/PAL/ChangeLog (250521 => 250522) --- trunk/Source/WebCore/PAL/ChangeLog 2019-09-30 18:49:19 UTC (rev 250521) +++ trunk/Source/WebCore/PAL/ChangeLog 2019-09-30 19:10:57 UTC (rev 250522) @@ -1,3 +1,16 @@ +2019-09-27 Keith Rollin + +Coalesce or remove PLATFORM(MAC) || PLATFORM(IOS_FAMILY) +https://bugs.webkit.org/show_bug.cgi?id=202119 + + +Unreviewed, address post landing review comments for r248533 from +Darin Adler. + +*
[webkit-changes] [250497] trunk/Source/WTF
Title: [250497] trunk/Source/WTF Revision 250497 Author krol...@apple.com Date 2019-09-29 19:21:48 -0700 (Sun, 29 Sep 2019) Log Message Address static analysis warning in ParkingLot.cpp: Access to field 'size' results in a dereference of a null pointer https://bugs.webkit.org/show_bug.cgi?id=202154 Reviewed by Brent Fulgham. Static analysis reports the following: .../OpenSource/Source/WTF/wtf/ParkingLot.cpp:376:30: warning: Access to field 'size' results in a dereference of a null pointer (loaded from variable 'oldHashtable') RELEASE_ASSERT(newSize > oldHashtable->size); ^~ This warning arises because earlier code checks to see if oldHashtable is NULL, leading the static analyzer to think that it *could* be NULL. However, even earlier code actually ensures that oldHashtable will not be NULL. Address this by removing the NULL check, and back it up with an ASSERT to ensure that it's not NULL. * wtf/ParkingLot.cpp: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/ParkingLot.cpp Diff Modified: trunk/Source/WTF/ChangeLog (250496 => 250497) --- trunk/Source/WTF/ChangeLog 2019-09-30 01:56:43 UTC (rev 250496) +++ trunk/Source/WTF/ChangeLog 2019-09-30 02:21:48 UTC (rev 250497) @@ -1,3 +1,25 @@ +2019-09-29 Keith Rollin + +Address static analysis warning in ParkingLot.cpp: Access to field 'size' results in a dereference of a null pointer +https://bugs.webkit.org/show_bug.cgi?id=202154 + + +Reviewed by Brent Fulgham. + +Static analysis reports the following: + +.../OpenSource/Source/WTF/wtf/ParkingLot.cpp:376:30: warning: Access to field 'size' results in a dereference of a null pointer (loaded from variable 'oldHashtable') +RELEASE_ASSERT(newSize > oldHashtable->size); + ^~ + +This warning arises because earlier code checks to see if oldHashtable +is NULL, leading the static analyzer to think that it *could* be NULL. +However, even earlier code actually ensures that oldHashtable will not +be NULL. Address this by removing the NULL check, and back it up with +an ASSERT to ensure that it's not NULL. + +* wtf/ParkingLot.cpp: + 2019-09-26 Alexey Shvayka toExponential, toFixed, and toPrecision should allow arguments up to 100 Modified: trunk/Source/WTF/wtf/ParkingLot.cpp (250496 => 250497) --- trunk/Source/WTF/wtf/ParkingLot.cpp 2019-09-30 01:56:43 UTC (rev 250496) +++ trunk/Source/WTF/wtf/ParkingLot.cpp 2019-09-30 02:21:48 UTC (rev 250497) @@ -355,7 +355,8 @@ // Check again, since the hashtable could have rehashed while we were locking it. Also, // lockHashtable() creates an initial hashtable for us. oldHashtable = hashtable.load(); -if (oldHashtable && static_cast(oldHashtable->size) / static_cast(numThreads) >= maxLoadFactor) { +RELEASE_ASSERT(oldHashtable); +if (static_cast(oldHashtable->size) / static_cast(numThreads) >= maxLoadFactor) { if (verbose) dataLog(toString(Thread::current(), ": after locking, no need to rehash because ", oldHashtable->size, " / ", numThreads, " >= ", maxLoadFactor, "\n")); unlockHashtable(bucketsToUnlock); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [250380] trunk/Source/WTF
Title: [250380] trunk/Source/WTF Revision 250380 Author krol...@apple.com Date 2019-09-25 23:41:14 -0700 (Wed, 25 Sep 2019) Log Message Address static analysis warning in UTextProviderLatin1.cpp: Array access results in a null pointer dereference https://bugs.webkit.org/show_bug.cgi?id=202155 Reviewed by Geoffrey Garen. Xcode's static analysis reports: .../OpenSource/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:185:22: warning: Array access (from variable 'dest') results in a null pointer dereference dest[length] = 0; ^ This error is due to an earlier "if" statement that caused the static analyzer to infer that "dest" could be NULL. It turns out that that previous check was in error, in that it tested for "!dest" when it should have tested for "dest". So this patch fixes that. Even with that error fixed, the static analyzer will still infer that "dest" could be NULL at the point shown above. Therefore, add a "dest" test just before the assignment. * wtf/text/icu/UTextProviderLatin1.cpp: (WTF::uTextLatin1Extract): Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp Diff Modified: trunk/Source/WTF/ChangeLog (250379 => 250380) --- trunk/Source/WTF/ChangeLog 2019-09-26 05:32:00 UTC (rev 250379) +++ trunk/Source/WTF/ChangeLog 2019-09-26 06:41:14 UTC (rev 250380) @@ -1,3 +1,29 @@ +2019-09-25 Keith Rollin + +Address static analysis warning in UTextProviderLatin1.cpp: Array access results in a null pointer dereference +https://bugs.webkit.org/show_bug.cgi?id=202155 + + +Reviewed by Geoffrey Garen. + +Xcode's static analysis reports: + +.../OpenSource/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:185:22: warning: Array access (from variable 'dest') results in a null pointer dereference +dest[length] = 0; + ^ + +This error is due to an earlier "if" statement that caused the static +analyzer to infer that "dest" could be NULL. It turns out that that +previous check was in error, in that it tested for "!dest" when it +should have tested for "dest". So this patch fixes that. + +Even with that error fixed, the static analyzer will still infer that +"dest" could be NULL at the point shown above. Therefore, add a "dest" +test just before the assignment. + +* wtf/text/icu/UTextProviderLatin1.cpp: +(WTF::uTextLatin1Extract): + 2019-09-25 Wenson Hsieh [iPadOS] [DataActivation] Focus moves away after focusing input fields on www.att.com Modified: trunk/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp (250379 => 250380) --- trunk/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp 2019-09-26 05:32:00 UTC (rev 250379) +++ trunk/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp 2019-09-26 06:41:14 UTC (rev 250380) @@ -173,7 +173,7 @@ if (!length) return 0; -if (destCapacity > 0 && !dest) { +if (dest) { int32_t trimmedLength = static_cast(length); if (trimmedLength > destCapacity) trimmedLength = destCapacity; @@ -182,7 +182,8 @@ } if (length < destCapacity) { -dest[length] = 0; +if (dest) +dest[length] = 0; if (*status == U_STRING_NOT_TERMINATED_WARNING) *status = U_ZERO_ERROR; } else if (length == destCapacity) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [250325] trunk/Source/bmalloc
Title: [250325] trunk/Source/bmalloc Revision 250325 Author krol...@apple.com Date 2019-09-24 17:13:59 -0700 (Tue, 24 Sep 2019) Log Message Address static analysis warning in Allocator.cpp: Null pointer argument in call to memory copy function https://bugs.webkit.org/show_bug.cgi?id=202152 Reviewed by Geoffrey Garen. Xcode's static analysis facility flags the following: .../OpenSource/Source/bmalloc/bmalloc/Allocator.cpp:98:5: warning: Null pointer argument in call to memory copy function memcpy(result, object, copySize); ^~~~ https://en.cppreference.com/w/cpp/string/byte/memcpy explains that this is undefined behavior: "If either dest or src is a null pointer, the behavior is undefined, even if count is zero." I suppose that passing in a null source pointer could be bad if the implementation fetched the first source byte to copy before actually checking the number of bytes to copy. So far, it doesn’t seem to be an issue, but we should clean this up. Simply adding "if (result && object)" before the memcpy will add tests and branches in the hot path of this function and so might not be the best solution. Instead, straighten out the code a little bit by putting an early check and return on "object". This also allows us to remove some intermediate code. * bmalloc/Allocator.cpp: (bmalloc::Allocator::reallocateImpl): Modified Paths trunk/Source/bmalloc/ChangeLog trunk/Source/bmalloc/bmalloc/Allocator.cpp Diff Modified: trunk/Source/bmalloc/ChangeLog (250324 => 250325) --- trunk/Source/bmalloc/ChangeLog 2019-09-24 23:54:48 UTC (rev 250324) +++ trunk/Source/bmalloc/ChangeLog 2019-09-25 00:13:59 UTC (rev 250325) @@ -1,3 +1,37 @@ +2019-09-24 Keith Rollin + +Address static analysis warning in Allocator.cpp: Null pointer argument in call to memory copy function +https://bugs.webkit.org/show_bug.cgi?id=202152 + + +Reviewed by Geoffrey Garen. + +Xcode's static analysis facility flags the following: + +.../OpenSource/Source/bmalloc/bmalloc/Allocator.cpp:98:5: warning: Null pointer argument in call to memory copy function +memcpy(result, object, copySize); +^~~~ + +https://en.cppreference.com/w/cpp/string/byte/memcpy explains that +this is undefined behavior: + +"If either dest or src is a null pointer, the behavior is + undefined, even if count is zero." + +I suppose that passing in a null source pointer could be bad if the +implementation fetched the first source byte to copy before actually +checking the number of bytes to copy. So far, it doesn’t seem to be an +issue, but we should clean this up. + +Simply adding "if (result && object)" before the memcpy will add tests +and branches in the hot path of this function and so might not be the +best solution. Instead, straighten out the code a little bit by +putting an early check and return on "object". This also allows us to +remove some intermediate code. + +* bmalloc/Allocator.cpp: +(bmalloc::Allocator::reallocateImpl): + 2019-09-17 Mark Lam Use constexpr instead of const in symbol definitions that are obviously constexpr. Modified: trunk/Source/bmalloc/bmalloc/Allocator.cpp (250324 => 250325) --- trunk/Source/bmalloc/bmalloc/Allocator.cpp 2019-09-24 23:54:48 UTC (rev 250324) +++ trunk/Source/bmalloc/bmalloc/Allocator.cpp 2019-09-25 00:13:59 UTC (rev 250325) @@ -65,13 +65,12 @@ void* Allocator::reallocateImpl(void* object, size_t newSize, FailureAction action) { +if (!object) +return allocateImpl(newSize, action); + size_t oldSize = 0; switch (objectType(m_heap, object)) { case ObjectType::Small: { -BASSERT(objectType(m_heap, nullptr) == ObjectType::Small); -if (!object) -break; - size_t sizeClass = Object(object).page()->sizeClass(); oldSize = objectSize(sizeClass); break; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [250310] trunk/Source/WebCore/PAL
Title: [250310] trunk/Source/WebCore/PAL Revision 250310 Author krol...@apple.com Date 2019-09-24 11:42:52 -0700 (Tue, 24 Sep 2019) Log Message Remove some support for < iOS 13 https://bugs.webkit.org/show_bug.cgi?id=201969 Reviewed by Jonathan Bedard. Remove some support for iOS versions less than 13.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 13. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. This removal is part of a series of patches effecting the removal of dead code for old versions of iOS. This particular pass involves changes in which Jonathan Bedard was involved. These changes are isolated from other similar changes in order to facilitate the reviewing process. * pal/spi/cocoa/CoreTextSPI.h: * pal/spi/cocoa/QuartzCoreSPI.h: * pal/spi/ios/UIKitSPI.h: Modified Paths trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h trunk/Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h Diff Modified: trunk/Source/WebCore/PAL/ChangeLog (250309 => 250310) --- trunk/Source/WebCore/PAL/ChangeLog 2019-09-24 18:03:30 UTC (rev 250309) +++ trunk/Source/WebCore/PAL/ChangeLog 2019-09-24 18:42:52 UTC (rev 250310) @@ -1,5 +1,31 @@ 2019-09-24 Keith Rollin +Remove some support for < iOS 13 +https://bugs.webkit.org/show_bug.cgi?id=201969 + + +Reviewed by Jonathan Bedard. + +Remove some support for iOS versions less than 13.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 13. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. + +This removal is part of a series of patches effecting the removal of +dead code for old versions of iOS. This particular pass involves +changes in which Jonathan Bedard was involved. These changes are +isolated from other similar changes in order to facilitate the +reviewing process. + +* pal/spi/cocoa/CoreTextSPI.h: +* pal/spi/cocoa/QuartzCoreSPI.h: +* pal/spi/ios/UIKitSPI.h: + +2019-09-24 Keith Rollin + Coalesce or remove PLATFORM(MAC) || PLATFORM(IOS_FAMILY) https://bugs.webkit.org/show_bug.cgi?id=202119 Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h (250309 => 250310) --- trunk/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h 2019-09-24 18:03:30 UTC (rev 250309) +++ trunk/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h 2019-09-24 18:42:52 UTC (rev 250310) @@ -71,12 +71,8 @@ kCTCompositionLanguageTraditionalChinese, }; -#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED == 12) -extern const CFStringRef kCTTypesetterOptionAllowUnboundedLayout; #endif -#endif - WTF_EXTERN_C_BEGIN typedef const UniChar* (*CTUniCharProviderCallback)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* refCon); Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h (250309 => 250310) --- trunk/Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h 2019-09-24 18:03:30 UTC (rev 250309) +++ trunk/Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h 2019-09-24 18:42:52 UTC (rev 250310) @@ -140,11 +140,7 @@ @interface CATransaction () + (void)addCommitHandler:(void(^)(void))block forPhase:(CATransactionPhase)phase; - -#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 11 + (CATransactionPhase)currentPhase; -#endif - @end @interface CALayerHost : CALayer Modified: trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h (250309 => 250310) --- trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h 2019-09-24 18:03:30 UTC (rev 250309) +++ trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h 2019-09-24 18:42:52 UTC (rev 250310) @@ -139,11 +139,9 @@ + (UIViewController *)viewControllerForView:(UIView *)view; @end -#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 11 @interface NSURL () @property (nonatomic, copy, setter=_setTitle:) NSString *_title; @end -#endif #endif // USE(APPLE_INTERNAL_SDK) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [250309] trunk
Title: [250309] trunk Revision 250309 Author krol...@apple.com Date 2019-09-24 11:03:30 -0700 (Tue, 24 Sep 2019) Log Message Coalesce or remove PLATFORM(MAC) || PLATFORM(IOS_FAMILY) https://bugs.webkit.org/show_bug.cgi?id=202119 Reviewed by Alex Christensen. After refactoring and other code evolution, some platform checks have ended up looking like PLATFORM(MAC) || PLATFORM(IOS_FAMILY) (or vice-versa). These can be converted into the equivalent PLATFORM(COCOA). Where the instance occurs in a Cocoa-only file, the check can be removed altogether (along with any "#else" branches). Source/WebCore: No new tests -- no new or changed functionality. * Modules/applepay/cocoa/PaymentContactCocoa.mm: (WebCore::subLocality): (WebCore::setSubLocality): (WebCore::subAdministrativeArea): (WebCore::setSubAdministrativeArea): * css/parser/CSSPropertyParser.cpp: (WebCore::isAppleLegacyCssValueKeyword): * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::mediaSessionTitle const): * inspector/InspectorFrontendHost.cpp: (WebCore::InspectorFrontendHost::platform): * page/FrameView.cpp: (WebCore::FrameView::updateBackgroundRecursively): * platform/Timer.cpp: * platform/cocoa/NetworkExtensionContentFilter.mm: (WebCore::NetworkExtensionContentFilter::initialize): * platform/graphics/cg/GraphicsContextCG.cpp: (WebCore::displayP3ColorSpaceRef): * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp: * platform/network/cf/SocketStreamHandleImplCFNet.cpp: * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::requiresCompositingForScrollableFrame const): Source/WebCore/PAL: * pal/spi/cf/CFNetworkSPI.h: * pal/spi/cocoa/NEFilterSourceSPI.h: * pal/spi/mac/AVFoundationSPI.h: Source/WebKit: * NetworkProcess/cocoa/NetworkSessionCocoa.mm: (-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]): * WebProcess/WebCoreSupport/WebChromeClient.h: Source/WTF: * wtf/Platform.h: * wtf/text/TextBreakIterator.h: Tools: * DumpRenderTree/AccessibilityTextMarker.h: * DumpRenderTree/AccessibilityUIElement.cpp: (AccessibilityUIElement::setValue): Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Platform.h trunk/Source/WTF/wtf/text/TextBreakIterator.h trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h trunk/Source/WebCore/PAL/pal/spi/cocoa/NEFilterSourceSPI.h trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp trunk/Source/WebCore/html/HTMLMediaElement.cpp trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp trunk/Source/WebCore/page/FrameView.cpp trunk/Source/WebCore/platform/Timer.cpp trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp trunk/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/AccessibilityTextMarker.h trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp Diff Modified: trunk/Source/WTF/ChangeLog (250308 => 250309) --- trunk/Source/WTF/ChangeLog 2019-09-24 17:57:00 UTC (rev 250308) +++ trunk/Source/WTF/ChangeLog 2019-09-24 18:03:30 UTC (rev 250309) @@ -1,3 +1,20 @@ +2019-09-24 Keith Rollin + +Coalesce or remove PLATFORM(MAC) || PLATFORM(IOS_FAMILY) +https://bugs.webkit.org/show_bug.cgi?id=202119 + + +Reviewed by Alex Christensen. + +After refactoring and other code evolution, some platform checks have +ended up looking like PLATFORM(MAC) || PLATFORM(IOS_FAMILY) (or +vice-versa). These can be converted into the equivalent +PLATFORM(COCOA). Where the instance occurs in a Cocoa-only file, the +check can be removed altogether (along with any "#else" branches). + +* wtf/Platform.h: +* wtf/text/TextBreakIterator.h: + 2019-09-21 David Kilzer clang-tidy: Fix unnecessary copy/ref churn of for loop variables in WTF/_javascript_Core Modified: trunk/Source/WTF/wtf/Platform.h (250308 => 250309) --- trunk/Source/WTF/wtf/Platform.h 2019-09-24 17:57:00 UTC (rev 250308) +++ trunk/Source/WTF/wtf/Platform.h 2019-09-24 18:03:30 UTC (rev 250309) @@ -1193,7 +1193,7 @@ #endif #endif -#if PLATFORM(IOS_FAMILY) || PLATFORM(MAC) +#if PLATFORM(COCOA) #define USE_COREMEDIA 1 #define USE_VIDEOTOOLBOX 1 #define HAVE_AVFOUNDATION_VIDEO_OUTPUT 1 @@ -1201,16 +1201,16 @@ #define HAVE_MEDIA_PLAYER 1 #endif -#if PLATFORM(IOS_FAMILY) || PLATFORM(MAC) +#if PLATFORM(COCOA) #define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1 #endif -#if
[webkit-changes] [250247] trunk/Source/WebCore
Title: [250247] trunk/Source/WebCore Revision 250247 Author krol...@apple.com Date 2019-09-23 12:15:37 -0700 (Mon, 23 Sep 2019) Log Message Unreviewed build fix after r250173: tvOS build broken due to unused function. * platform/network/cocoa/CookieCocoa.mm: (WebCore::Cookie::operator NSHTTPCookie * _Nullable const): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/network/cocoa/CookieCocoa.mm Diff Modified: trunk/Source/WebCore/ChangeLog (250246 => 250247) --- trunk/Source/WebCore/ChangeLog 2019-09-23 18:38:35 UTC (rev 250246) +++ trunk/Source/WebCore/ChangeLog 2019-09-23 19:15:37 UTC (rev 250247) @@ -1,3 +1,10 @@ +2019-09-23 Keith Rollin + +Unreviewed build fix after r250173: tvOS build broken due to unused function. + +* platform/network/cocoa/CookieCocoa.mm: +(WebCore::Cookie::operator NSHTTPCookie * _Nullable const): + 2019-09-23 Brent Fulgham Unreviewed WinCairo/FTW Build fix after r250192. Modified: trunk/Source/WebCore/platform/network/cocoa/CookieCocoa.mm (250246 => 250247) --- trunk/Source/WebCore/platform/network/cocoa/CookieCocoa.mm 2019-09-23 18:38:35 UTC (rev 250246) +++ trunk/Source/WebCore/platform/network/cocoa/CookieCocoa.mm 2019-09-23 19:15:37 UTC (rev 250247) @@ -183,7 +183,7 @@ if (httpOnly) [properties setObject:@YES forKey:@"HttpOnly"]; -#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 12) +#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS_FAMILY) if (auto* sameSitePolicy = nsSameSitePolicy(sameSite)) [properties setObject:sameSitePolicy forKey:@"SameSite"]; #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [250173] trunk/Source/WebCore
Title: [250173] trunk/Source/WebCore Revision 250173 Author krol...@apple.com Date 2019-09-20 17:36:06 -0700 (Fri, 20 Sep 2019) Log Message Remove dead code for a specific macOS and iOS SDK https://bugs.webkit.org/show_bug.cgi?id=202054 Reviewed by Zalan Bujtas. ComplexTextController::collectComplexTextRunsForCharacters in ComplexTextControllerCoreText.mm has some code for compatibility with specifically macOS 10.14.0 and iOS 12.0 (see Bug 186571). We don't build for these targets any more (when we build for macOS 10.14, it's for a later minor revision), so this code can be removed. No new tests -- no new or changed functionality. * platform/graphics/mac/ComplexTextControllerCoreText.mm: (WebCore::ComplexTextController::collectComplexTextRunsForCharacters): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm Diff Modified: trunk/Source/WebCore/ChangeLog (250172 => 250173) --- trunk/Source/WebCore/ChangeLog 2019-09-21 00:29:13 UTC (rev 250172) +++ trunk/Source/WebCore/ChangeLog 2019-09-21 00:36:06 UTC (rev 250173) @@ -1,3 +1,22 @@ +2019-09-20 Keith Rollin + +Remove dead code for a specific macOS and iOS SDK +https://bugs.webkit.org/show_bug.cgi?id=202054 + + +Reviewed by Zalan Bujtas. + +ComplexTextController::collectComplexTextRunsForCharacters in +ComplexTextControllerCoreText.mm has some code for compatibility with +specifically macOS 10.14.0 and iOS 12.0 (see Bug 186571). We don't +build for these targets any more (when we build for macOS 10.14, it's +for a later minor revision), so this code can be removed. + +No new tests -- no new or changed functionality. + +* platform/graphics/mac/ComplexTextControllerCoreText.mm: +(WebCore::ComplexTextController::collectComplexTextRunsForCharacters): + 2019-09-20 Alex Christensen Remove unnecessary abstractions around WebsiteDataStore Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (250172 => 250173) --- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2019-09-21 00:29:13 UTC (rev 250172) +++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2019-09-21 00:36:06 UTC (rev 250173) @@ -139,15 +139,9 @@ if (!m_mayUseNaturalWritingDirection || m_run.directionalOverride()) { const short ltrForcedEmbeddingLevelValue = 0; const short rtlForcedEmbeddingLevelValue = 1; -#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED == 12) -static const void* optionKeys[] = { kCTTypesetterOptionForcedEmbeddingLevel, kCTTypesetterOptionAllowUnboundedLayout }; -static const void* ltrOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, ), kCFBooleanTrue }; -static const void* rtlOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, ), kCFBooleanTrue }; -#else static const void* optionKeys[] = { kCTTypesetterOptionForcedEmbeddingLevel }; static const void* ltrOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, ) }; static const void* rtlOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, ) }; -#endif static CFDictionaryRef ltrTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, ltrOptionValues, WTF_ARRAY_LENGTH(optionKeys), , ); static CFDictionaryRef rtlTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, rtlOptionValues, WTF_ARRAY_LENGTH(optionKeys), , ); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [250171] trunk/Source
Title: [250171] trunk/Source Revision 250171 Author krol...@apple.com Date 2019-09-20 17:17:27 -0700 (Fri, 20 Sep 2019) Log Message Remove some support for < iOS 13 https://bugs.webkit.org/show_bug.cgi?id=202027 Reviewed by Alex Christensen. Remove some support for iOS versions less than 13.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 13. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. After version checks have been removed, there are some cases where the preprocessor conditional looks like "#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)". These can be collapsed into "#if PLATFORM(COCOA)". This additional cleanup will be performed in a subsequent patch. This removal is part of a series of patches effecting the removal of dead code for old versions of iOS. This particular pass involves changes in which Joe Pecoraro was involved. These changes are isolated from other similar changes in order to facilitate the reviewing process. Source/WebCore/PAL: * pal/spi/cf/CFNetworkSPI.h: Source/WebKit: * NetworkProcess/cocoa/NetworkSessionCocoa.mm: (-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]): Modified Paths trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm Diff Modified: trunk/Source/WebCore/PAL/ChangeLog (250170 => 250171) --- trunk/Source/WebCore/PAL/ChangeLog 2019-09-21 00:15:02 UTC (rev 250170) +++ trunk/Source/WebCore/PAL/ChangeLog 2019-09-21 00:17:27 UTC (rev 250171) @@ -1,5 +1,35 @@ 2019-09-20 Keith Rollin +Remove some support for < iOS 13 +https://bugs.webkit.org/show_bug.cgi?id=202027 + + +Reviewed by Alex Christensen. + +Remove some support for iOS versions less than 13.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 13. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. + +After version checks have been removed, there are some cases where the +preprocessor conditional looks like "#if PLATFORM(MAC) || +PLATFORM(IOS_FAMILY)". These can be collapsed into "#if +PLATFORM(COCOA)". This additional cleanup will be performed in a +subsequent patch. + +This removal is part of a series of patches effecting the removal of +dead code for old versions of iOS. This particular pass involves +changes in which Joe Pecoraro was involved. These changes are isolated +from other similar changes in order to facilitate the reviewing +process. + +* pal/spi/cf/CFNetworkSPI.h: + +2019-09-20 Keith Rollin + Remove check of setSourceAppPid selector that's no longer needed https://bugs.webkit.org/show_bug.cgi?id=201971 Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (250170 => 250171) --- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-09-21 00:15:02 UTC (rev 250170) +++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-09-21 00:17:27 UTC (rev 250171) @@ -218,7 +218,7 @@ #endif @end -#if PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 11) +#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY) @interface NSURLSessionTaskTransactionMetrics () @property (copy, readonly) NSString* _remoteAddressAndPort; @property (copy, readonly) NSUUID* _connectionIdentifier; Modified: trunk/Source/WebKit/ChangeLog (250170 => 250171) --- trunk/Source/WebKit/ChangeLog 2019-09-21 00:15:02 UTC (rev 250170) +++ trunk/Source/WebKit/ChangeLog 2019-09-21 00:17:27 UTC (rev 250171) @@ -1,3 +1,34 @@ +2019-09-20 Keith Rollin + +Remove some support for < iOS 13 +https://bugs.webkit.org/show_bug.cgi?id=202027 + + +Reviewed by Alex Christensen. + +Remove some support for iOS versions less than 13.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 13. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. + +After version checks have been removed, there are some cases where the +preprocessor conditional looks like "#if PLATFORM(MAC) || +PLATFORM(IOS_FAMILY)". These can be collapsed into "#if +PLATFORM(COCOA)". This additional cleanup will be performed in a +subsequent patch.
[webkit-changes] [250161] trunk/Source/WebCore
Title: [250161] trunk/Source/WebCore Revision 250161 Author krol...@apple.com Date 2019-09-20 15:58:55 -0700 (Fri, 20 Sep 2019) Log Message Remove check of setSourceAppPid selector that's no longer needed https://bugs.webkit.org/show_bug.cgi?id=201971 Reviewed by Andy Estes. Bug 172152 introduced a check of the NEFilterSource selector setSourceAppPid in order to support OS's that didn't support it. All supported Cocoa platforms now support it, so the check can be removed. Source/WebCore: No new tests -- no new or changed functionality. * platform/cocoa/NetworkExtensionContentFilter.mm: (WebCore::NetworkExtensionContentFilter::initialize): Source/WebCore/PAL: * pal/spi/cocoa/NEFilterSourceSPI.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm Diff Modified: trunk/Source/WebCore/ChangeLog (250160 => 250161) --- trunk/Source/WebCore/ChangeLog 2019-09-20 22:19:55 UTC (rev 250160) +++ trunk/Source/WebCore/ChangeLog 2019-09-20 22:58:55 UTC (rev 250161) @@ -1,5 +1,22 @@ 2019-09-20 Keith Rollin +Remove check of setSourceAppPid selector that's no longer needed +https://bugs.webkit.org/show_bug.cgi?id=201971 + + +Reviewed by Andy Estes. + +Bug 172152 introduced a check of the NEFilterSource selector +setSourceAppPid in order to support OS's that didn't support it. All +supported Cocoa platforms now support it, so the check can be removed. + +No new tests -- no new or changed functionality. + +* platform/cocoa/NetworkExtensionContentFilter.mm: +(WebCore::NetworkExtensionContentFilter::initialize): + +2019-09-20 Keith Rollin + Remove some support for < iOS 13 https://bugs.webkit.org/show_bug.cgi?id=201967 Modified: trunk/Source/WebCore/PAL/ChangeLog (250160 => 250161) --- trunk/Source/WebCore/PAL/ChangeLog 2019-09-20 22:19:55 UTC (rev 250160) +++ trunk/Source/WebCore/PAL/ChangeLog 2019-09-20 22:58:55 UTC (rev 250161) @@ -1,5 +1,19 @@ 2019-09-20 Keith Rollin +Remove check of setSourceAppPid selector that's no longer needed +https://bugs.webkit.org/show_bug.cgi?id=201971 + + +Reviewed by Andy Estes. + +Bug 172152 introduced a check of the NEFilterSource selector +setSourceAppPid in order to support OS's that didn't support it. All +supported Cocoa platforms now support it, so the check can be removed. + +* pal/spi/cocoa/NEFilterSourceSPI.h: + +2019-09-20 Keith Rollin + Remove some support for < iOS 13 https://bugs.webkit.org/show_bug.cgi?id=201967 Modified: trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm (250160 => 250161) --- trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2019-09-20 22:19:55 UTC (rev 250160) +++ trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2019-09-20 22:58:55 UTC (rev 250161) @@ -43,11 +43,6 @@ SOFT_LINK_FRAMEWORK_OPTIONAL(NetworkExtension); SOFT_LINK_CLASS_OPTIONAL(NetworkExtension, NEFilterSource); -// FIXME: Remove this once -setSourceAppPid: is declared in an SDK used by the builders -@interface NEFilterSource () -- (void)setSourceAppPid:(pid_t)sourceAppPid; -@end - static inline NSData *replacementDataFromDecisionInfo(NSDictionary *decisionInfo) { ASSERT_WITH_SECURITY_IMPLICATION(!decisionInfo || [decisionInfo isKindOfClass:[NSDictionary class]]); @@ -77,9 +72,7 @@ m_neFilterSource = adoptNS([allocNEFilterSourceInstance() initWithDecisionQueue:m_queue.get()]); #if PLATFORM(MAC) || PLATFORM(IOS_FAMILY) [m_neFilterSource setSourceAppIdentifier:applicationBundleIdentifier()]; -// FIXME: Remove the -respondsToSelector: check once -setSourceAppPid: is defined in an SDK used by the builders. -if ([m_neFilterSource respondsToSelector:@selector(setSourceAppPid:)]) -[m_neFilterSource setSourceAppPid:presentingApplicationPID()]; +[m_neFilterSource setSourceAppPid:presentingApplicationPID()]; #endif } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [250160] trunk
Title: [250160] trunk Revision 250160 Author krol...@apple.com Date 2019-09-20 15:19:55 -0700 (Fri, 20 Sep 2019) Log Message Remove some support for < iOS 13 https://bugs.webkit.org/show_bug.cgi?id=201967 Reviewed by Andy Estes. Remove some support for iOS versions less than 13.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 13. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. After version checks have been removed, there are some cases where the preprocessor conditional looks like "#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)". These can be collapsed into "#if PLATFORM(COCOA)". This additional cleanup will be performed in a subsequent patch. This removal is part of a series of patches effecting the removal of dead code for old versions of iOS. This particular pass involves changes in which Andy Estes was involved. These changes are isolated from other similar changes in order to facilitate the reviewing process. Source/WebCore: No new tests -- no new or changed functionality. * platform/cocoa/NetworkExtensionContentFilter.mm: (WebCore::NetworkExtensionContentFilter::initialize): Source/WebCore/PAL: * pal/spi/cocoa/NEFilterSourceSPI.h: Source/WebKit: * NetworkProcess/cocoa/NetworkSessionCocoa.mm: (WebKit::NetworkSessionCocoa::NetworkSessionCocoa): * UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView _dataForPreviewItemController:atPosition:type:]): * UIProcess/ios/forms/WKFileUploadPanel.mm: (-[WKFileUploadPanel _uploadItemFromMediaInfo:successBlock:failureBlock:]): Source/WTF: * wtf/FeatureDefines.h: Tools: * TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm: Removed. Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/FeatureDefines.h trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/pal/spi/cocoa/NEFilterSourceSPI.h trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj Removed Paths trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm Diff Modified: trunk/Source/WTF/ChangeLog (250159 => 250160) --- trunk/Source/WTF/ChangeLog 2019-09-20 21:51:36 UTC (rev 250159) +++ trunk/Source/WTF/ChangeLog 2019-09-20 22:19:55 UTC (rev 250160) @@ -1,6 +1,36 @@ 2019-09-20 Keith Rollin Remove some support for < iOS 13 +https://bugs.webkit.org/show_bug.cgi?id=201967 + + +Reviewed by Andy Estes. + +Remove some support for iOS versions less than 13.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 13. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. + +After version checks have been removed, there are some cases where the +preprocessor conditional looks like "#if PLATFORM(MAC) || +PLATFORM(IOS_FAMILY)". These can be collapsed into "#if +PLATFORM(COCOA)". This additional cleanup will be performed in a +subsequent patch. + +This removal is part of a series of patches effecting the removal of +dead code for old versions of iOS. This particular pass involves +changes in which Andy Estes was involved. These changes are isolated +from other similar changes in order to facilitate the reviewing +process. + +* wtf/FeatureDefines.h: + +2019-09-20 Keith Rollin + +Remove some support for < iOS 13 https://bugs.webkit.org/show_bug.cgi?id=201973 Modified: trunk/Source/WTF/wtf/FeatureDefines.h (250159 => 250160) --- trunk/Source/WTF/wtf/FeatureDefines.h 2019-09-20 21:51:36 UTC (rev 250159) +++ trunk/Source/WTF/wtf/FeatureDefines.h 2019-09-20 22:19:55 UTC (rev 250160) @@ -174,7 +174,7 @@ #endif #if !defined(HAVE_PDFHOSTVIEWCONTROLLER_SNAPSHOTTING) -#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 13 +#if PLATFORM(IOS) #define HAVE_PDFHOSTVIEWCONTROLLER_SNAPSHOTTING 1 #endif #endif @@ -206,7 +206,7 @@ #endif #if !defined(HAVE_PASSKIT_BOUND_INTERFACE_IDENTIFIER) -#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 13 +#if PLATFORM(IOS) #define HAVE_PASSKIT_BOUND_INTERFACE_IDENTIFIER 1 #endif #endif Modified: trunk/Source/WebCore/ChangeLog (250159 => 250160) --- trunk/Source/WebCore/ChangeLog 2019-09-20 21:51:36 UTC (rev 250159) +++
[webkit-changes] [250142] trunk/Source
Title: [250142] trunk/Source Revision 250142 Author krol...@apple.com Date 2019-09-20 13:10:37 -0700 (Fri, 20 Sep 2019) Log Message Remove some support for < iOS 13 https://bugs.webkit.org/show_bug.cgi?id=202032 Reviewed by Alex Christensen. Remove some support for iOS versions less than 13.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 13. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. This removal is part of a series of patches effecting the removal of dead code for old versions of iOS. This particular pass involves changes in which Dan Bates was involved. These changes are isolated from other similar changes in order to facilitate the reviewing process. Source/WebCore: No new tests -- no new or changed functionality. * platform/network/cf/ResourceRequestCFNet.cpp: (WebCore::ResourceRequest::doUpdatePlatformRequest): (WebCore::ResourceRequest::doUpdateResourceRequest): * platform/network/cocoa/CookieCocoa.mm: (WebCore::Cookie::operator NSHTTPCookie * _Nullable const): * platform/network/cocoa/ResourceRequestCocoa.mm: (WebCore::ResourceRequest::doUpdateResourceRequest): (WebCore::ResourceRequest::doUpdatePlatformRequest): Source/WebKit: * UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView _interpretKeyEvent:isCharEvent:]): Source/WebKitLegacy/mac: * WebView/WebHTMLView.mm: (-[WebHTMLView _handleEditingKeyEvent:]): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp trunk/Source/WebCore/platform/network/cocoa/CookieCocoa.mm trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm Diff Modified: trunk/Source/WebCore/ChangeLog (250141 => 250142) --- trunk/Source/WebCore/ChangeLog 2019-09-20 19:47:19 UTC (rev 250141) +++ trunk/Source/WebCore/ChangeLog 2019-09-20 20:10:37 UTC (rev 250142) @@ -1,3 +1,36 @@ +2019-09-20 Keith Rollin + +Remove some support for < iOS 13 +https://bugs.webkit.org/show_bug.cgi?id=202032 + + +Reviewed by Alex Christensen. + +Remove some support for iOS versions less than 13.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 13. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. + +This removal is part of a series of patches effecting the removal of +dead code for old versions of iOS. This particular pass involves +changes in which Dan Bates was involved. These changes are isolated +from other similar changes in order to facilitate the reviewing +process. + +No new tests -- no new or changed functionality. + +* platform/network/cf/ResourceRequestCFNet.cpp: +(WebCore::ResourceRequest::doUpdatePlatformRequest): +(WebCore::ResourceRequest::doUpdateResourceRequest): +* platform/network/cocoa/CookieCocoa.mm: +(WebCore::Cookie::operator NSHTTPCookie * _Nullable const): +* platform/network/cocoa/ResourceRequestCocoa.mm: +(WebCore::ResourceRequest::doUpdateResourceRequest): +(WebCore::ResourceRequest::doUpdatePlatformRequest): + 2019-09-20 Truitt Savell Unreviewed, rolling out r250114. Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (250141 => 250142) --- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2019-09-20 19:47:19 UTC (rev 250141) +++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2019-09-20 20:10:37 UTC (rev 250142) @@ -157,7 +157,7 @@ } } -#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 12 +#if PLATFORM(IOS_FAMILY) static CFURLRef siteForCookies(ResourceRequest::SameSiteDisposition disposition, CFURLRef url) { switch (disposition) { @@ -200,7 +200,7 @@ CFURLRequestSetShouldHandleHTTPCookies(cfRequest, allowCookies()); -#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 12 +#if PLATFORM(IOS_FAMILY) _CFURLRequestSetProtocolProperty(cfRequest, CFSTR("_kCFHTTPCookiePolicyPropertySiteForCookies"), siteForCookies(m_sameSiteDisposition, url.get())); int isTopSite = m_isTopSite; @@ -285,7 +285,7 @@ if (resourcePrioritiesEnabled()) m_priority = toResourceLoadPriority(CFURLRequestGetRequestPriority(m_cfRequest.get())); -#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 12 +#if PLATFORM(IOS_FAMILY)
[webkit-changes] [250138] trunk
Title: [250138] trunk Revision 250138 Author krol...@apple.com Date 2019-09-20 12:31:24 -0700 (Fri, 20 Sep 2019) Log Message Remove some support for < iOS 13 https://bugs.webkit.org/show_bug.cgi?id=201973 Reviewed by Alex Christensen. Remove some support for iOS versions less than 13.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 13. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. This removal is part of a series of patches effecting the removal of dead code for old versions of iOS. This particular pass involves changes in which Chris Dumez was involved. These changes are isolated from other similar changes in order to facilitate the reviewing process. Source/WebKit: * NetworkProcess/Downloads/cocoa/DownloadCocoa.mm: (WebKit::Download::resume): Source/WTF: * wtf/FeatureDefines.h: Tools: * TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/FeatureDefines.h trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm Diff Modified: trunk/Source/WTF/ChangeLog (250137 => 250138) --- trunk/Source/WTF/ChangeLog 2019-09-20 18:42:48 UTC (rev 250137) +++ trunk/Source/WTF/ChangeLog 2019-09-20 19:31:24 UTC (rev 250138) @@ -1,3 +1,27 @@ +2019-09-20 Keith Rollin + +Remove some support for < iOS 13 +https://bugs.webkit.org/show_bug.cgi?id=201973 + + +Reviewed by Alex Christensen. + +Remove some support for iOS versions less than 13.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 13. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. + +This removal is part of a series of patches effecting the removal of +dead code for old versions of iOS. This particular pass involves +changes in which Chris Dumez was involved. These changes are isolated +from other similar changes in order to facilitate the reviewing +process. + +* wtf/FeatureDefines.h: + 2019-09-20 Paulo Matos Implement memory monitoring functions for Linux OS Modified: trunk/Source/WTF/wtf/FeatureDefines.h (250137 => 250138) --- trunk/Source/WTF/wtf/FeatureDefines.h 2019-09-20 18:42:48 UTC (rev 250137) +++ trunk/Source/WTF/wtf/FeatureDefines.h 2019-09-20 19:31:24 UTC (rev 250138) @@ -186,16 +186,12 @@ #endif #if !defined(HAVE_VISIBILITY_PROPAGATION_VIEW) -#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 13 #define HAVE_VISIBILITY_PROPAGATION_VIEW 1 #endif -#endif #if !defined(HAVE_UISCENE) -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 13) || PLATFORM(APPLETV) || PLATFORM(WATCHOS) #define HAVE_UISCENE 1 #endif -#endif #if !defined(HAVE_AVSTREAMSESSION) #define HAVE_AVSTREAMSESSION 0 Modified: trunk/Source/WebKit/ChangeLog (250137 => 250138) --- trunk/Source/WebKit/ChangeLog 2019-09-20 18:42:48 UTC (rev 250137) +++ trunk/Source/WebKit/ChangeLog 2019-09-20 19:31:24 UTC (rev 250138) @@ -1,3 +1,28 @@ +2019-09-20 Keith Rollin + +Remove some support for < iOS 13 +https://bugs.webkit.org/show_bug.cgi?id=201973 + + +Reviewed by Alex Christensen. + +Remove some support for iOS versions less than 13.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 13. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101300" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101300" are always True. + +This removal is part of a series of patches effecting the removal of +dead code for old versions of iOS. This particular pass involves +changes in which Chris Dumez was involved. These changes are isolated +from other similar changes in order to facilitate the reviewing +process. + +* NetworkProcess/Downloads/cocoa/DownloadCocoa.mm: +(WebKit::Download::resume): + 2019-09-20 Chris Dumez Unreviewed, fix confusing release logging under WebPageProxy::loadRequestWithNavigationShared(). Modified: trunk/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm (250137 => 250138) --- trunk/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm 2019-09-20 18:42:48 UTC (rev 250137) +++ trunk/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm 2019-09-20 19:31:24 UTC (rev 250138) @@
[webkit-changes] [250049] trunk/Source/WebCore/PAL
Title: [250049] trunk/Source/WebCore/PAL Revision 250049 Author krol...@apple.com Date 2019-09-18 12:39:53 -0700 (Wed, 18 Sep 2019) Log Message Remove alternate declaration of CCECCryptorImportKey https://bugs.webkit.org/show_bug.cgi?id=201903 Reviewed by Chris Dumez. In macOS 10.15 and iOS 13.0 SDKs, the keyPackage parameter of CCECCryptorImportKey() was changed from "void*" to "const void*". This change was accounted for in Bug 195754 by making the same change to the parallel declarations in CommonCryptoSPI.h. But since this header also needed to be used in macOS 10.14 contexts, the old declaration was also kept. But since this function is a "C" function, the types of parameters are not included in the function signature, and it doesn't really matter what parameter types are, so long as the right values are sent to the called function. This means that we don't need two versions of the function, one with a "const" parameter and one without. We only really need one. In this case, it makes sense to keep the more-restrictive one -- the with a "const void*" parameter. Therefore, remove the one taking just "void*". * pal/spi/cocoa/CommonCryptoSPI.h: Modified Paths trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/pal/spi/cocoa/CommonCryptoSPI.h Diff Modified: trunk/Source/WebCore/PAL/ChangeLog (250048 => 250049) --- trunk/Source/WebCore/PAL/ChangeLog 2019-09-18 19:13:33 UTC (rev 250048) +++ trunk/Source/WebCore/PAL/ChangeLog 2019-09-18 19:39:53 UTC (rev 250049) @@ -1,3 +1,29 @@ +2019-09-18 Keith Rollin + +Remove alternate declaration of CCECCryptorImportKey +https://bugs.webkit.org/show_bug.cgi?id=201903 + + +Reviewed by Chris Dumez. + +In macOS 10.15 and iOS 13.0 SDKs, the keyPackage parameter of +CCECCryptorImportKey() was changed from "void*" to "const void*". This +change was accounted for in Bug 195754 by making the same change to +the parallel declarations in CommonCryptoSPI.h. But since this header +also needed to be used in macOS 10.14 contexts, the old declaration +was also kept. + +But since this function is a "C" function, the types of parameters are +not included in the function signature, and it doesn't really matter +what parameter types are, so long as the right values are sent to the +called function. This means that we don't need two versions of the +function, one with a "const" parameter and one without. We only really +need one. In this case, it makes sense to keep the more-restrictive +one -- the with a "const void*" parameter. Therefore, remove the one +taking just "void*". + +* pal/spi/cocoa/CommonCryptoSPI.h: + 2019-09-18 Andy Estes [Apple Pay] Tell websites why a session was cancelled Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/CommonCryptoSPI.h (250048 => 250049) --- trunk/Source/WebCore/PAL/pal/spi/cocoa/CommonCryptoSPI.h 2019-09-18 19:13:33 UTC (rev 250048) +++ trunk/Source/WebCore/PAL/pal/spi/cocoa/CommonCryptoSPI.h 2019-09-18 19:39:53 UTC (rev 250049) @@ -93,11 +93,7 @@ typedef struct _CCECCryptor *CCECCryptorRef; extern "C" CCCryptorStatus CCECCryptorGeneratePair(size_t keysize, CCECCryptorRef *publicKey, CCECCryptorRef *privateKey); extern "C" void CCECCryptorRelease(CCECCryptorRef key); -#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 13) extern "C" CCCryptorStatus CCECCryptorImportKey(CCECKeyExternalFormat format, const void *keyPackage, size_t keyPackageLen, CCECKeyType keyType, CCECCryptorRef *key); -#else -extern "C" CCCryptorStatus CCECCryptorImportKey(CCECKeyExternalFormat format, void *keyPackage, size_t keyPackageLen, CCECKeyType keyType, CCECCryptorRef *key); -#endif extern "C" CCCryptorStatus CCECCryptorExportKey(CCECKeyExternalFormat format, void *keyPackage, size_t *keyPackageLen, CCECKeyType keyType, CCECCryptorRef key); extern "C" int CCECGetKeySize(CCECCryptorRef key); extern "C" CCCryptorStatus CCECCryptorCreateFromData(size_t keySize, uint8_t *qX, size_t qXLength, uint8_t *qY, size_t qYLength, CCECCryptorRef *ref); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [249978] trunk
Title: [249978] trunk Revision 249978 Author krol...@apple.com Date 2019-09-17 13:20:38 -0700 (Tue, 17 Sep 2019) Log Message Remove some support for < iOS 12 https://bugs.webkit.org/show_bug.cgi?id=201851 Reviewed by Jiewen Tan and Alexey Proskuryakov. Remove some support for iOS versions less than 12.0. Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have values >= 12. This means that expressions like "__IPHONE_OS_VERSION_MIN_REQUIRED < 101200" are always False and "__IPHONE_OS_VERSION_MIN_REQUIRED >= 101200" are always True. This removal is part of a series of patches effecting such removal. Source/WebCore: No new tests -- no new or changed functionality. * crypto/mac/CryptoKeyRSAMac.cpp: (WebCore::CryptoKeyRSA::create): (WebCore::castDataArgumentToCCRSACryptorCreateFromDataIfNeeded): Deleted. Source/WebCore/PAL: * pal/spi/cocoa/IOSurfaceSPI.h: Tools: * WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm: (WTR::installFakeHelvetica): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp trunk/Tools/ChangeLog trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm Diff Modified: trunk/Source/WebCore/ChangeLog (249977 => 249978) --- trunk/Source/WebCore/ChangeLog 2019-09-17 20:17:47 UTC (rev 249977) +++ trunk/Source/WebCore/ChangeLog 2019-09-17 20:20:38 UTC (rev 249978) @@ -1,3 +1,27 @@ +2019-09-17 Keith Rollin + +Remove some support for < iOS 12 +https://bugs.webkit.org/show_bug.cgi?id=201851 + + +Reviewed by Jiewen Tan and Alexey Proskuryakov. + +Remove some support for iOS versions less than 12.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 12. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101200" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101200" are always True. + +This removal is part of a series of patches effecting such removal. + +No new tests -- no new or changed functionality. + +* crypto/mac/CryptoKeyRSAMac.cpp: +(WebCore::CryptoKeyRSA::create): +(WebCore::castDataArgumentToCCRSACryptorCreateFromDataIfNeeded): Deleted. + 2019-09-17 Nikolas Zimmermann SVG does not reset the element to its first animation frame if its fill is "remove" Modified: trunk/Source/WebCore/PAL/ChangeLog (249977 => 249978) --- trunk/Source/WebCore/PAL/ChangeLog 2019-09-17 20:17:47 UTC (rev 249977) +++ trunk/Source/WebCore/PAL/ChangeLog 2019-09-17 20:20:38 UTC (rev 249978) @@ -1,3 +1,23 @@ +2019-09-17 Keith Rollin + +Remove some support for < iOS 12 +https://bugs.webkit.org/show_bug.cgi?id=201851 + + +Reviewed by Jiewen Tan and Alexey Proskuryakov. + +Remove some support for iOS versions less than 12.0. + +Update conditionals that reference __IPHONE_OS_VERSION_MIN_REQUIRED +and __IPHONE_OS_VERSION_MAX_ALLOWED, assuming that they both have +values >= 12. This means that expressions like +"__IPHONE_OS_VERSION_MIN_REQUIRED < 101200" are always False and +"__IPHONE_OS_VERSION_MIN_REQUIRED >= 101200" are always True. + +This removal is part of a series of patches effecting such removal. + +* pal/spi/cocoa/IOSurfaceSPI.h: + 2019-09-17 Jonathan Bedard Follow-up: Provide a prototype for AR QuickLook to trigger processing in the originating page Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h (249977 => 249978) --- trunk/Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h 2019-09-17 20:17:47 UTC (rev 249977) +++ trunk/Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h 2019-09-17 20:20:38 UTC (rev 249978) @@ -40,14 +40,8 @@ typedef struct __IOSurface *IOSurfaceRef; -#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 11 -enum { -kIOSurfaceLockReadOnly = 0x0001, -}; #endif -#endif - WTF_EXTERN_C_BEGIN extern const CFStringRef kIOSurfaceAllocSize; @@ -92,21 +86,10 @@ #else -#if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 11) || PLATFORM(MAC) - #import -#else -enum { -kIOSurfacePurgeableNonVolatile = 0, -kIOSurfacePurgeableVolatile = 1, -kIOSurfacePurgeableEmpty = 2, -kIOSurfacePurgeableKeepCurrent = 3, -}; #endif -#endif - WTF_EXTERN_C_BEGIN IOReturn IOSurfaceSetPurgeable(IOSurfaceRef buffer, uint32_t newState, uint32_t *oldState); Modified: trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp (249977 => 249978) --- trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp 2019-09-17 20:17:47 UTC (rev 249977) +++ trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp
[webkit-changes] [249807] trunk/Tools
Title: [249807] trunk/Tools Revision 249807 Author krol...@apple.com Date 2019-09-12 07:13:28 -0700 (Thu, 12 Sep 2019) Log Message Fix PDFKit references in TestWebKitAPI https://bugs.webkit.org/show_bug.cgi?id=201700 Reviewed by Youenn Fablet. These references fail in watchOS and tvOS, so remove them on those platforms. * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WebKitCocoa/PDFSnapshot.mm: * TestWebKitAPI/cocoa/TestPDFDocument.h: * TestWebKitAPI/cocoa/TestPDFDocument.mm: * TestWebKitAPI/config.h: Modified Paths trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PDFSnapshot.mm trunk/Tools/TestWebKitAPI/cocoa/TestPDFDocument.h trunk/Tools/TestWebKitAPI/cocoa/TestPDFDocument.mm trunk/Tools/TestWebKitAPI/config.h Diff Modified: trunk/Tools/ChangeLog (249806 => 249807) --- trunk/Tools/ChangeLog 2019-09-12 13:52:59 UTC (rev 249806) +++ trunk/Tools/ChangeLog 2019-09-12 14:13:28 UTC (rev 249807) @@ -1,3 +1,21 @@ +2019-09-12 Keith Rollin + +Fix PDFKit references in TestWebKitAPI +https://bugs.webkit.org/show_bug.cgi?id=201700 + + +Reviewed by Youenn Fablet. + +These references fail in watchOS and tvOS, so remove them on those +platforms. + +* TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig: +* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: +* TestWebKitAPI/Tests/WebKitCocoa/PDFSnapshot.mm: +* TestWebKitAPI/cocoa/TestPDFDocument.h: +* TestWebKitAPI/cocoa/TestPDFDocument.mm: +* TestWebKitAPI/config.h: + 2019-09-11 Fujii Hironori [Win][MiniBrowser] Select all text in the URL bar by clicking it Modified: trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig (249806 => 249807) --- trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2019-09-12 13:52:59 UTC (rev 249806) +++ trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2019-09-12 14:13:28 UTC (rev 249807) @@ -45,7 +45,13 @@ WK_AUTHKIT_LDFLAGS_macosx = $(WK_AUTHKIT_LDFLAGS$(WK_MACOS_1015)); WK_AUTHKIT_LDFLAGS_MACOS_SINCE_1015 = -framework AuthKit; -OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) -lgtest -force_load $(BUILT_PRODUCTS_DIR)/libTestWebKitAPI.a -framework _javascript_Core -framework WebKit -lWebCoreTestSupport $(WK_AUTHKIT_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM); +WK_PDFKIT_LDFLAGS = $(WK_PDFKIT_LDFLAGS_$(WK_PLATFORM_NAME)); +WK_PDFKIT_LDFLAGS_macosx = -framework PDFKit; +WK_PDFKIT_LDFLAGS_maccatalyst = -framework PDFKit; +WK_PDFKIT_LDFLAGS_iphoneos = -framework PDFKit; +WK_PDFKIT_LDFLAGS_iphonesimulator = -framework PDFKit; + +OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) -lgtest -force_load $(BUILT_PRODUCTS_DIR)/libTestWebKitAPI.a -framework _javascript_Core -framework WebKit -lWebCoreTestSupport $(WK_AUTHKIT_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM); OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Cocoa -framework Carbon; // FIXME: This should not be built on iOS. Instead we should create and use a TestWebKitAPI application. Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (249806 => 249807) --- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2019-09-12 13:52:59 UTC (rev 249806) +++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2019-09-12 14:13:28 UTC (rev 249807) @@ -259,7 +259,6 @@ 515BE1711D428E4B00DD7C68 /* StoreBlobThenDelete.mm in Sources */ = {isa = PBXBuildFile; fileRef = 515BE1701D428BD100DD7C68 /* StoreBlobThenDelete.mm */; }; 516281252325C18000BB7E42 /* TestPDFDocument.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516281242325C17B00BB7E42 /* TestPDFDocument.mm */; }; 516281272325C19800BB7E42 /* PDFSnapshot.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516281262325C19100BB7E42 /* PDFSnapshot.mm */; }; - 516281292325C45400BB7E42 /* PDFKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 516281282325C45400BB7E42 /* PDFKit.framework */; }; 5165FE04201EE620009F7EC3 /* MessagePortProviders.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5165FE03201EE617009F7EC3 /* MessagePortProviders.mm */; }; 51714EB41CF8C78C004723C4 /* WebProcessKillIDBCleanup-1.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 51714EB21CF8C761004723C4 /* WebProcessKillIDBCleanup-1.html */; }; 51714EB51CF8C78C004723C4 /* WebProcessKillIDBCleanup-2.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 51714EB31CF8C761004723C4 /* WebProcessKillIDBCleanup-2.html */; }; @@ -2578,7 +2577,6 @@ 5CFACF63226F73C60056C7D0 /* libboringssl.a in Frameworks */, 7C83E03F1D0A61A000FEBCF3 /* libicucore.dylib in Frameworks */, 578CBD67204FB2C80083B9F2 /* LocalAuthentication.framework in Frameworks */, -
[webkit-changes] [249795] trunk/Source
Title: [249795] trunk/Source Revision 249795 Author krol...@apple.com Date 2019-09-11 22:40:12 -0700 (Wed, 11 Sep 2019) Log Message Log timeoutValue passed on to CFNetwork https://bugs.webkit.org/show_bug.cgi?id=201701 Reviewed by Chris Dumez. Source/WebCore: Export ResourceRequest::timeoutValue for use in WebKit. No new tests -- no new or changed functionality. * platform/network/ResourceRequestBase.h: Source/WebKit: We occasionally see cases where resource-loads into CFNetwork take a long time. Rather than timing out after the default of 60s, they stay pending for many minutes. To better understand why this is happening, log the timeoutValue we pass to CFNetwork when loading resources. * NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::startNetworkLoad): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/network/ResourceRequestBase.h trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (249794 => 249795) --- trunk/Source/WebCore/ChangeLog 2019-09-12 05:29:01 UTC (rev 249794) +++ trunk/Source/WebCore/ChangeLog 2019-09-12 05:40:12 UTC (rev 249795) @@ -1,3 +1,17 @@ +2019-09-11 Keith Rollin + +Log timeoutValue passed on to CFNetwork +https://bugs.webkit.org/show_bug.cgi?id=201701 + + +Reviewed by Chris Dumez. + +Export ResourceRequest::timeoutValue for use in WebKit. + +No new tests -- no new or changed functionality. + +* platform/network/ResourceRequestBase.h: + 2019-09-11 Saam Barati [WHLSL] Remove null from the standard library Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (249794 => 249795) --- trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2019-09-12 05:29:01 UTC (rev 249794) +++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2019-09-12 05:40:12 UTC (rev 249795) @@ -73,7 +73,7 @@ WEBCORE_EXPORT ResourceRequestCachePolicy cachePolicy() const; WEBCORE_EXPORT void setCachePolicy(ResourceRequestCachePolicy cachePolicy); -double timeoutInterval() const; // May return 0 when using platform default. +WEBCORE_EXPORT double timeoutInterval() const; // May return 0 when using platform default. void setTimeoutInterval(double timeoutInterval); WEBCORE_EXPORT const URL& firstPartyForCookies() const; Modified: trunk/Source/WebKit/ChangeLog (249794 => 249795) --- trunk/Source/WebKit/ChangeLog 2019-09-12 05:29:01 UTC (rev 249794) +++ trunk/Source/WebKit/ChangeLog 2019-09-12 05:40:12 UTC (rev 249795) @@ -1,3 +1,19 @@ +2019-09-11 Keith Rollin + +Log timeoutValue passed on to CFNetwork +https://bugs.webkit.org/show_bug.cgi?id=201701 + + +Reviewed by Chris Dumez. + +We occasionally see cases where resource-loads into CFNetwork take a +long time. Rather than timing out after the default of 60s, they stay +pending for many minutes. To better understand why this is happening, +log the timeoutValue we pass to CFNetwork when loading resources. + +* NetworkProcess/NetworkResourceLoader.cpp: +(WebKit::NetworkResourceLoader::startNetworkLoad): + 2019-09-11 Youenn Fablet Protect UserMediaRequest when stopping it Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (249794 => 249795) --- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2019-09-12 05:29:01 UTC (rev 249794) +++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2019-09-12 05:40:12 UTC (rev 249795) @@ -285,7 +285,7 @@ void NetworkResourceLoader::startNetworkLoad(ResourceRequest&& request, FirstLoad load) { if (load == FirstLoad::Yes) { -RELEASE_LOG_IF_ALLOWED("startNetworkLoad: (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID.toUInt64(), m_parameters.webFrameID.toUInt64(), m_parameters.identifier, isMainResource(), isSynchronous()); +RELEASE_LOG_IF_ALLOWED("startNetworkLoad: (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d, timeout = %f)", m_parameters.webPageID.toUInt64(), m_parameters.webFrameID.toUInt64(), m_parameters.identifier, isMainResource(), isSynchronous(), request.timeoutInterval()); consumeSandboxExtensions(); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [249738] trunk/Tools
Title: [249738] trunk/Tools Revision 249738 Author krol...@apple.com Date 2019-09-10 15:48:29 -0700 (Tue, 10 Sep 2019) Log Message Remove SSL-based TLSDeprecation.mm contents https://bugs.webkit.org/show_bug.cgi?id=201657 Reviewed by Alex Christensen. This file does not build on watchOS due to references to SSL facilities. Conditionalize out the contents on HAVE_SSL. * TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm: Modified Paths trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm Diff Modified: trunk/Tools/ChangeLog (249737 => 249738) --- trunk/Tools/ChangeLog 2019-09-10 22:28:32 UTC (rev 249737) +++ trunk/Tools/ChangeLog 2019-09-10 22:48:29 UTC (rev 249738) @@ -1,3 +1,16 @@ +2019-09-10 Keith Rollin + +Remove SSL-based TLSDeprecation.mm contents +https://bugs.webkit.org/show_bug.cgi?id=201657 + + +Reviewed by Alex Christensen. + +This file does not build on watchOS due to references to SSL +facilities. Conditionalize out the contents on HAVE_SSL. + +* TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm: + 2019-09-10 Michael Catanzaro Unreviewed, remove myself from watchlists Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm (249737 => 249738) --- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm 2019-09-10 22:28:32 UTC (rev 249737) +++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm 2019-09-10 22:48:29 UTC (rev 249738) @@ -25,6 +25,8 @@ #include "config.h" +#if HAVE(SSL) + #import "PlatformUtilities.h" #import "TCPServer.h" #import "TestNavigationDelegate.h" @@ -205,3 +207,5 @@ } } + +#endif // HAVE(SSL) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [249527] trunk/Source/WebCore
Title: [249527] trunk/Source/WebCore Revision 249527 Author krol...@apple.com Date 2019-09-05 03:53:36 -0700 (Thu, 05 Sep 2019) Log Message Fix implicit conversion that loses precision https://bugs.webkit.org/show_bug.cgi?id=201476 Reviewed by Youenn Fablet, Alex Christensen. Building for watchOS results in the following error: .../Source/WebCore/fileapi/NetworkSendQueue.cpp:66:42: error: implicit conversion loses integer precision: 'unsigned long long' to 'unsigned int' [-Werror,-Wshorten-64-to-32] enqueue(JSC::ArrayBuffer::create(byteLength, 1), 0, 0); Fix this by replacing byteLength (which is known to be zero at this point) with 0U. No new tests -- no new or changed functionality. * fileapi/NetworkSendQueue.cpp: (WebCore::NetworkSendQueue::enqueue): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/fileapi/NetworkSendQueue.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (249526 => 249527) --- trunk/Source/WebCore/ChangeLog 2019-09-05 09:01:51 UTC (rev 249526) +++ trunk/Source/WebCore/ChangeLog 2019-09-05 10:53:36 UTC (rev 249527) @@ -1,3 +1,24 @@ +2019-09-05 Keith Rollin + +Fix implicit conversion that loses precision +https://bugs.webkit.org/show_bug.cgi?id=201476 + + +Reviewed by Youenn Fablet, Alex Christensen. + +Building for watchOS results in the following error: + +.../Source/WebCore/fileapi/NetworkSendQueue.cpp:66:42: error: implicit conversion loses integer precision: 'unsigned long long' to 'unsigned int' [-Werror,-Wshorten-64-to-32] +enqueue(JSC::ArrayBuffer::create(byteLength, 1), 0, 0); + +Fix this by replacing byteLength (which is known to be zero at this +point) with 0U. + +No new tests -- no new or changed functionality. + +* fileapi/NetworkSendQueue.cpp: +(WebCore::NetworkSendQueue::enqueue): + 2019-09-05 Youenn Fablet Introduce WorkerSWClientConnection to make SWClientConnection mono-thread Modified: trunk/Source/WebCore/fileapi/NetworkSendQueue.cpp (249526 => 249527) --- trunk/Source/WebCore/fileapi/NetworkSendQueue.cpp 2019-09-05 09:01:51 UTC (rev 249526) +++ trunk/Source/WebCore/fileapi/NetworkSendQueue.cpp 2019-09-05 10:53:36 UTC (rev 249527) @@ -63,7 +63,7 @@ { auto byteLength = blob.size(); if (!byteLength) { -enqueue(JSC::ArrayBuffer::create(byteLength, 1), 0, 0); +enqueue(JSC::ArrayBuffer::create(0U, 1), 0, 0); return; } m_queue.append(makeUniqueRef(m_document.get(), blob, [this] { ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [249328] trunk/Tools
Title: [249328] trunk/Tools Revision 249328 Author krol...@apple.com Date 2019-08-30 08:44:40 -0700 (Fri, 30 Aug 2019) Log Message Simplify PLATFORM _expression_ https://bugs.webkit.org/show_bug.cgi?id=201286 Reviewed by Alexey Proskuryakov. The preprocessor _expression_ conditionalizing the inclusion of the body of ExitFullscreenOnEnterPiP.mm evolved into: #if PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)) Simplify this to just: #if !PLATFORM(IOS_FAMILY_SIMULATOR) * TestWebKitAPI/Tests/WebKitCocoa/ExitFullscreenOnEnterPiP.mm: Modified Paths trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ExitFullscreenOnEnterPiP.mm Diff Modified: trunk/Tools/ChangeLog (249327 => 249328) --- trunk/Tools/ChangeLog 2019-08-30 15:37:26 UTC (rev 249327) +++ trunk/Tools/ChangeLog 2019-08-30 15:44:40 UTC (rev 249328) @@ -1,5 +1,24 @@ 2019-08-30 Keith Rollin +Simplify PLATFORM _expression_ +https://bugs.webkit.org/show_bug.cgi?id=201286 + + +Reviewed by Alexey Proskuryakov. + +The preprocessor _expression_ conditionalizing the inclusion of the body +of ExitFullscreenOnEnterPiP.mm evolved into: + +#if PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)) + +Simplify this to just: + +#if !PLATFORM(IOS_FAMILY_SIMULATOR) + +* TestWebKitAPI/Tests/WebKitCocoa/ExitFullscreenOnEnterPiP.mm: + +2019-08-30 Keith Rollin + Remove AppKitCompatibilityDeclarations.h https://bugs.webkit.org/show_bug.cgi?id=201283 Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ExitFullscreenOnEnterPiP.mm (249327 => 249328) --- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ExitFullscreenOnEnterPiP.mm 2019-08-30 15:37:26 UTC (rev 249327) +++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ExitFullscreenOnEnterPiP.mm 2019-08-30 15:44:40 UTC (rev 249328) @@ -25,7 +25,7 @@ #include "config.h" -#if PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)) +#if !PLATFORM(IOS_FAMILY_SIMULATOR) #import "PlatformUtilities.h" #import "Test.h" ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [249327] trunk
Title: [249327] trunk Revision 249327 Author krol...@apple.com Date 2019-08-30 08:37:26 -0700 (Fri, 30 Aug 2019) Log Message Remove AppKitCompatibilityDeclarations.h https://bugs.webkit.org/show_bug.cgi?id=201283 Reviewed by Alexey Proskuryakov. The two copies of these files -- on in WTF, one in MiniBrowser -- are empty and can be removed. Source/WebCore: No new tests -- no new or changed functionality. * WebCorePrefix.h: Source/WebKit: * WebKit2Prefix.h: Source/WebKitLegacy/mac: * Misc/WebNSEventExtras.m: * Misc/WebNSViewExtras.m: * WebKitPrefix.h: Source/WTF: * WTF.xcodeproj/project.pbxproj: * wtf/PlatformMac.cmake: * wtf/mac/AppKitCompatibilityDeclarations.h: Removed. Tools: * DumpRenderTree/mac/EventSendingController.mm: * DumpRenderTree/mac/TextInputControllerMac.m: * MiniBrowser/AppKitCompatibilityDeclarations.h: Removed. * MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj: * MiniBrowser/mac/SettingsController.m: * MiniBrowser/mac/WK1BrowserWindowController.m: * MiniBrowser/mac/WK2BrowserWindowController.m: * TestWebKitAPI/Tests/WebKit/mac/ContextMenuImgWithVideo.mm: * TestWebKitAPI/Tests/WebKitCocoa/CommandBackForward.mm: * TestWebKitAPI/Tests/WebKitCocoa/DecidePolicyForNavigationAction.mm: * TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm: * TestWebKitAPI/Tests/WebKitCocoa/FullscreenLayoutConstraints.mm: * TestWebKitAPI/Tests/WebKitCocoa/FullscreenTopContentInset.mm: * TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm: * TestWebKitAPI/Tests/WebKitCocoa/ShouldOpenExternalURLsInNewWindowActions.mm: * TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm: * TestWebKitAPI/Tests/WebKitCocoa/UserInitiatedActionInNavigationAction.mm: * TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm: * TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm: * TestWebKitAPI/Tests/mac/ContextMenuDefaultItemsHaveTags.mm: * TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm: * TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm: * TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm: * TestWebKitAPI/cocoa/TestWKWebView.mm: * TestWebKitAPI/mac/PlatformUtilitiesMac.mm: * TestWebKitAPI/mac/PlatformWebViewMac.mm: * WebKitTestRunner/mac/EventSenderProxy.mm: * WebKitTestRunner/mac/PlatformWebViewMac.mm: * WebKitTestRunner/mac/TestControllerMac.mm: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/WTF.xcodeproj/project.pbxproj trunk/Source/WTF/wtf/PlatformMac.cmake trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCorePrefix.h trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebKit2Prefix.h trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Misc/WebNSEventExtras.m trunk/Source/WebKitLegacy/mac/Misc/WebNSViewExtras.m trunk/Source/WebKitLegacy/mac/WebKitPrefix.h trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/mac/EventSendingController.mm trunk/Tools/DumpRenderTree/mac/TextInputControllerMac.m trunk/Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj trunk/Tools/MiniBrowser/mac/SettingsController.m trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuImgWithVideo.mm trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CommandBackForward.mm trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DecidePolicyForNavigationAction.mm trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenLayoutConstraints.mm trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenTopContentInset.mm trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ShouldOpenExternalURLsInNewWindowActions.mm trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/UserInitiatedActionInNavigationAction.mm trunk/Tools/TestWebKitAPI/Tests/mac/AcceptsFirstMouse.mm trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuDefaultItemsHaveTags.mm trunk/Tools/TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm trunk/Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm trunk/Tools/TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.mm trunk/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm trunk/Tools/TestWebKitAPI/mac/PlatformWebViewMac.mm trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm Removed Paths trunk/Source/WTF/wtf/mac/AppKitCompatibilityDeclarations.h trunk/Tools/MiniBrowser/AppKitCompatibilityDeclarations.h Diff Modified: trunk/Source/WTF/ChangeLog (249326 => 249327) --- trunk/Source/WTF/ChangeLog 2019-08-30 15:29:36 UTC (rev 249326) +++ trunk/Source/WTF/ChangeLog 2019-08-30 15:37:26 UTC (rev 249327) @@ -1,3 +1,18 @@ +2019-08-30 Keith Rollin + +Remove AppKitCompatibilityDeclarations.h +
[webkit-changes] [249326] trunk/Source/WebKitLegacy/mac
Title: [249326] trunk/Source/WebKitLegacy/mac Revision 249326 Author krol...@apple.com Date 2019-08-30 08:29:36 -0700 (Fri, 30 Aug 2019) Log Message Remove extra braces https://bugs.webkit.org/show_bug.cgi?id=201285 Reviewed by Alexey Proskuryakov. Some code evolved such that there was only a single statement under an 'if' statement. The braces surrounding the single-line block can now be removed. * WebView/WebView.mm: (-[WebView updateMediaTouchBar]): Modified Paths trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/WebView/WebView.mm Diff Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (249325 => 249326) --- trunk/Source/WebKitLegacy/mac/ChangeLog 2019-08-30 15:14:54 UTC (rev 249325) +++ trunk/Source/WebKitLegacy/mac/ChangeLog 2019-08-30 15:29:36 UTC (rev 249326) @@ -1,3 +1,17 @@ +2019-08-30 Keith Rollin + +Remove extra braces +https://bugs.webkit.org/show_bug.cgi?id=201285 + +Reviewed by Alexey Proskuryakov. + +Some code evolved such that there was only a single statement under an +'if' statement. The braces surrounding the single-line block can now +be removed. + +* WebView/WebView.mm: +(-[WebView updateMediaTouchBar]): + 2019-08-29 Keith Rollin Update .xcconfig symbols to reflect the current set of past and future product versions. Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (249325 => 249326) --- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2019-08-30 15:14:54 UTC (rev 249325) +++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2019-08-30 15:29:36 UTC (rev 249326) @@ -9861,9 +9861,8 @@ - (void)updateMediaTouchBar { #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER) && ENABLE(VIDEO_PRESENTATION_MODE) -if (!_private->mediaTouchBarProvider) { +if (!_private->mediaTouchBarProvider) _private->mediaTouchBarProvider = adoptNS([allocAVTouchBarPlaybackControlsProviderInstance() init]); -} if (![_private->mediaTouchBarProvider playbackControlsController]) { ASSERT(_private->playbackSessionInterface); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [249314] trunk/Source
Title: [249314] trunk/Source Revision 249314 Author krol...@apple.com Date 2019-08-29 22:00:15 -0700 (Thu, 29 Aug 2019) Log Message Remove HAVE_PASSKIT_GRANULAR_ERRORS conditional https://bugs.webkit.org/show_bug.cgi?id=201278 Reviewed by Alex Christensen. HAVE_PASSKIT_GRANULAR_ERRORS is always True, so remove the conditional tests, keeping the True branches and removing the False branches. Source/WebCore/PAL: * pal/cocoa/PassKitSoftLink.h: * pal/cocoa/PassKitSoftLink.mm: Source/WebKit: * Platform/cocoa/PaymentAuthorizationPresenter.mm: (WebKit::PaymentAuthorizationPresenter::completePaymentSession): (WebKit::PaymentAuthorizationPresenter::completeShippingContactSelection): * Platform/cocoa/PaymentAuthorizationViewController.mm: (-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewController:didAuthorizePayment:completion:]): Deleted. (-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewController:didSelectShippingMethod:completion:]): Deleted. (-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewController:didSelectShippingContact:completion:]): Deleted. (-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewController:didSelectPaymentMethod:completion:]): Deleted. * Platform/cocoa/WKPaymentAuthorizationDelegate.h: * Platform/cocoa/WKPaymentAuthorizationDelegate.mm: (-[WKPaymentAuthorizationDelegate completePaymentMethodSelection:]): (-[WKPaymentAuthorizationDelegate completePaymentSession:errors:didReachFinalState:]): (-[WKPaymentAuthorizationDelegate completeShippingContactSelection:summaryItems:shippingMethods:errors:]): (-[WKPaymentAuthorizationDelegate completeShippingMethodSelection:]): * Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm: (WebKit::WebPaymentCoordinatorProxy::platformCanMakePaymentsWithActiveCard): (WebKit::toPKContactFields): (WebKit::toNSSet): (WebKit::WebPaymentCoordinatorProxy::platformPaymentRequest): (WebKit::toPKAddressField): Deleted. Source/WTF: * wtf/FeatureDefines.h: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/FeatureDefines.h trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/pal/cocoa/PassKitSoftLink.h trunk/Source/WebCore/PAL/pal/cocoa/PassKitSoftLink.mm trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationPresenter.mm trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationViewController.mm trunk/Source/WebKit/Platform/cocoa/WKPaymentAuthorizationDelegate.h trunk/Source/WebKit/Platform/cocoa/WKPaymentAuthorizationDelegate.mm trunk/Source/WebKit/Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm Diff Modified: trunk/Source/WTF/ChangeLog (249313 => 249314) --- trunk/Source/WTF/ChangeLog 2019-08-30 04:35:58 UTC (rev 249313) +++ trunk/Source/WTF/ChangeLog 2019-08-30 05:00:15 UTC (rev 249314) @@ -1,5 +1,18 @@ 2019-08-29 Keith Rollin +Remove HAVE_PASSKIT_GRANULAR_ERRORS conditional +https://bugs.webkit.org/show_bug.cgi?id=201278 + + +Reviewed by Alex Christensen. + +HAVE_PASSKIT_GRANULAR_ERRORS is always True, so remove the conditional +tests, keeping the True branches and removing the False branches. + +* wtf/FeatureDefines.h: + +2019-08-29 Keith Rollin + Update .xcconfig symbols to reflect the current set of past and future product versions. https://bugs.webkit.org/show_bug.cgi?id=200720 Modified: trunk/Source/WTF/wtf/FeatureDefines.h (249313 => 249314) --- trunk/Source/WTF/wtf/FeatureDefines.h 2019-08-30 04:35:58 UTC (rev 249313) +++ trunk/Source/WTF/wtf/FeatureDefines.h 2019-08-30 05:00:15 UTC (rev 249314) @@ -205,10 +205,6 @@ #define ENABLE_MEDIA_SOURCE 0 #endif -#if !defined(HAVE_PASSKIT_GRANULAR_ERRORS) -#define HAVE_PASSKIT_GRANULAR_ERRORS 1 -#endif - #if !defined(HAVE_PASSKIT_API_TYPE) #define HAVE_PASSKIT_API_TYPE 1 #endif @@ -295,10 +291,6 @@ #define ENABLE_MEDIA_SOURCE 1 #endif -#if !defined(HAVE_PASSKIT_GRANULAR_ERRORS) -#define HAVE_PASSKIT_GRANULAR_ERRORS 1 -#endif - #if !defined(HAVE_PASSKIT_API_TYPE) #define HAVE_PASSKIT_API_TYPE 1 #endif Modified: trunk/Source/WebCore/PAL/ChangeLog (249313 => 249314) --- trunk/Source/WebCore/PAL/ChangeLog 2019-08-30 04:35:58 UTC (rev 249313) +++ trunk/Source/WebCore/PAL/ChangeLog 2019-08-30 05:00:15 UTC (rev 249314) @@ -1,5 +1,19 @@ 2019-08-29 Keith Rollin +Remove HAVE_PASSKIT_GRANULAR_ERRORS conditional +https://bugs.webkit.org/show_bug.cgi?id=201278 + + +Reviewed by Alex Christensen. + +HAVE_PASSKIT_GRANULAR_ERRORS is always True, so remove the conditional +tests, keeping the True branches and removing the False branches. + +* pal/cocoa/PassKitSoftLink.h: +* pal/cocoa/PassKitSoftLink.mm: + +2019-08-29 Keith Rollin + Update .xcconfig symbols to reflect the current set of past and future product versions. https://bugs.webkit.org/show_bug.cgi?id=200720
[webkit-changes] [249312] trunk
Title: [249312] trunk Revision 249312 Author krol...@apple.com Date 2019-08-29 21:18:29 -0700 (Thu, 29 Aug 2019) Log Message Update .xcconfig symbols to reflect the current set of past and future product versions. https://bugs.webkit.org/show_bug.cgi?id=200720 Reviewed by Alex Christensen. Remove version symbols related to old OS's we no longer support, ensure that version symbols are defined for OS's we do support. PerformanceTests: * MediaTime/Configurations/Base.xcconfig: * MediaTime/Configurations/DebugRelease.xcconfig: Source/bmalloc: * Configurations/Base.xcconfig: * Configurations/DebugRelease.xcconfig: Source/_javascript_Core: * Configurations/Base.xcconfig: * Configurations/DebugRelease.xcconfig: * Configurations/Version.xcconfig: Source/ThirdParty: * gtest/xcode/Config/DebugProject.xcconfig: * gtest/xcode/Config/ReleaseProject.xcconfig: Source/ThirdParty/ANGLE: * Configurations/Base.xcconfig: * Configurations/DebugRelease.xcconfig: Source/ThirdParty/libwebrtc: * Configurations/Base.xcconfig: * Configurations/DebugRelease.xcconfig: * Configurations/Version.xcconfig: Source/WebCore: No new tests -- no new or changed functionality. * Configurations/Base.xcconfig: * Configurations/DebugRelease.xcconfig: * Configurations/Version.xcconfig: Source/WebCore/PAL: * Configurations/Base.xcconfig: * Configurations/DebugRelease.xcconfig: * Configurations/Version.xcconfig: Source/WebInspectorUI: * Configurations/Base.xcconfig: * Configurations/DebugRelease.xcconfig: * Configurations/Version.xcconfig: Source/WebKit: * Configurations/Base.xcconfig: * Configurations/DebugRelease.xcconfig: * Configurations/Version.xcconfig: Source/WebKitLegacy/mac: * Configurations/Base.xcconfig: * Configurations/DebugRelease.xcconfig: * Configurations/Version.xcconfig: Source/WTF: * Configurations/Base.xcconfig: * Configurations/DebugRelease.xcconfig: Tools: * ContentExtensionTester/Configurations/Base.xcconfig: * ContentExtensionTester/Configurations/DebugRelease.xcconfig: * DumpRenderTree/mac/Configurations/Base.xcconfig: * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig: * ImageDiff/cg/Configurations/Base.xcconfig: * ImageDiff/cg/Configurations/DebugRelease.xcconfig: * MiniBrowser/Configurations/Base.xcconfig: * MiniBrowser/Configurations/DebugRelease.xcconfig: * TestWebKitAPI/Configurations/Base.xcconfig: * TestWebKitAPI/Configurations/DebugRelease.xcconfig: * WebEditingTester/Configurations/Base.xcconfig: * WebEditingTester/Configurations/DebugRelease.xcconfig: * WebKitTestRunner/Configurations/Base.xcconfig: * WebKitTestRunner/Configurations/DebugRelease.xcconfig: * lldb/lldbWebKitTester/Configurations/Base.xcconfig: * lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig: Modified Paths trunk/PerformanceTests/ChangeLog trunk/PerformanceTests/MediaTime/Configurations/Base.xcconfig trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/Base.xcconfig trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig trunk/Source/_javascript_Core/Configurations/Version.xcconfig trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig trunk/Source/ThirdParty/ChangeLog trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig trunk/Source/WTF/ChangeLog trunk/Source/WTF/Configurations/Base.xcconfig trunk/Source/WTF/Configurations/DebugRelease.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/Base.xcconfig trunk/Source/WebCore/Configurations/DebugRelease.xcconfig trunk/Source/WebCore/Configurations/Version.xcconfig trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/Configurations/Base.xcconfig trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig trunk/Source/WebCore/PAL/Configurations/Version.xcconfig trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/Configurations/Base.xcconfig trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig trunk/Source/WebInspectorUI/Configurations/Version.xcconfig trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/Base.xcconfig trunk/Source/WebKit/Configurations/DebugRelease.xcconfig trunk/Source/WebKit/Configurations/Version.xcconfig trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig trunk/Source/bmalloc/ChangeLog trunk/Source/bmalloc/Configurations/Base.xcconfig
[webkit-changes] [249311] trunk/Tools
Title: [249311] trunk/Tools Revision 249311 Author krol...@apple.com Date 2019-08-29 21:16:22 -0700 (Thu, 29 Aug 2019) Log Message Remove empty FontCache.cpp file in TestWebKitAPI https://bugs.webkit.org/show_bug.cgi?id=201277 Reviewed by Alex Christensen. Bug 200694 emptied out the contents of FontCache.cpp. This patch removes the file from the project. * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WebCore/FontCache.cpp: Removed. Modified Paths trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj Removed Paths trunk/Tools/TestWebKitAPI/Tests/WebCore/FontCache.cpp Diff Modified: trunk/Tools/ChangeLog (249310 => 249311) --- trunk/Tools/ChangeLog 2019-08-30 03:28:20 UTC (rev 249310) +++ trunk/Tools/ChangeLog 2019-08-30 04:16:22 UTC (rev 249311) @@ -1,3 +1,17 @@ +2019-08-29 Keith Rollin + +Remove empty FontCache.cpp file in TestWebKitAPI +https://bugs.webkit.org/show_bug.cgi?id=201277 + + +Reviewed by Alex Christensen. + +Bug 200694 emptied out the contents of FontCache.cpp. This patch +removes the file from the project. + +* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: +* TestWebKitAPI/Tests/WebCore/FontCache.cpp: Removed. + 2019-08-29 Aakash Jain [ews-app] Status bubble should only display important messages in pop-over Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (249310 => 249311) --- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2019-08-30 03:28:20 UTC (rev 249310) +++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2019-08-30 04:16:22 UTC (rev 249311) @@ -106,7 +106,6 @@ 1C7FEB20207C0F2E00D23278 /* BackgroundColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C7FEB1F207C0F2D00D23278 /* BackgroundColor.mm */; }; 1C9EB8411E380DA1005C6442 /* ComplexTextController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C9EB8401E380DA1005C6442 /* ComplexTextController.cpp */; }; 1CACADA1230620AE0007D54C /* WKWebViewOpaque.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CACADA0230620AD0007D54C /* WKWebViewOpaque.mm */; }; - 1CAD1F861E5CE7DA00AF2C2C /* FontCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD1F851E5CE7DA00AF2C2C /* FontCache.cpp */; }; 1CF59AE221E68925006E37EC /* ForceLightAppearanceInBundle_Bundle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CF59AE021E68925006E37EC /* ForceLightAppearanceInBundle_Bundle.mm */; }; 1CF59AE321E68932006E37EC /* ForceLightAppearanceInBundle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CF59ADF21E68925006E37EC /* ForceLightAppearanceInBundle.mm */; }; 1CF59AE521E6977D006E37EC /* dark-mode.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1CF59AE421E696FB006E37EC /* dark-mode.html */; }; @@ -1524,7 +1523,6 @@ 1C7FEB1F207C0F2D00D23278 /* BackgroundColor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BackgroundColor.mm; sourceTree = ""; }; 1C9EB8401E380DA1005C6442 /* ComplexTextController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComplexTextController.cpp; sourceTree = ""; }; 1CACADA0230620AD0007D54C /* WKWebViewOpaque.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewOpaque.mm; sourceTree = ""; }; - 1CAD1F851E5CE7DA00AF2C2C /* FontCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontCache.cpp; sourceTree = ""; }; 1CB9BC371A67482300FE5678 /* WeakPtr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WeakPtr.cpp; sourceTree = ""; }; 1CF0D3781BBF2F3D00B4EF54 /* WKRetainPtr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKRetainPtr.cpp; sourceTree = ""; }; 1CF59ADF21E68925006E37EC /* ForceLightAppearanceInBundle.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ForceLightAppearanceInBundle.mm; sourceTree = ""; }; @@ -2979,7 +2977,6 @@ 7A909A701D877475007E10F8 /* FloatPoint.cpp */, 7A909A711D877475007E10F8 /* FloatRect.cpp */, 7A909A721D877475007E10F8 /* FloatSize.cpp */, -1CAD1F851E5CE7DA00AF2C2C /* FontCache.cpp */, 8E4A85361E1D1AA100F53B0F /* GridPosition.cpp */, 83B88A331C80056D00BB2418 /* HTMLParserIdioms.cpp */, 5CA1DEC71F71F40700E71BD3 /* HTTPHeaderField.cpp */, @@ -4493,7 +4490,6 @@ 7A909A801D877480007E10F8 /* FloatSize.cpp in Sources */, F4BC0B142146C849002A0478 /* FocusPreservationTests.mm in Sources */, 2E92B8FA2164A0C1005B64F0 /* FontAttributes.mm in Sources */, -1CAD1F861E5CE7DA00AF2C2C /* FontCache.cpp in Sources */, F456AB1C213EDBA300CB2CEF /* FontManagerTests.mm in Sources */, 1CF59AE321E68932006E37EC
[webkit-changes] [249308] trunk/Source/WebKit
Title: [249308] trunk/Source/WebKit Revision 249308 Author krol...@apple.com Date 2019-08-29 18:57:01 -0700 (Thu, 29 Aug 2019) Log Message Invalid XPCServices symlinks are being created https://bugs.webkit.org/show_bug.cgi?id=201320 Reviewed by Dan Bernstein. When performing incremental builds, errant XPCServices symlinks can be created. For example, in the following, the second symlink is the correct one. The first symlink gets created when the build process tries to create the symlink and it already exists. When it already exists, the command to create the symlink actually follows the existing symlink and creates the (second) symlink at the location where the first symlink points. WebKit.framework/Versions/A/XPCServices/XPCServices@ -> Versions/Current/XPCServices WebKit.framework/XPCServices@ -> Versions/Current/XPCServices Address this by specifying -h to the `ln` command, which will cause it to not follow symlinks if they already exist at the target. Also, fix a benign issue where the Xcode build variable WRAPPER_NAME was being referenced in a context where it wasn't defined. * WebKit.xcodeproj/project.pbxproj: Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj Diff Modified: trunk/Source/WebKit/ChangeLog (249307 => 249308) --- trunk/Source/WebKit/ChangeLog 2019-08-30 01:40:58 UTC (rev 249307) +++ trunk/Source/WebKit/ChangeLog 2019-08-30 01:57:01 UTC (rev 249308) @@ -1,3 +1,30 @@ +2019-08-29 Keith Rollin + +Invalid XPCServices symlinks are being created +https://bugs.webkit.org/show_bug.cgi?id=201320 + + +Reviewed by Dan Bernstein. + +When performing incremental builds, errant XPCServices symlinks can be +created. For example, in the following, the second symlink is the +correct one. The first symlink gets created when the build process +tries to create the symlink and it already exists. When it already +exists, the command to create the symlink actually follows the +existing symlink and creates the (second) symlink at the location +where the first symlink points. + +WebKit.framework/Versions/A/XPCServices/XPCServices@ -> Versions/Current/XPCServices +WebKit.framework/XPCServices@ -> Versions/Current/XPCServices + +Address this by specifying -h to the `ln` command, which will cause it +to not follow symlinks if they already exist at the target. + +Also, fix a benign issue where the Xcode build variable WRAPPER_NAME +was being referenced in a context where it wasn't defined. + +* WebKit.xcodeproj/project.pbxproj: + 2019-08-29 Alex Christensen Speculative loads should use the NetworkSession owning their Cache Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (249307 => 249308) --- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-08-30 01:40:58 UTC (rev 249307) +++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-08-30 01:57:01 UTC (rev 249308) @@ -11086,11 +11086,11 @@ ); name = "Add XPCServices symlink"; outputPaths = ( -"$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/WebKit.framework/XPCServices", +"$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [[ ${WK_PLATFORM_NAME} == macosx ]]; then\nln -sf \"Versions/Current/XPCServices\" \"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\";\nfi\n"; + shellScript = "if [[ ${WK_PLATFORM_NAME} == macosx ]]; then\nln -sfh \"Versions/Current/XPCServices\" \"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\";\nfi\n"; }; C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = { isa = PBXShellScriptBuildPhase; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [249304] trunk/Source
Title: [249304] trunk/Source Revision 249304 Author krol...@apple.com Date 2019-08-29 17:39:31 -0700 (Thu, 29 Aug 2019) Log Message Remove 32-bit macOS support https://bugs.webkit.org/show_bug.cgi?id=201282 Reviewed by Anders Carlsson. WebKit doesn’t support 32-bit Mac any more, so remove checks and code for that platform. Source/_javascript_Core: * API/JSBase.h: * runtime/VM.h: Source/WTF: * wtf/Platform.h: Modified Paths trunk/Source/_javascript_Core/API/JSBase.h trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/runtime/VM.h trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Platform.h Diff Modified: trunk/Source/_javascript_Core/API/JSBase.h (249303 => 249304) --- trunk/Source/_javascript_Core/API/JSBase.h 2019-08-30 00:17:41 UTC (rev 249303) +++ trunk/Source/_javascript_Core/API/JSBase.h 2019-08-30 00:39:31 UTC (rev 249304) @@ -145,7 +145,7 @@ /* Enable the Objective-C API for platforms with a modern runtime. NOTE: This is duplicated in VM.h. */ #if !defined(JSC_OBJC_API_ENABLED) -#if (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE))) +#if (defined(__clang__) && defined(__APPLE__) && (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE))) #define JSC_OBJC_API_ENABLED 1 #else #define JSC_OBJC_API_ENABLED 0 Modified: trunk/Source/_javascript_Core/ChangeLog (249303 => 249304) --- trunk/Source/_javascript_Core/ChangeLog 2019-08-30 00:17:41 UTC (rev 249303) +++ trunk/Source/_javascript_Core/ChangeLog 2019-08-30 00:39:31 UTC (rev 249304) @@ -1,5 +1,19 @@ 2019-08-29 Keith Rollin +Remove 32-bit macOS support +https://bugs.webkit.org/show_bug.cgi?id=201282 + + +Reviewed by Anders Carlsson. + +WebKit doesn’t support 32-bit Mac any more, so remove checks and code +for that platform. + +* API/JSBase.h: +* runtime/VM.h: + +2019-08-29 Keith Rollin + Remove support for macOS < 10.13 (part 3) https://bugs.webkit.org/show_bug.cgi?id=201224 Modified: trunk/Source/_javascript_Core/runtime/VM.h (249303 => 249304) --- trunk/Source/_javascript_Core/runtime/VM.h 2019-08-30 00:17:41 UTC (rev 249303) +++ trunk/Source/_javascript_Core/runtime/VM.h 2019-08-30 00:39:31 UTC (rev 249304) @@ -85,7 +85,7 @@ // Enable the Objective-C API for platforms with a modern runtime. This has to match exactly what we // have in JSBase.h. #if !defined(JSC_OBJC_API_ENABLED) -#if (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE))) +#if (defined(__clang__) && defined(__APPLE__) && (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE))) #define JSC_OBJC_API_ENABLED 1 #else #define JSC_OBJC_API_ENABLED 0 Modified: trunk/Source/WTF/ChangeLog (249303 => 249304) --- trunk/Source/WTF/ChangeLog 2019-08-30 00:17:41 UTC (rev 249303) +++ trunk/Source/WTF/ChangeLog 2019-08-30 00:39:31 UTC (rev 249304) @@ -1,3 +1,16 @@ +2019-08-29 Keith Rollin + +Remove 32-bit macOS support +https://bugs.webkit.org/show_bug.cgi?id=201282 + + +Reviewed by Anders Carlsson. + +WebKit doesn’t support 32-bit Mac any more, so remove checks and code +for that platform. + +* wtf/Platform.h: + 2019-08-29 Chris Dumez CompletionHandler default constructor does not initialize `m_wasConstructedOnMainThread` Modified: trunk/Source/WTF/wtf/Platform.h (249303 => 249304) --- trunk/Source/WTF/wtf/Platform.h 2019-08-30 00:17:41 UTC (rev 249303) +++ trunk/Source/WTF/wtf/Platform.h 2019-08-30 00:39:31 UTC (rev 249304) @@ -1481,7 +1481,7 @@ #define HAVE_SAFARI_SERVICES_FRAMEWORK 1 #endif -#if (PLATFORM(MAC) && !defined(__i386__)) || PLATFORM(IOS) || PLATFORM(WATCHOS) +#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(WATCHOS) #define HAVE_SAFE_BROWSING 1 #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [249302] trunk/Source/WebCore
Title: [249302] trunk/Source/WebCore Revision 249302 Author krol...@apple.com Date 2019-08-29 17:02:11 -0700 (Thu, 29 Aug 2019) Log Message Remove CCBigNum fallback code https://bugs.webkit.org/show_bug.cgi?id=201250 Reviewed by Jiewen Tan. Bug 184637 added support for CCRSAGetCRTComponents, falling back to the older CCBigNum code if CCRSAGetCRTComponents was not available. We now only support OS's that have CCRSAGetCRTComponents so remove the fallback code. Source/WebCore: No new tests -- no new or changed functionality. * crypto/CommonCryptoUtilities.cpp: (WebCore::CCBigNum::CCBigNum): Deleted. (WebCore::CCBigNum::~CCBigNum): Deleted. (WebCore::CCBigNum::operator=): Deleted. (WebCore::CCBigNum::data const): Deleted. (WebCore::CCBigNum::operator- const): Deleted. (WebCore::CCBigNum::operator% const): Deleted. (WebCore::CCBigNum::inverse const): Deleted. * crypto/CommonCryptoUtilities.h: * crypto/mac/CryptoKeyRSAMac.cpp: (WebCore::getPrivateKeyComponents): Source/WebCore/PAL: * pal/spi/cocoa/CommonCryptoSPI.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/pal/spi/cocoa/CommonCryptoSPI.h trunk/Source/WebCore/crypto/CommonCryptoUtilities.cpp trunk/Source/WebCore/crypto/CommonCryptoUtilities.h trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (249301 => 249302) --- trunk/Source/WebCore/ChangeLog 2019-08-29 23:56:12 UTC (rev 249301) +++ trunk/Source/WebCore/ChangeLog 2019-08-30 00:02:11 UTC (rev 249302) @@ -1,3 +1,30 @@ +2019-08-29 Keith Rollin + +Remove CCBigNum fallback code +https://bugs.webkit.org/show_bug.cgi?id=201250 + + +Reviewed by Jiewen Tan. + +Bug 184637 added support for CCRSAGetCRTComponents, falling back to +the older CCBigNum code if CCRSAGetCRTComponents was not available. We +now only support OS's that have CCRSAGetCRTComponents so remove the +fallback code. + +No new tests -- no new or changed functionality. + +* crypto/CommonCryptoUtilities.cpp: +(WebCore::CCBigNum::CCBigNum): Deleted. +(WebCore::CCBigNum::~CCBigNum): Deleted. +(WebCore::CCBigNum::operator=): Deleted. +(WebCore::CCBigNum::data const): Deleted. +(WebCore::CCBigNum::operator- const): Deleted. +(WebCore::CCBigNum::operator% const): Deleted. +(WebCore::CCBigNum::inverse const): Deleted. +* crypto/CommonCryptoUtilities.h: +* crypto/mac/CryptoKeyRSAMac.cpp: +(WebCore::getPrivateKeyComponents): + 2019-08-29 Zalan Bujtas [LFC][TFC] Initialize display boxes. Modified: trunk/Source/WebCore/PAL/ChangeLog (249301 => 249302) --- trunk/Source/WebCore/PAL/ChangeLog 2019-08-29 23:56:12 UTC (rev 249301) +++ trunk/Source/WebCore/PAL/ChangeLog 2019-08-30 00:02:11 UTC (rev 249302) @@ -1,5 +1,20 @@ 2019-08-29 Keith Rollin +Remove CCBigNum fallback code +https://bugs.webkit.org/show_bug.cgi?id=201250 + + +Reviewed by Jiewen Tan. + +Bug 184637 added support for CCRSAGetCRTComponents, falling back to +the older CCBigNum code if CCRSAGetCRTComponents was not available. We +now only support OS's that have CCRSAGetCRTComponents so remove the +fallback code. + +* pal/spi/cocoa/CommonCryptoSPI.h: + +2019-08-29 Keith Rollin + Remove support for macOS < 10.13 (part 3) https://bugs.webkit.org/show_bug.cgi?id=201224 Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/CommonCryptoSPI.h (249301 => 249302) --- trunk/Source/WebCore/PAL/pal/spi/cocoa/CommonCryptoSPI.h 2019-08-29 23:56:12 UTC (rev 249301) +++ trunk/Source/WebCore/PAL/pal/spi/cocoa/CommonCryptoSPI.h 2019-08-30 00:02:11 UTC (rev 249302) @@ -25,20 +25,14 @@ #pragma once -#if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 11) || PLATFORM(MAC) -#define HAVE_CCRSAGetCRTComponents 1 -#endif +#if USE(APPLE_INTERNAL_SDK) -#if USE(APPLE_INTERNAL_SDK) #include #include #include #include #include - -#if HAVE(CCRSAGetCRTComponents) #include -#endif #else @@ -80,10 +74,8 @@ extern "C" CCCryptorStatus CCRSACryptorImport(const void *keyPackage, size_t keyPackageLen, CCRSACryptorRef *key); extern "C" CCCryptorStatus CCRSACryptorExport(CCRSACryptorRef key, void *out, size_t *outLen); -#if HAVE(CCRSAGetCRTComponents) extern "C" CCCryptorStatus CCRSAGetCRTComponentsSizes(CCRSACryptorRef rsaKey, size_t *dpSize, size_t *dqSize, size_t *qinvSize); extern "C" CCCryptorStatus CCRSAGetCRTComponents(CCRSACryptorRef rsaKey, void *dp, size_t dpSize, void *dq, size_t dqSize, void *qinv, size_t qinvSize); -#endif #ifndef _CC_ECCRYPTOR_H_ enum { Modified: trunk/Source/WebCore/crypto/CommonCryptoUtilities.cpp (249301 => 249302) --- trunk/Source/WebCore/crypto/CommonCryptoUtilities.cpp 2019-08-29 23:56:12 UTC (rev 249301) +++
[webkit-changes] [249286] trunk
Title: [249286] trunk Revision 249286 Author krol...@apple.com Date 2019-08-29 12:22:22 -0700 (Thu, 29 Aug 2019) Log Message Remove support for macOS < 10.13 (part 3) https://bugs.webkit.org/show_bug.cgi?id=201224 Reviewed by Darin Adler. Remove symbols in WebKitTargetConditionals.xcconfig related to macOS 10.13, including WK_MACOS_1013 and WK_MACOS_BEFORE_1013, and suffixes like _MACOS_SINCE_1013. Source/_javascript_Core: * Configurations/WebKitTargetConditionals.xcconfig: Source/ThirdParty/libwebrtc: * Configurations/WebKitTargetConditionals.xcconfig: Source/WebCore: No new tests -- no new or changed functionality. * Configurations/WebKitTargetConditionals.xcconfig: Source/WebCore/PAL: * Configurations/WebKitTargetConditionals.xcconfig: Source/WebInspectorUI: Also added some macOS target numbers. * Configurations/WebKitTargetConditionals.xcconfig: Source/WebKit: * Configurations/WebKitTargetConditionals.xcconfig: Source/WebKitLegacy/mac: * Configurations/WebKitTargetConditionals.xcconfig: Tools: Also added some macOS target numbers. * TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/WebKitTargetConditionals.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig trunk/Source/WebCore/PAL/ChangeLog trunk/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/Configurations/WebKitTargetConditionals.xcconfig trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig Diff Modified: trunk/Source/_javascript_Core/ChangeLog (249285 => 249286) --- trunk/Source/_javascript_Core/ChangeLog 2019-08-29 18:40:23 UTC (rev 249285) +++ trunk/Source/_javascript_Core/ChangeLog 2019-08-29 19:22:22 UTC (rev 249286) @@ -1,3 +1,17 @@ +2019-08-29 Keith Rollin + +Remove support for macOS < 10.13 (part 3) +https://bugs.webkit.org/show_bug.cgi?id=201224 + + +Reviewed by Darin Adler. + +Remove symbols in WebKitTargetConditionals.xcconfig related to macOS +10.13, including WK_MACOS_1013 and WK_MACOS_BEFORE_1013, and suffixes +like _MACOS_SINCE_1013. + +* Configurations/WebKitTargetConditionals.xcconfig: + 2019-08-29 Mark Lam Remove a bad assertion in ByteCodeParser::inlineCall(). Modified: trunk/Source/_javascript_Core/Configurations/WebKitTargetConditionals.xcconfig (249285 => 249286) --- trunk/Source/_javascript_Core/Configurations/WebKitTargetConditionals.xcconfig 2019-08-29 18:40:23 UTC (rev 249285) +++ trunk/Source/_javascript_Core/Configurations/WebKitTargetConditionals.xcconfig 2019-08-29 19:22:22 UTC (rev 249286) @@ -48,40 +48,18 @@ // macOS -WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR)); -WK_MACOS_BEFORE_1013_101200 = YES; - WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR)); -WK_MACOS_BEFORE_1014_101200 = YES; WK_MACOS_BEFORE_1014_101300 = YES; WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR)); -WK_MACOS_BEFORE_1015_101200 = YES; WK_MACOS_BEFORE_1015_101300 = YES; WK_MACOS_BEFORE_1015_101400 = YES; WK_MACOS_BEFORE_1016 = $(WK_MACOS_BEFORE_1016_$(TARGET_MAC_OS_X_VERSION_MAJOR)); -WK_MACOS_BEFORE_1016_101200 = YES; WK_MACOS_BEFORE_1016_101300 = YES; WK_MACOS_BEFORE_1016_101400 = YES; WK_MACOS_BEFORE_1016_101500 = YES; -WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013)); -WK_MACOS_1013_ = _MACOS_SINCE_1013; -WK_MACOS_1013_YES = _MACOS_BEFORE_1013; - -WK_MACOS_1013_1014 = $(WK_MACOS_1013_1014_$(WK_MACOS_BEFORE_1013)); -WK_MACOS_1013_1014_ = $(WK_MACOS_1014); -WK_MACOS_1013_1014_YES = _MACOS_BEFORE_1013; - -WK_MACOS_1013_1015 = $(WK_MACOS_1013_1015_$(WK_MACOS_BEFORE_1013)); -WK_MACOS_1013_1015_ = $(WK_MACOS_1015); -WK_MACOS_1013_1015_YES = _MACOS_BEFORE_1013; - -WK_MACOS_1013_1016 = $(WK_MACOS_1013_1016_$(WK_MACOS_BEFORE_1013)); -WK_MACOS_1013_1016_ = $(WK_MACOS_1016); -WK_MACOS_1013_1016_YES = _MACOS_BEFORE_1013; - WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014)); WK_MACOS_1014_ = _MACOS_SINCE_1014; WK_MACOS_1014_YES = _MACOS_BEFORE_1014; Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (249285 => 249286) --- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2019-08-29 18:40:23 UTC (rev 249285) +++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2019-08-29 19:22:22 UTC (rev 249286) @@ -1,3 +1,17 @@ +2019-08-29 Keith Rollin + +Remove support for