WebKit Bugzilla
Attachment 343686 Details for
Bug 187081
: REGRESSION(r233232): "This is breaking launching some plugins" (Requested by youenn on #webkit).
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
ROLLOUT of r233232
bug-187081-20180627003345.patch (text/plain), 4.42 KB, created by
WebKit Commit Bot
on 2018-06-26 21:33:46 PDT
(
hide
)
Description:
ROLLOUT of r233232
Filename:
MIME Type:
Creator:
WebKit Commit Bot
Created:
2018-06-26 21:33:46 PDT
Size:
4.42 KB
patch
obsolete
>Subversion Revision: 233240 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 1f527e81a7d90f3041d889360d489b329bad551e..205c599e72cb5d0d64ce10490e8b7ac01eaa0ffd 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,17 @@ >+2018-06-26 Commit Queue <commit-queue@webkit.org> >+ >+ Unreviewed, rolling out r233232. >+ https://bugs.webkit.org/show_bug.cgi?id=187081 >+ >+ "This is breaking launching some plugins" (Requested by youenn >+ on #webkit). >+ >+ Reverted changeset: >+ >+ "Remove quarantine for Webex plugin" >+ https://bugs.webkit.org/show_bug.cgi?id=187050 >+ https://trac.webkit.org/changeset/233232 >+ > 2018-06-26 Chris Dumez <cdumez@apple.com> > > Deal better with the network process crashing on startup >diff --git a/Source/WebKit/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist b/Source/WebKit/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist >index f30140ed70ecd1800c682182221553f061c37710..69af0dc02737fcab54fe4c77f52cddc837f402be 100644 >--- a/Source/WebKit/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist >+++ b/Source/WebKit/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist >@@ -23,7 +23,7 @@ > <key>CFBundleVersion</key> > <string>${BUNDLE_VERSION}</string> > <key>LSFileQuarantineEnabled</key> >- <false/> >+ <true/> > <key>NSPrincipalClass</key> > <string>NSApplication</string> > <key>WebKitEntryPoint</key> >diff --git a/Source/WebKit/PluginProcess/PluginProcess.h b/Source/WebKit/PluginProcess/PluginProcess.h >index 80fd3f3ea0248cf157907788e01af089dbd61662..d5081b061cdf7936a06c94039dd92623843ccf95 100644 >--- a/Source/WebKit/PluginProcess/PluginProcess.h >+++ b/Source/WebKit/PluginProcess/PluginProcess.h >@@ -74,10 +74,6 @@ private: > PluginProcess(); > ~PluginProcess(); > >-#if PLATFORM(MAC) >- bool shouldOverrideQuarantine() final; >-#endif >- > // ChildProcess > void initializeProcess(const ChildProcessInitializationParameters&) override; > void initializeProcessName(const ChildProcessInitializationParameters&) override; >diff --git a/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm b/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm >index 638b3e64d81bfd5c0f871e59833c7db2c99d53b7..4fee0b3cdff5d7d7d57d598a9290eca518f3976c 100644 >--- a/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm >+++ b/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm >@@ -688,10 +688,6 @@ void PluginProcess::initializeSandbox(const ChildProcessInitializationParameters > ChildProcess::initializeSandbox(parameters, sandboxParameters); > } > >-bool PluginProcess::shouldOverrideQuarantine() >-{ >- return m_pluginBundleIdentifier != "com.cisco.webex.plugin.gpc64"; >-} > > void PluginProcess::stopRunLoop() > { >diff --git a/Source/WebKit/Shared/ChildProcess.h b/Source/WebKit/Shared/ChildProcess.h >index 41da85b89301cdaa47b039f40b9c0968d71ef07b..b35c9f2e3f3fa87e2dfbee1b0afc979b98a2f8f1 100644 >--- a/Source/WebKit/Shared/ChildProcess.h >+++ b/Source/WebKit/Shared/ChildProcess.h >@@ -112,8 +112,6 @@ protected: > #endif > > private: >- virtual bool shouldOverrideQuarantine() { return true; } >- > // IPC::MessageSender > IPC::Connection* messageSenderConnection() override; > uint64_t messageSenderDestinationID() override; >diff --git a/Source/WebKit/Shared/mac/ChildProcessMac.mm b/Source/WebKit/Shared/mac/ChildProcessMac.mm >index 39cdc97fd758dc540789fe099c803264026ae72e..aed5b9fd70960fe170d5026cc20e267a516f0204 100644 >--- a/Source/WebKit/Shared/mac/ChildProcessMac.mm >+++ b/Source/WebKit/Shared/mac/ChildProcessMac.mm >@@ -211,13 +211,11 @@ void ChildProcess::initializeSandbox(const ChildProcessInitializationParameters& > } > } > >- if (shouldOverrideQuarantine()) { >- // This will override LSFileQuarantineEnabled from Info.plist unless sandbox quarantine is globally disabled. >- OSStatus error = enableSandboxStyleFileQuarantine(); >- if (error) { >- WTFLogAlways("%s: Couldn't enable sandbox style file quarantine: %ld\n", getprogname(), static_cast<long>(error)); >- exit(EX_NOPERM); >- } >+ // This will override LSFileQuarantineEnabled from Info.plist unless sandbox quarantine is globally disabled. >+ OSStatus error = enableSandboxStyleFileQuarantine(); >+ if (error) { >+ WTFLogAlways("%s: Couldn't enable sandbox style file quarantine: %ld\n", getprogname(), static_cast<long>(error)); >+ exit(EX_NOPERM); > } > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 187081
: 343686