- Revision
- 274735
- Author
- [email protected]
- Date
- 2021-03-19 13:18:05 -0700 (Fri, 19 Mar 2021)
Log Message
Web Inspector: remove unnecessary inspectorBaseURL() and assumed read access
https://bugs.webkit.org/show_bug.cgi?id=223526
Reviewed by Devin Rousso.
inspectorBaseURL() is only used to call WebProcess::assumeReadAccessToBaseURL, which
generates a sandbox extension. However, after r274697, all ports now use non-file:///
schemes to load inspector resources, so any needed sandbox extensions are handled in
port-specific code or by the URL scheme handler.
* UIProcess/Inspector/RemoteWebInspectorProxy.cpp:
(WebKit::RemoteWebInspectorProxy::createFrontendPageAndWindow):
* UIProcess/Inspector/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::createFrontendPage):
(WebKit::WebInspectorProxy::inspectorBaseURL): Deleted.
* UIProcess/Inspector/WebInspectorProxy.h:
* UIProcess/Inspector/gtk/WebInspectorProxyGtk.cpp:
(WebKit::WebInspectorProxy::inspectorPageURL):
(WebKit::WebInspectorProxy::inspectorTestPageURL):
(WebKit::WebInspectorProxy::inspectorBaseURL): Deleted.
* UIProcess/Inspector/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::inspectorBaseURL): Deleted.
* UIProcess/Inspector/win/WebInspectorProxyWin.cpp:
(WebKit::WebInspectorProxy::inspectorBaseURL): Deleted.
* mac/WebKit2.order:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (274734 => 274735)
--- trunk/Source/WebKit/ChangeLog 2021-03-19 19:55:02 UTC (rev 274734)
+++ trunk/Source/WebKit/ChangeLog 2021-03-19 20:18:05 UTC (rev 274735)
@@ -1,3 +1,31 @@
+2021-03-19 BJ Burg <[email protected]>
+
+ Web Inspector: remove unnecessary inspectorBaseURL() and assumed read access
+ https://bugs.webkit.org/show_bug.cgi?id=223526
+
+ Reviewed by Devin Rousso.
+
+ inspectorBaseURL() is only used to call WebProcess::assumeReadAccessToBaseURL, which
+ generates a sandbox extension. However, after r274697, all ports now use non-file:///
+ schemes to load inspector resources, so any needed sandbox extensions are handled in
+ port-specific code or by the URL scheme handler.
+
+ * UIProcess/Inspector/RemoteWebInspectorProxy.cpp:
+ (WebKit::RemoteWebInspectorProxy::createFrontendPageAndWindow):
+ * UIProcess/Inspector/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::createFrontendPage):
+ (WebKit::WebInspectorProxy::inspectorBaseURL): Deleted.
+ * UIProcess/Inspector/WebInspectorProxy.h:
+ * UIProcess/Inspector/gtk/WebInspectorProxyGtk.cpp:
+ (WebKit::WebInspectorProxy::inspectorPageURL):
+ (WebKit::WebInspectorProxy::inspectorTestPageURL):
+ (WebKit::WebInspectorProxy::inspectorBaseURL): Deleted.
+ * UIProcess/Inspector/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::inspectorBaseURL): Deleted.
+ * UIProcess/Inspector/win/WebInspectorProxyWin.cpp:
+ (WebKit::WebInspectorProxy::inspectorBaseURL): Deleted.
+ * mac/WebKit2.order:
+
2021-03-19 Jer Noble <[email protected]>
[GPUP] platform/mac/media/encrypted-media/fps-clearkey-crash.html is a flaky timeout
Modified: trunk/Source/WebKit/UIProcess/Inspector/RemoteWebInspectorProxy.cpp (274734 => 274735)
--- trunk/Source/WebKit/UIProcess/Inspector/RemoteWebInspectorProxy.cpp 2021-03-19 19:55:02 UTC (rev 274734)
+++ trunk/Source/WebKit/UIProcess/Inspector/RemoteWebInspectorProxy.cpp 2021-03-19 20:18:05 UTC (rev 274735)
@@ -185,7 +185,6 @@
trackInspectorPage(m_inspectorPage, nullptr);
m_inspectorPage->process().addMessageReceiver(Messages::RemoteWebInspectorProxy::messageReceiverName(), m_inspectorPage->webPageID(), *this);
- m_inspectorPage->process().assumeReadAccessToBaseURL(*m_inspectorPage, WebInspectorProxy::inspectorBaseURL());
#if ENABLE(INSPECTOR_EXTENSIONS)
m_extensionController = WebInspectorUIExtensionControllerProxy::create(*m_inspectorPage);
Modified: trunk/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp (274734 => 274735)
--- trunk/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp 2021-03-19 19:55:02 UTC (rev 274734)
+++ trunk/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp 2021-03-19 20:18:05 UTC (rev 274735)
@@ -423,7 +423,6 @@
m_inspectedPage->launchInitialProcessIfNecessary();
m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->identifier(), *this);
- m_inspectorPage->process().assumeReadAccessToBaseURL(*m_inspectorPage, WebInspectorProxy::inspectorBaseURL());
#if ENABLE(INSPECTOR_EXTENSIONS)
m_extensionController = WebInspectorUIExtensionControllerProxy::create(*m_inspectorPage);
@@ -870,12 +869,6 @@
return String();
}
-String WebInspectorProxy::inspectorBaseURL()
-{
- notImplemented();
- return String();
-}
-
DebuggableInfoData WebInspectorProxy::infoForLocalDebuggable()
{
notImplemented();
Modified: trunk/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.h (274734 => 274735)
--- trunk/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.h 2021-03-19 19:55:02 UTC (rev 274734)
+++ trunk/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.h 2021-03-19 20:18:05 UTC (rev 274735)
@@ -186,7 +186,6 @@
// Provided by platform WebInspectorProxy implementations.
static String inspectorPageURL();
static String inspectorTestPageURL();
- static String inspectorBaseURL();
static bool isMainOrTestInspectorPage(const URL&);
static DebuggableInfoData infoForLocalDebuggable();
Modified: trunk/Source/WebKit/UIProcess/Inspector/gtk/WebInspectorProxyGtk.cpp (274734 => 274735)
--- trunk/Source/WebKit/UIProcess/Inspector/gtk/WebInspectorProxyGtk.cpp 2021-03-19 19:55:02 UTC (rev 274734)
+++ trunk/Source/WebKit/UIProcess/Inspector/gtk/WebInspectorProxyGtk.cpp 2021-03-19 20:18:05 UTC (rev 274735)
@@ -385,19 +385,14 @@
String WebInspectorProxy::inspectorPageURL()
{
- return String("resource:///org/webkit/inspector/UserInterface/Main.html");
+ return "resource:///org/webkit/inspector/UserInterface/Main.html"_s;
}
String WebInspectorProxy::inspectorTestPageURL()
{
- return String("resource:///org/webkit/inspector/UserInterface/Test.html");
+ return "resource:///org/webkit/inspector/UserInterface/Test.html"_s;
}
-String WebInspectorProxy::inspectorBaseURL()
-{
- return String("resource:///org/webkit/inspector/UserInterface/");
-}
-
DebuggableInfoData WebInspectorProxy::infoForLocalDebuggable()
{
// FIXME <https://webkit.org/b/205536>: this should infer more useful data about the debug target.
Modified: trunk/Source/WebKit/UIProcess/Inspector/mac/WebInspectorProxyMac.mm (274734 => 274735)
--- trunk/Source/WebKit/UIProcess/Inspector/mac/WebInspectorProxyMac.mm 2021-03-19 19:55:02 UTC (rev 274734)
+++ trunk/Source/WebKit/UIProcess/Inspector/mac/WebInspectorProxyMac.mm 2021-03-19 20:18:05 UTC (rev 274735)
@@ -787,11 +787,6 @@
return [WKInspectorViewController URLForInspectorResource:@"Test.html"].absoluteString;
}
-String WebInspectorProxy::inspectorBaseURL()
-{
- return [WKInspectorViewController URLForInspectorResource:@""].absoluteString;
-}
-
static NSDictionary *systemVersionPlist()
{
NSString *systemLibraryPath = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSSystemDomainMask, YES) objectAtIndex:0];
Modified: trunk/Source/WebKit/UIProcess/Inspector/win/WebInspectorProxyWin.cpp (274734 => 274735)
--- trunk/Source/WebKit/UIProcess/Inspector/win/WebInspectorProxyWin.cpp 2021-03-19 19:55:02 UTC (rev 274734)
+++ trunk/Source/WebKit/UIProcess/Inspector/win/WebInspectorProxyWin.cpp 2021-03-19 20:18:05 UTC (rev 274735)
@@ -287,16 +287,6 @@
#endif
}
-String WebInspectorProxy::inspectorBaseURL()
-{
-#if USE(CF)
- RetainPtr<CFURLRef> baseURLRef = adoptCF(CFBundleCopyResourceURL(WebCore::webKitBundle(), CFSTR("WebInspectorUI"), nullptr, nullptr));
- return CFURLGetString(baseURLRef.get());
-#else
- return { };
-#endif
-}
-
DebuggableInfoData WebInspectorProxy::infoForLocalDebuggable()
{
// FIXME <https://webkit.org/b/205537>: this should infer more useful data.
Modified: trunk/Source/WebKit/mac/WebKit2.order (274734 => 274735)
--- trunk/Source/WebKit/mac/WebKit2.order 2021-03-19 19:55:02 UTC (rev 274734)
+++ trunk/Source/WebKit/mac/WebKit2.order 2021-03-19 20:18:05 UTC (rev 274735)
@@ -7826,7 +7826,6 @@
__ZNK6WebKit17WebInspectorProxy16inspectorPageURLEv
__ZN6WebKitL38inspectorReallyUsesWebKitUserInterfaceEPNS_14WebPreferencesE
__ZN6WebKit17ChildProcessProxy4sendIN8Messages12WebInspector14AttachedBottomEEEbRKT_yj
-__ZNK6WebKit17WebInspectorProxy16inspectorBaseURLEv
__ZN6WebKitL31decidePolicyForNavigationActionEPK12OpaqueWKPagePK13OpaqueWKFramejjiPK18OpaqueWKURLRequestPK27OpaqueWKFramePolicyListenerPKvSD_
__ZN6WebKitL21exceededDatabaseQuotaEPK12OpaqueWKPagePK13OpaqueWKFramePK22OpaqueWKSecurityOriginPK14OpaqueWKStringSB_yyyyPKv
__ZThn16_N6WebKit17WebInspectorProxy17didReceiveMessageEPN7CoreIPC10ConnectionERNS1_14MessageDecoderE
