<!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>[193919] branches/safari-601.1.46-branch/Source/WebKit2</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/193919">193919</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-10 11:18:58 -0800 (Thu, 10 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/193481">r193481</a>. rdar://problem/23110745</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKWebViewInternalh">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessApplicationStateTrackerh">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ApplicationStateTracker.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessApplicationStateTrackermm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ApplicationStateTracker.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessiosPageClientImplIOSmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessiosWKPDFViewh">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKPDFView.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessiosWKPDFViewmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (193918 => 193919)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-12-10 19:18:54 UTC (rev 193918)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-12-10 19:18:58 UTC (rev 193919)
</span><span class="lines">@@ -1,5 +1,46 @@
</span><span class="cx"> 2015-12-10 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r193481. rdar://problem/23110745
+
+ 2015-12-04 Gavin Barraclough <barraclough@apple.com>
+
+ Background state not being tracked correctly for PDFs on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=151886
+
+ Reviewed by Anders Carlson.
+
+ The problem here is that when viewing a PDF we don't have an ApplicationStateTracker.
+ (While we do have a content view - which normally holds the ApplicationStateTracker -
+ the content view is not in a window, and only has an ApplicationStateTracker while in a
+ window). For now, let's give the WKPDFView an ApplicationStateTracker of its very own.
+ In the future we may want to refactor ownership of the ApplicationStateTracker up to
+ the WKWebView.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _isBackground]):
+ - Added, checks background state of content/PDF view.
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ - expose _isBackground to PageClientImplIOS.
+ * UIProcess/ApplicationStateTracker.h:
+ (WebKit::ApplicationStateTracker::isInBackground):
+ * UIProcess/ApplicationStateTracker.mm:
+ (WebKit::isBackgroundState):
+ (WebKit::ApplicationStateTracker::ApplicationStateTracker):
+ - generalize WKContentView -> UIView, so this may now also be a WKPDFView.
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::isViewVisible):
+ - check background state via the WKWebView.
+ * UIProcess/ios/WKPDFView.h:
+ * UIProcess/ios/WKPDFView.mm:
+ (-[WKPDFView willMoveToWindow:]):
+ (-[WKPDFView didMoveToWindow]):
+ (-[WKPDFView isBackground]):
+ (-[WKPDFView _applicationDidEnterBackground]):
+ (-[WKPDFView _applicationWillEnterForeground]):
+ - added methods to initialize ApplicationStateTracker, access background state, & callbacks to the page proxy.
+
+2015-12-10 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r193382. rdar://problem/23814344
</span><span class="cx">
</span><span class="cx"> 2015-12-03 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (193918 => 193919)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-10 19:18:54 UTC (rev 193918)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-10 19:18:58 UTC (rev 193919)
</span><span class="lines">@@ -699,6 +699,15 @@
</span><span class="cx"> #pragma mark iOS-specific methods
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+
+- (BOOL)_isBackground
+{
+ if ([self _isDisplayingPDF])
+ return [(WKPDFView *)_customContentView isBackground];
+
+ return [_contentView isBackground];
+}
+
</ins><span class="cx"> - (void)setFrame:(CGRect)frame
</span><span class="cx"> {
</span><span class="cx"> CGRect oldFrame = self.frame;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessAPICocoaWKWebViewInternalh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (193918 => 193919)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2015-12-10 19:18:54 UTC (rev 193918)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2015-12-10 19:18:58 UTC (rev 193919)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> - (void)_navigationGestureDidBegin;
</span><span class="cx"> - (void)_navigationGestureDidEnd;
</span><span class="cx">
</span><ins>+@property (nonatomic, readonly) BOOL _isBackground;
</ins><span class="cx"> @property (nonatomic, readonly) BOOL _allowsDoubleTapGestures;
</span><span class="cx"> @property (nonatomic, readonly) UIEdgeInsets _computedContentInset;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessApplicationStateTrackerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ApplicationStateTracker.h (193918 => 193919)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ApplicationStateTracker.h 2015-12-10 19:18:54 UTC (rev 193918)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ApplicationStateTracker.h 2015-12-10 19:18:58 UTC (rev 193919)
</span><span class="lines">@@ -33,13 +33,13 @@
</span><span class="cx"> #import <wtf/WeakPtr.h>
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS BKSApplicationStateMonitor;
</span><del>-OBJC_CLASS WKContentView;
</del><ins>+OBJC_CLASS UIView;
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class ApplicationStateTracker {
</span><span class="cx"> public:
</span><del>- ApplicationStateTracker(WKContentView *, SEL didEnterBackgroundSelector, SEL willEnterForegroundSelector);
</del><ins>+ ApplicationStateTracker(UIView *, SEL didEnterBackgroundSelector, SEL willEnterForegroundSelector);
</ins><span class="cx"> ~ApplicationStateTracker();
</span><span class="cx">
</span><span class="cx"> bool isInBackground() const { return m_isInBackground; }
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> void applicationDidEnterBackground();
</span><span class="cx"> void applicationWillEnterForeground();
</span><span class="cx">
</span><del>- WeakObjCPtr<WKContentView> m_view;
</del><ins>+ WeakObjCPtr<UIView> m_view;
</ins><span class="cx"> SEL m_didEnterBackgroundSelector;
</span><span class="cx"> SEL m_willEnterForegroundSelector;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessApplicationStateTrackermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ApplicationStateTracker.mm (193918 => 193919)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ApplicationStateTracker.mm 2015-12-10 19:18:54 UTC (rev 193918)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ApplicationStateTracker.mm 2015-12-10 19:18:58 UTC (rev 193919)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #import "AssertionServicesSPI.h"
</span><span class="cx"> #import "SandboxUtilities.h"
</span><span class="cx"> #import "UIKitSPI.h"
</span><del>-#import "WKContentView.h"
</del><span class="cx"> #import <WebCore/SecuritySPI.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx"> #import <wtf/ObjcRuntimeExtras.h>
</span><span class="lines">@@ -74,7 +73,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ApplicationStateTracker::ApplicationStateTracker(WKContentView *view, SEL didEnterBackgroundSelector, SEL willEnterForegroundSelector)
</del><ins>+ApplicationStateTracker::ApplicationStateTracker(UIView *view, SEL didEnterBackgroundSelector, SEL willEnterForegroundSelector)
</ins><span class="cx"> : m_view(view)
</span><span class="cx"> , m_didEnterBackgroundSelector(didEnterBackgroundSelector)
</span><span class="cx"> , m_willEnterForegroundSelector(willEnterForegroundSelector)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (193918 => 193919)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-12-10 19:18:54 UTC (rev 193918)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-12-10 19:18:58 UTC (rev 193919)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx">
</span><span class="cx"> bool PageClientImpl::isViewVisible()
</span><span class="cx"> {
</span><del>- if (isViewInWindow() && !m_contentView.isBackground)
</del><ins>+ if (isViewInWindow() && !m_webView._isBackground)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if ([m_webView _isShowingVideoPictureInPicture])
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessiosWKPDFViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKPDFView.h (193918 => 193919)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKPDFView.h 2015-12-10 19:18:54 UTC (rev 193918)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKPDFView.h 2015-12-10 19:18:58 UTC (rev 193919)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) NSString *suggestedFilename;
</span><span class="cx"> @property (nonatomic, readonly) CGPDFDocumentRef pdfDocument;
</span><ins>+@property (nonatomic, readonly) BOOL isBackground;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessiosWKPDFViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm (193918 => 193919)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-12-10 19:18:54 UTC (rev 193918)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-12-10 19:18:58 UTC (rev 193919)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #import "APIFindClient.h"
</span><span class="cx"> #import "APIUIClient.h"
</span><ins>+#import "ApplicationStateTracker.h"
</ins><span class="cx"> #import "CorePDFSPI.h"
</span><span class="cx"> #import "SessionState.h"
</span><span class="cx"> #import "UIKitSPI.h"
</span><span class="lines">@@ -45,6 +46,7 @@
</span><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><ins>+using namespace WebKit;
</ins><span class="cx">
</span><span class="cx"> const CGFloat pdfPageMargin = 8;
</span><span class="cx"> const CGFloat pdfMinimumZoomScale = 1;
</span><span class="lines">@@ -105,6 +107,8 @@
</span><span class="cx"> _WKFindOptions _nextCachedFindOptionsAffectingResults;
</span><span class="cx">
</span><span class="cx"> dispatch_queue_t _findQueue;
</span><ins>+
+ std::unique_ptr<ApplicationStateTracker> _applicationStateTracker;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)web_initWithFrame:(CGRect)frame webView:(WKWebView *)webView
</span><span class="lines">@@ -834,6 +838,47 @@
</span><span class="cx"> return NO;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)willMoveToWindow:(UIWindow *)newWindow
+{
+ if (newWindow)
+ return;
+
+ ASSERT(self.window);
+ ASSERT(_applicationStateTracker);
+ _applicationStateTracker = nullptr;
+}
+
+- (void)didMoveToWindow
+{
+ if (!self.window)
+ return;
+
+ ASSERT(!_applicationStateTracker);
+ _applicationStateTracker = std::make_unique<ApplicationStateTracker>(self, @selector(_applicationDidEnterBackground), @selector(_applicationWillEnterForeground));
+}
+
+- (BOOL)isBackground
+{
+ if (!_applicationStateTracker)
+ return YES;
+
+ return _applicationStateTracker->isInBackground();
+}
+
+- (void)_applicationDidEnterBackground
+{
+ _webView->_page->applicationDidEnterBackground();
+ _webView->_page->viewStateDidChange(ViewState::AllFlags & ~ViewState::IsInWindow);
+}
+
+- (void)_applicationWillEnterForeground
+{
+ _webView->_page->applicationWillEnterForeground();
+ if (auto drawingArea = _webView->_page->drawingArea())
+ drawingArea->hideContentUntilAnyUpdate();
+ _webView->_page->viewStateDidChange(ViewState::AllFlags & ~ViewState::IsInWindow, true, WebPageProxy::ViewStateChangeDispatchMode::Immediate);
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif /* PLATFORM(IOS) */
</span></span></pre>
</div>
</div>
</body>
</html>