<!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>[191366] trunk/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/191366">191366</a></dd>
<dt>Author</dt> <dd>conrad_shultz@apple.com</dd>
<dt>Date</dt> <dd>2015-10-20 18:10:32 -0700 (Tue, 20 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>_WKThumbnailView should support a snapshot-only mode
https://bugs.webkit.org/show_bug.cgi?id=150106
Reviewed by Tim Horton.
Add a new property to _WKThumbnailView, exclusivelyUsesSnapshot, which causes _WKThumbnailView
to bypass both layer tree reparenting and event suppression on the associated WKView.
Add a new method, -requestSnapshot, which clients can use to force _WKThumbnailView to refresh
on demand.
* UIProcess/API/Cocoa/_WKThumbnailView.h:
* UIProcess/API/Cocoa/_WKThumbnailView.mm:
(-[_WKThumbnailView requestSnapshot]):
Extracted from -_requestSnapshotIfNeeded:.
(-[_WKThumbnailView _viewWasUnparented]):
(-[_WKThumbnailView _viewWasParented]):
(-[_WKThumbnailView _requestSnapshotIfNeeded]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191365 => 191366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-20 23:40:19 UTC (rev 191365)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-21 01:10:32 UTC (rev 191366)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-10-13 Conrad Shultz <conrad_shultz@apple.com>
+
+ _WKThumbnailView should support a snapshot-only mode
+ https://bugs.webkit.org/show_bug.cgi?id=150106
+
+ Reviewed by Tim Horton.
+
+ Add a new property to _WKThumbnailView, exclusivelyUsesSnapshot, which causes _WKThumbnailView
+ to bypass both layer tree reparenting and event suppression on the associated WKView.
+
+ Add a new method, -requestSnapshot, which clients can use to force _WKThumbnailView to refresh
+ on demand.
+
+ * UIProcess/API/Cocoa/_WKThumbnailView.h:
+ * UIProcess/API/Cocoa/_WKThumbnailView.mm:
+ (-[_WKThumbnailView requestSnapshot]):
+ Extracted from -_requestSnapshotIfNeeded:.
+ (-[_WKThumbnailView _viewWasUnparented]):
+ (-[_WKThumbnailView _viewWasParented]):
+ (-[_WKThumbnailView _requestSnapshotIfNeeded]):
+
</ins><span class="cx"> 2015-10-20 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h (191365 => 191366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h 2015-10-20 23:40:19 UTC (rev 191365)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h 2015-10-21 01:10:32 UTC (rev 191366)
</span><span class="lines">@@ -39,10 +39,13 @@
</span><span class="cx"> - (instancetype)initWithFrame:(NSRect)frame fromWKView:(WKView *)wkView;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic) CGFloat scale;
</span><ins>+@property (nonatomic) BOOL exclusivelyUsesSnapshot;
</ins><span class="cx">
</span><span class="cx"> // This should be removed when all clients go away; it is always YES now.
</span><span class="cx"> @property (nonatomic) BOOL usesSnapshot;
</span><span class="cx">
</span><ins>+- (void)requestSnapshot;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // TARGET_OS_IPHONE
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm (191365 => 191366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm 2015-10-20 23:40:19 UTC (rev 191365)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm 2015-10-21 01:10:32 UTC (rev 191366)
</span><span class="lines">@@ -56,7 +56,8 @@
</span><span class="cx"> double _lastSnapshotScale;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@synthesize _waitingForSnapshot = _waitingForSnapshot;
</del><ins>+@synthesize _waitingForSnapshot=_waitingForSnapshot;
+@synthesize exclusivelyUsesSnapshot=_exclusivelyUsesSnapshot;
</ins><span class="cx">
</span><span class="cx"> - (instancetype)initWithFrame:(NSRect)frame fromWKView:(WKView *)wkView
</span><span class="cx"> {
</span><span class="lines">@@ -77,15 +78,38 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)requestSnapshot
+{
+ if (_waitingForSnapshot) {
+ _snapshotWasDeferred = YES;
+ return;
+ }
+
+ _waitingForSnapshot = YES;
+
+ RetainPtr<_WKThumbnailView> thumbnailView = self;
+ IntRect snapshotRect(IntPoint(), _webPageProxy->viewSize() - IntSize(0, _webPageProxy->topContentInset()));
+ SnapshotOptions options = SnapshotOptionsInViewCoordinates;
+ IntSize bitmapSize = snapshotRect.size();
+ bitmapSize.scale(_scale * _webPageProxy->deviceScaleFactor());
+ _lastSnapshotScale = _scale;
+ _webPageProxy->takeSnapshot(snapshotRect, bitmapSize, options, [thumbnailView](const ShareableBitmap::Handle& imageHandle, WebKit::CallbackBase::Error) {
+ RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(imageHandle, SharedMemory::Protection::ReadOnly);
+ RetainPtr<CGImageRef> cgImage = bitmap ? bitmap->makeCGImage() : nullptr;
+ [thumbnailView _didTakeSnapshot:cgImage.get()];
+ });
+}
+
</ins><span class="cx"> - (void)_viewWasUnparented
</span><span class="cx"> {
</span><del>- [_wkView _setThumbnailView:nil];
- [_wkView _setIgnoresAllEvents:NO];
</del><ins>+ if (!_exclusivelyUsesSnapshot) {
+ [_wkView _setThumbnailView:nil];
+ [_wkView _setIgnoresAllEvents:NO];
+ _webPageProxy->setMayStartMediaWhenInWindow(_originalMayStartMediaWhenInWindow);
+ }
</ins><span class="cx">
</span><span class="cx"> self.layer.contents = nil;
</span><span class="cx"> _lastSnapshotScale = NAN;
</span><del>-
- _webPageProxy->setMayStartMediaWhenInWindow(_originalMayStartMediaWhenInWindow);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_viewWasParented
</span><span class="lines">@@ -93,12 +117,15 @@
</span><span class="cx"> if ([_wkView _thumbnailView])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!_originalSourceViewIsInWindow)
</del><ins>+ if (!_exclusivelyUsesSnapshot && !_originalSourceViewIsInWindow)
</ins><span class="cx"> _webPageProxy->setMayStartMediaWhenInWindow(false);
</span><span class="cx">
</span><span class="cx"> [self _requestSnapshotIfNeeded];
</span><del>- [_wkView _setThumbnailView:self];
- [_wkView _setIgnoresAllEvents:YES];
</del><ins>+
+ if (!_exclusivelyUsesSnapshot) {
+ [_wkView _setThumbnailView:self];
+ [_wkView _setIgnoresAllEvents:YES];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_requestSnapshotIfNeeded
</span><span class="lines">@@ -106,24 +133,7 @@
</span><span class="cx"> if (self.layer.contents && _lastSnapshotScale == _scale)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (_waitingForSnapshot) {
- _snapshotWasDeferred = YES;
- return;
- }
-
- _waitingForSnapshot = YES;
-
- RetainPtr<_WKThumbnailView> thumbnailView = self;
- IntRect snapshotRect(IntPoint(), _webPageProxy->viewSize() - IntSize(0, _webPageProxy->topContentInset()));
- SnapshotOptions options = SnapshotOptionsInViewCoordinates;
- IntSize bitmapSize = snapshotRect.size();
- bitmapSize.scale(_scale * _webPageProxy->deviceScaleFactor());
- _lastSnapshotScale = _scale;
- _webPageProxy->takeSnapshot(snapshotRect, bitmapSize, options, [thumbnailView](const ShareableBitmap::Handle& imageHandle, WebKit::CallbackBase::Error) {
- RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(imageHandle, SharedMemory::Protection::ReadOnly);
- RetainPtr<CGImageRef> cgImage = bitmap ? bitmap->makeCGImage() : nullptr;
- [thumbnailView _didTakeSnapshot:cgImage.get()];
- });
</del><ins>+ [self requestSnapshot];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_didTakeSnapshot:(CGImageRef)image
</span></span></pre>
</div>
</div>
</body>
</html>