Title: [238806] trunk/Source/WebInspectorUI
- Revision
- 238806
- Author
- [email protected]
- Date
- 2018-12-03 11:13:17 -0800 (Mon, 03 Dec 2018)
Log Message
Web Inspector: resource combining should be more robust against missing WebKitAdditions
https://bugs.webkit.org/show_bug.cgi?id=192255
<rdar://problem/46042879>
Reviewed by Joseph Pecoraro.
* Scripts/copy-user-interface-resources.pl:
(combineOrStripResourcesForWebKitAdditions):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (238805 => 238806)
--- trunk/Source/WebInspectorUI/ChangeLog 2018-12-03 19:11:28 UTC (rev 238805)
+++ trunk/Source/WebInspectorUI/ChangeLog 2018-12-03 19:13:17 UTC (rev 238806)
@@ -1,3 +1,14 @@
+2018-11-30 Brian Burg <[email protected]>
+
+ Web Inspector: resource combining should be more robust against missing WebKitAdditions
+ https://bugs.webkit.org/show_bug.cgi?id=192255
+ <rdar://problem/46042879>
+
+ Reviewed by Joseph Pecoraro.
+
+ * Scripts/copy-user-interface-resources.pl:
+ (combineOrStripResourcesForWebKitAdditions):
+
2018-11-30 Nikita Vasilyev <[email protected]>
Web Inspector: Jumping from Computed to Styles should select property
Modified: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (238805 => 238806)
--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2018-12-03 19:11:28 UTC (rev 238805)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2018-12-03 19:13:17 UTC (rev 238806)
@@ -226,8 +226,28 @@
if (!defined $webInspectorUIAdditionsDir) {
debugLog("Didn't define \$webInspectorUIAdditionsDir");
} elsif (-d $webInspectorUIAdditionsDir) {
- $combineWebKitAdditions = 1;
debugLog("Found $webInspectorUIAdditionsDir");
+
+ opendir(DIR, $webInspectorUIAdditionsDir) || die "$!";
+ my @files = grep { !/^\.{1,2}$/ } readdir (DIR);
+ closedir(DIR);
+
+ # The WebKitAdditions/WebInspectorUI directory may exist without any files in it.
+ # Make sure that there is something to be processed in the directory before proceeding.
+ my $foundJSFile = 0;
+ my $foundCSSFile = 0;
+ foreach my $file (@files) {
+ my $path = File::Spec->catdir($$webInspectorUIAdditionsDir, $file);
+ next if -d $path;
+ if ($file =~ /\.js$/) {
+ debugLog("Found a _javascript_ file to combine: $file");
+ $foundJSFile = 1;
+ } elsif ($file =~ /\.css$/) {
+ debugLog("Found a CSS file to combine: $file");
+ $foundCSSFile = 1;
+ }
+ }
+ $combineWebKitAdditions = 1 if $foundCSSFile or $foundJSFile;
} else {
debugLog("Didn't find $webInspectorUIAdditionsDir");
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
