Diff
Modified: trunk/Source/WebCore/ChangeLog (231305 => 231306)
--- trunk/Source/WebCore/ChangeLog 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Source/WebCore/ChangeLog 2018-05-03 16:01:26 UTC (rev 231306)
@@ -1,3 +1,16 @@
+2018-05-03 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r231253.
+
+ The API test added with this change is crashing on the bots.
+
+ Reverted changeset:
+
+ "Web Inspector: opt out of process swap on navigation if a Web
+ Inspector frontend is connected"
+ https://bugs.webkit.org/show_bug.cgi?id=184861
+ https://trac.webkit.org/changeset/231253
+
2018-05-03 Youenn Fablet <[email protected]>
A MediaStream being played should allow removing some of its tracks
Modified: trunk/Source/WebCore/inspector/InspectorClient.h (231305 => 231306)
--- trunk/Source/WebCore/inspector/InspectorClient.h 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Source/WebCore/inspector/InspectorClient.h 2018-05-03 16:01:26 UTC (rev 231306)
@@ -44,7 +44,6 @@
virtual ~InspectorClient() = default;
virtual void inspectedPageDestroyed() = 0;
- virtual void frontendCountChanged(unsigned) { }
virtual Inspector::FrontendChannel* openLocalFrontend(InspectorController*) = 0;
virtual void bringFrontendToFront() = 0;
Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (231305 => 231306)
--- trunk/Source/WebCore/inspector/InspectorController.cpp 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2018-05-03 16:01:26 UTC (rev 231306)
@@ -274,8 +274,6 @@
m_agents.didCreateFrontendAndBackend(&m_frontendRouter.get(), &m_backendDispatcher.get());
}
- m_inspectorClient->frontendCountChanged(m_frontendRouter->frontendCount());
-
#if ENABLE(REMOTE_INSPECTOR)
if (!m_frontendRouter->hasRemoteFrontend())
m_page.remoteInspectorInformationDidChange();
@@ -304,8 +302,6 @@
InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
}
- m_inspectorClient->frontendCountChanged(m_frontendRouter->frontendCount());
-
#if ENABLE(REMOTE_INSPECTOR)
if (!m_frontendRouter->hasFrontends())
m_page.remoteInspectorInformationDidChange();
@@ -342,8 +338,6 @@
m_isAutomaticInspection = false;
m_pauseAfterInitialization = false;
- m_inspectorClient->frontendCountChanged(m_frontendRouter->frontendCount());
-
#if ENABLE(REMOTE_INSPECTOR)
m_page.remoteInspectorInformationDidChange();
#endif
Modified: trunk/Source/WebCore/inspector/InspectorController.h (231305 => 231306)
--- trunk/Source/WebCore/inspector/InspectorController.h 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2018-05-03 16:01:26 UTC (rev 231306)
@@ -94,6 +94,7 @@
WEBCORE_EXPORT void connectFrontend(Inspector::FrontendChannel*, bool isAutomaticInspection = false, bool immediatelyPause = false);
WEBCORE_EXPORT void disconnectFrontend(Inspector::FrontendChannel*);
WEBCORE_EXPORT void disconnectAllFrontends();
+ void setProcessId(long);
void inspect(Node*);
WEBCORE_EXPORT void drawHighlight(GraphicsContext&) const;
Modified: trunk/Source/WebKit/ChangeLog (231305 => 231306)
--- trunk/Source/WebKit/ChangeLog 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Source/WebKit/ChangeLog 2018-05-03 16:01:26 UTC (rev 231306)
@@ -1,3 +1,16 @@
+2018-05-03 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r231253.
+
+ The API test added with this change is crashing on the bots.
+
+ Reverted changeset:
+
+ "Web Inspector: opt out of process swap on navigation if a Web
+ Inspector frontend is connected"
+ https://bugs.webkit.org/show_bug.cgi?id=184861
+ https://trac.webkit.org/changeset/231253
+
2018-05-03 Brent Fulgham <[email protected]>
Re-eneable Network Extension support in the WebContent process
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (231305 => 231306)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-05-03 16:01:26 UTC (rev 231306)
@@ -362,9 +362,6 @@
WebInspectorProxy* inspector() const;
- void didChangeInspectorFrontendCount(unsigned count) { m_inspectorFrontendCount = count; }
- unsigned inspectorFrontendCount() const { return m_inspectorFrontendCount; }
-
bool isControlledByAutomation() const { return m_controlledByAutomation; }
void setControlledByAutomation(bool);
@@ -2012,7 +2009,6 @@
bool m_allowsRemoteInspection { true };
String m_remoteInspectionNameOverride;
#endif
- unsigned m_inspectorFrontendCount { 0 };
#if PLATFORM(COCOA)
bool m_isSmartInsertDeleteEnabled { false };
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (231305 => 231306)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-05-03 16:01:26 UTC (rev 231306)
@@ -410,8 +410,6 @@
DisableInspectorNodeSearch()
#endif
- DidChangeInspectorFrontendCount(uint64_t count)
-
# Search popup menus
SaveRecentSearches(String name, Vector<WebCore::RecentSearch> searchItems)
LoadRecentSearches(String name) -> (Vector<WebCore::RecentSearch> result)
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (231305 => 231306)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-05-03 16:01:26 UTC (rev 231306)
@@ -2070,9 +2070,6 @@
if (!m_configuration->processSwapsOnNavigation())
return page.process();
- if (page.inspectorFrontendCount() > 0)
- return page.process();
-
if (!page.process().hasCommittedAnyProvisionalLoads())
return page.process();
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebInspectorClient.cpp (231305 => 231306)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebInspectorClient.cpp 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebInspectorClient.cpp 2018-05-03 16:01:26 UTC (rev 231306)
@@ -84,11 +84,6 @@
delete this;
}
-void WebInspectorClient::frontendCountChanged(unsigned count)
-{
- m_page->inspectorFrontendCountChanged(count);
-}
-
Inspector::FrontendChannel* WebInspectorClient::openLocalFrontend(InspectorController* controller)
{
m_page->inspector()->openFrontendConnection(controller->isUnderTest());
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebInspectorClient.h (231305 => 231306)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebInspectorClient.h 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebInspectorClient.h 2018-05-03 16:01:26 UTC (rev 231306)
@@ -50,7 +50,6 @@
private:
// WebCore::InspectorClient
void inspectedPageDestroyed() override;
- void frontendCountChanged(unsigned) override;
Inspector::FrontendChannel* openLocalFrontend(WebCore::InspectorController*) override;
void bringFrontendToFront() override;
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (231305 => 231306)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-05-03 16:01:26 UTC (rev 231306)
@@ -3265,11 +3265,6 @@
return m_remoteInspectorUI.get();
}
-void WebPage::inspectorFrontendCountChanged(unsigned count)
-{
- send(Messages::WebPageProxy::DidChangeInspectorFrontendCount(count));
-}
-
#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
PlaybackSessionManager& WebPage::playbackSessionManager()
{
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (231305 => 231306)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2018-05-03 16:01:26 UTC (rev 231306)
@@ -290,8 +290,6 @@
RemoteWebInspectorUI* remoteInspectorUI();
bool isInspectorPage() { return !!m_inspectorUI || !!m_remoteInspectorUI; }
- void inspectorFrontendCountChanged(unsigned);
-
#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
PlaybackSessionManager& playbackSessionManager();
VideoFullscreenManager& videoFullscreenManager();
Modified: trunk/Tools/ChangeLog (231305 => 231306)
--- trunk/Tools/ChangeLog 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Tools/ChangeLog 2018-05-03 16:01:26 UTC (rev 231306)
@@ -1,3 +1,16 @@
+2018-05-03 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r231253.
+
+ The API test added with this change is crashing on the bots.
+
+ Reverted changeset:
+
+ "Web Inspector: opt out of process swap on navigation if a Web
+ Inspector frontend is connected"
+ https://bugs.webkit.org/show_bug.cgi?id=184861
+ https://trac.webkit.org/changeset/231253
+
2018-05-03 Carlos Garcia Campos <[email protected]>
REGRESSION(r222772): [GTK][WPE] WebProcess from WebKitGtk+ 2.19.9x SIGSEVs in WebKit::WebProcess::ensureNetworkProcessConnection() at Source/WebKit/WebProcess/WebProcess.cpp:1127
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm (231305 => 231306)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm 2018-05-03 15:43:20 UTC (rev 231305)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm 2018-05-03 16:01:26 UTC (rev 231306)
@@ -27,7 +27,6 @@
#import "PlatformUtilities.h"
#import "Test.h"
-#import <WebKit/WKInspector.h>
#import <WebKit/WKNavigationDelegate.h>
#import <WebKit/WKNavigationPrivate.h>
#import <WebKit/WKPreferencesPrivate.h>
@@ -1067,59 +1066,6 @@
EXPECT_TRUE([receivedMessages.get()[5] isEqualToString:@"pson1://host/main.html - unload" ]);
EXPECT_TRUE([receivedMessages.get()[6] isEqualToString:@"pson2://host/main.html - load" ]);
}
-
-TEST(ProcessSwap, DisableForInspector)
-{
- auto processPoolConfiguration = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
- processPoolConfiguration.get().processSwapsOnNavigation = YES;
- auto processPool = adoptNS([[WKProcessPool alloc] _initWithConfiguration:processPoolConfiguration.get()]);
-
- auto webViewConfiguration = adoptNS([[WKWebViewConfiguration alloc] init]);
- [webViewConfiguration setProcessPool:processPool.get()];
- RetainPtr<PSONScheme> handler = adoptNS([[PSONScheme alloc] init]);
- [webViewConfiguration setURLSchemeHandler:handler.get() forURLScheme:@"PSON1"];
- [webViewConfiguration setURLSchemeHandler:handler.get() forURLScheme:@"PSON2"];
-
- auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:webViewConfiguration.get()]);
- auto delegate = adoptNS([[PSONNavigationDelegate alloc] init]);
- [webView setNavigationDelegate:delegate.get()];
-
- NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"pson1://host/main1.html"]];
- [webView loadRequest:request];
-
- TestWebKitAPI::Util::run(&done);
- done = false;
-
- auto pid1 = [webView _webProcessIdentifier];
-
- // FIXME: use ObjC equivalent for WKInspectorRef when available.
- WKRetainPtr<WKPageRef> page = adoptWK([webView _pageRefForTransitionToWKWebView]);
- WKRetainPtr<WKInspectorRef> inspector = adoptWK(WKPageGetInspector(page.get()));
- WKInspectorShow(inspector.get());
-
- request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"pson2://host/main2.html"]];
- [webView loadRequest:request];
-
- TestWebKitAPI::Util::run(&done);
- done = false;
-
- auto pid2 = [webView _webProcessIdentifier];
-
- WKInspectorClose(inspector.get());
-
- request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"pson1://host/main2.html"]];
- [webView loadRequest:request];
-
- TestWebKitAPI::Util::run(&done);
- done = false;
-
- auto pid3 = [webView _webProcessIdentifier];
-
- EXPECT_EQ(pid1, pid2);
- EXPECT_FALSE(pid2 == pid3);
- EXPECT_EQ(numberOfDecidePolicyCalls, 3);
-}
-
#endif // !TARGET_OS_IPHONE
static const char* sameOriginBlobNavigationTestBytes = R"PSONRESOURCE(
