Changeset 277417 in webkit

Timestamp:

May 12, 2021, 7:35:32 PM (5 years ago)

Author:

Fujii Hironori

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 "\".

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Inspector/win/InspectorResourceURLSchemeHandler.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-05-12  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [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  <bfulgham@apple.com>
 

trunk/Source/WebKit/UIProcess/Inspector/win/InspectorResourceURLSchemeHandler.cpp

@@ -45 +45 @@
     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);