Title: [277417] trunk/Source/WebKit
- Revision
- 277417
- Author
- [email protected]
- Date
- 2021-05-12 19:35:32 -0700 (Wed, 12 May 2021)
Log Message
[WinCairo] Failed to open WebInspector UI since r277231
https://bugs.webkit.org/show_bug.cgi?id=225715
Reviewed by Don Olmstead.
Windows WebKit2 failed to open WebInspector UI after r277231
changed Filesystem::pathByAppendingComponent.
"inspector-resource:///Main.html" was wrongly mapped to
"C:\\Main.html".
requestURL.fileSystemPath() returns "\Main.html". The preceding
"\" should be removed before concatenating it with the bundle path
by using FileSystem::pathByAppendingComponent.
* UIProcess/Inspector/win/InspectorResourceURLSchemeHandler.cpp:
(WebKit::InspectorResourceURLSchemeHandler::platformStartTask): Removed the preceding "\".
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (277416 => 277417)
--- trunk/Source/WebKit/ChangeLog 2021-05-13 01:13:33 UTC (rev 277416)
+++ trunk/Source/WebKit/ChangeLog 2021-05-13 02:35:32 UTC (rev 277417)
@@ -1,3 +1,22 @@
+2021-05-12 Fujii Hironori <[email protected]>
+
+ [WinCairo] Failed to open WebInspector UI since r277231
+ https://bugs.webkit.org/show_bug.cgi?id=225715
+
+ Reviewed by Don Olmstead.
+
+ Windows WebKit2 failed to open WebInspector UI after r277231
+ changed Filesystem::pathByAppendingComponent.
+ "inspector-resource:///Main.html" was wrongly mapped to
+ "C:\\Main.html".
+
+ requestURL.fileSystemPath() returns "\Main.html". The preceding
+ "\" should be removed before concatenating it with the bundle path
+ by using FileSystem::pathByAppendingComponent.
+
+ * UIProcess/Inspector/win/InspectorResourceURLSchemeHandler.cpp:
+ (WebKit::InspectorResourceURLSchemeHandler::platformStartTask): Removed the preceding "\".
+
2021-05-12 Brent Fulgham <[email protected]>
[Cocoa] Permit sysctl-read operations needed by Metal and other system frameworks
Modified: trunk/Source/WebKit/UIProcess/Inspector/win/InspectorResourceURLSchemeHandler.cpp (277416 => 277417)
--- trunk/Source/WebKit/UIProcess/Inspector/win/InspectorResourceURLSchemeHandler.cpp 2021-05-13 01:13:33 UTC (rev 277416)
+++ trunk/Source/WebKit/UIProcess/Inspector/win/InspectorResourceURLSchemeHandler.cpp 2021-05-13 02:35:32 UTC (rev 277417)
@@ -44,6 +44,8 @@
#if USE(CF) && USE(CURL)
auto& requestURL = task.request().url();
auto requestPath = requestURL.fileSystemPath();
+ if (requestPath.startsWith("\\"))
+ requestPath.remove(0);
auto path = URL(adoptCF(CFBundleCopyBundleURL(WebCore::webKitBundle())).get()).fileSystemPath();
path = FileSystem::pathByAppendingComponent(path, "WebInspectorUI"_s);
path = FileSystem::pathByAppendingComponent(path, requestPath);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
