<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[242775] trunk/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/242775">242775</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2019-03-11 22:23:43 -0700 (Mon, 11 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/242745">r242745</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/242756">r242756</a>.
https://bugs.webkit.org/show_bug.cgi?id=195606

Breaks internal builds (Requested by ryanhaddad on #webkit).

Reverted changesets:

"[iOS] Block access to backboardd service"
https://bugs.webkit.org/show_bug.cgi?id=195484
https://trac.webkit.org/changeset/242745

"Unreviewed build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/242745">r242745</a>."
https://trac.webkit.org/changeset/242756</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformspiiosUIKitSPIh">trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#trunkSourceWebKitResourcesSandboxProfilesioscomappleWebKitWebContentsb">trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebProcessPoolcpp">trunk/Source/WebKit/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebProcessPoolh">trunk/Source/WebKit/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebProcessh">trunk/Source/WebKit/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebProcessmessagesin">trunk/Source/WebKit/WebProcess/WebProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKitWebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (242774 => 242775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-03-12 05:18:34 UTC (rev 242774)
+++ trunk/Source/WebKit/ChangeLog       2019-03-12 05:23:43 UTC (rev 242775)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2019-03-11  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r242745 and r242756.
+        https://bugs.webkit.org/show_bug.cgi?id=195606
+
+        Breaks internal builds (Requested by ryanhaddad on #webkit).
+
+        Reverted changesets:
+
+        "[iOS] Block access to backboardd service"
+        https://bugs.webkit.org/show_bug.cgi?id=195484
+        https://trac.webkit.org/changeset/242745
+
+        "Unreviewed build fix after r242745."
+        https://trac.webkit.org/changeset/242756
+
</ins><span class="cx"> 2019-03-11  Fujii Hironori  <Hironori.Fujii@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [CoordinatedGraphics] ASSERTION FAILED: !m_state.isSuspended
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (242774 => 242775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h  2019-03-12 05:18:34 UTC (rev 242774)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h     2019-03-12 05:23:43 UTC (rev 242775)
</span><span class="lines">@@ -1124,10 +1124,6 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-@interface UIDevice ()
-@property (nonatomic, setter=_setBacklightLevel:) float _backlightLevel;
-@end
-
</del><span class="cx"> static inline bool currentUserInterfaceIdiomIsPad()
</span><span class="cx"> {
</span><span class="cx">     // This inline function exists to thwart unreachable code
</span><span class="lines">@@ -1191,6 +1187,4 @@
</span><span class="cx"> 
</span><span class="cx"> UIEdgeInsets UIEdgeInsetsAdd(UIEdgeInsets lhs, UIEdgeInsets rhs, UIRectEdge);
</span><span class="cx"> 
</span><del>-extern NSString *const UIBacklightLevelChangedNotification;
-
</del><span class="cx"> WTF_EXTERN_C_END
</span></span></pre></div>
<a id="trunkSourceWebKitResourcesSandboxProfilesioscomappleWebKitWebContentsb"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (242774 => 242775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2019-03-12 05:18:34 UTC (rev 242774)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb    2019-03-12 05:23:43 UTC (rev 242775)
</span><span class="lines">@@ -450,11 +450,6 @@
</span><span class="cx">     (global-name "com.apple.coremedia.decompressionsession")
</span><span class="cx">     (global-name "com.apple.coremedia.videoqueue"))
</span><span class="cx"> 
</span><del>-
-;; FIXME: remove the send-signal when this rule is no longer generating crashes.
-(deny mach-lookup (with send-signal SIGKILL)
-    (global-name "com.apple.backboard.hid.services"))
-
</del><span class="cx"> ;; These services have been identified as unused during living-on.
</span><span class="cx"> ;; This list overrides some definitions above and in common.sb.
</span><span class="cx"> ;; FIXME: remove overridden rules once the final list has been
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (242774 => 242775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm       2019-03-12 05:18:34 UTC (rev 242774)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm  2019-03-12 05:23:43 UTC (rev 242775)
</span><span class="lines">@@ -77,11 +77,6 @@
</span><span class="cx"> static NSString * const WebKitLogCookieInformationDefaultsKey = @"WebKitLogCookieInformation";
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
-SOFT_LINK_PRIVATE_FRAMEWORK(BackBoardServices)
-SOFT_LINK(BackBoardServices, BKSDisplayBrightnessGetCurrent, float, (), ());
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><span class="lines">@@ -386,24 +381,9 @@
</span><span class="cx">     return WTF::hasEntitlement(ensureNetworkProcess().connection()->xpcConnection(), entitlement.utf8().data());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
-float WebProcessPool::displayBrightness()
-{
-    return BKSDisplayBrightnessGetCurrent();
-}
-    
-void WebProcessPool::backlightLevelDidChangeCallback(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef userInfo)
-{
-    WebProcessPool* pool = reinterpret_cast<WebProcessPool*>(observer);
-    pool->sendToAllProcesses(Messages::WebProcess::BacklightLevelDidChange(BKSDisplayBrightnessGetCurrent()));
-}
-#endif
-
</del><span class="cx"> void WebProcessPool::registerNotificationObservers()
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
-    CFNotificationCenterAddObserver(CFNotificationCenterGetDarwinNotifyCenter(), this, backlightLevelDidChangeCallback, (CFStringRef)UIBacklightLevelChangedNotification, nullptr, CFNotificationSuspensionBehaviorCoalesce);
-#else
</del><ins>+#if !PLATFORM(IOS_FAMILY)
</ins><span class="cx">     // Listen for enhanced accessibility changes and propagate them to the WebProcess.
</span><span class="cx">     m_enhancedAccessibilityObserver = [[NSNotificationCenter defaultCenter] addObserverForName:WebKitApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *note) {
</span><span class="cx">         setEnhancedAccessibility([[[note userInfo] objectForKey:@"AXEnhancedUserInterface"] boolValue]);
</span><span class="lines">@@ -453,9 +433,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebProcessPool::unregisterNotificationObservers()
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
-    CFNotificationCenterRemoveObserver(CFNotificationCenterGetDarwinNotifyCenter(), this, (CFStringRef)UIBacklightLevelChangedNotification, nullptr);
-#else
</del><ins>+#if !PLATFORM(IOS_FAMILY)
</ins><span class="cx">     [[NSNotificationCenter defaultCenter] removeObserver:m_enhancedAccessibilityObserver.get()];    
</span><span class="cx">     [[NSNotificationCenter defaultCenter] removeObserver:m_automaticTextReplacementNotificationObserver.get()];
</span><span class="cx">     [[NSNotificationCenter defaultCenter] removeObserver:m_automaticSpellingCorrectionNotificationObserver.get()];
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (242774 => 242775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-03-12 05:18:34 UTC (rev 242774)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp    2019-03-12 05:23:43 UTC (rev 242775)
</span><span class="lines">@@ -997,10 +997,6 @@
</span><span class="cx">         process.send(Messages::WebProcess::PrewarmGlobally(), 0);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS_FAMILY)
-    process.send(Messages::WebProcess::BacklightLevelDidChange(displayBrightness()), 0);
-#endif
-
</del><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx">     // Initialize remote inspector connection now that we have a sub-process that is hosting one of our web views.
</span><span class="cx">     Inspector::RemoteInspector::singleton(); 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (242774 => 242775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebProcessPool.h   2019-03-12 05:18:34 UTC (rev 242774)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h      2019-03-12 05:23:43 UTC (rev 242775)
</span><span class="lines">@@ -572,11 +572,6 @@
</span><span class="cx"> 
</span><span class="cx">     void updateMaxSuspendedPageCount();
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS_FAMILY)
-    static float displayBrightness();
-    static void backlightLevelDidChangeCallback(CFNotificationCenterRef, void *observer, CFStringRef name, const void *, CFDictionaryRef userInfo);    
-#endif
-
</del><span class="cx">     Ref<API::ProcessPoolConfiguration> m_configuration;
</span><span class="cx"> 
</span><span class="cx">     IPC::MessageReceiverMap m_messageReceiverMap;
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (242774 => 242775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebProcess.h      2019-03-12 05:18:34 UTC (rev 242774)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h 2019-03-12 05:23:43 UTC (rev 242775)
</span><span class="lines">@@ -244,7 +244,6 @@
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><span class="cx">     void accessibilityProcessSuspendedNotification(bool);
</span><del>-    float backlightLevel() const { return m_backlightLevel; }
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -410,10 +409,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS_FAMILY)
-    void backlightLevelDidChange(float backlightLevel);
-#endif
-
</del><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx">     void suspendAllMediaBuffering();
</span><span class="cx">     void resumeAllMediaBuffering();
</span><span class="lines">@@ -511,10 +506,6 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM) && ENABLE(SANDBOX_EXTENSIONS)
</span><span class="cx">     HashMap<String, RefPtr<SandboxExtension>> m_mediaCaptureSandboxExtensions;
</span><span class="cx"> #endif
</span><del>-
-#if PLATFORM(IOS_FAMILY)
-    float m_backlightLevel { 0 };
-#endif
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebProcess.messages.in (242774 => 242775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebProcess.messages.in    2019-03-12 05:18:34 UTC (rev 242774)
+++ trunk/Source/WebKit/WebProcess/WebProcess.messages.in       2019-03-12 05:23:43 UTC (rev 242775)
</span><span class="lines">@@ -134,10 +134,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS_FAMILY)
-    BacklightLevelDidChange(float backlightLevel)
-#endif
-
</del><span class="cx">     IsJITEnabled() -> (bool enabled) Async
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (242774 => 242775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm  2019-03-12 05:18:34 UTC (rev 242774)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm     2019-03-12 05:23:43 UTC (rev 242775)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx"> #import <wtf/cocoa/NSURLExtras.h>
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><del>-#import "UIKitSPI.h"
</del><span class="cx"> #import "WKAccessibilityWebPageObjectIOS.h"
</span><span class="cx"> #import <UIKit/UIAccessibility.h>
</span><span class="cx"> #import <pal/spi/ios/GraphicsServicesSPI.h>
</span><span class="lines">@@ -699,28 +698,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS_FAMILY)
-static float currentBacklightLevel()
-{
-    return WebProcess::singleton().backlightLevel();
-}
-
-void WebProcess::backlightLevelDidChange(float backlightLevel)
-{
-    m_backlightLevel = backlightLevel;
-
-    // Swizzle -[UIDevice _backlightLevel]
-    // FIXME: remove the swizzling and related code once <rdar://problem/47603552> is fixed.
-    static std::once_flag onceFlag;
-    std::call_once(
-        onceFlag,
-        [] {
-            Method methodToPatch = class_getInstanceMethod([UIDevice class], @selector(_backlightLevel));
-            method_setImplementation(methodToPatch, reinterpret_cast<IMP>(currentBacklightLevel));
-        });
-}
-#endif
-
</del><span class="cx"> void WebProcess::setMediaMIMETypes(const Vector<String> types)
</span><span class="cx"> {
</span><span class="cx">     AVFoundationMIMETypeCache::singleton().setSupportedTypes(types);
</span></span></pre>
</div>
</div>

</body>
</html>