<!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>[205878] trunk</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/205878">205878</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-09-13 14:09:35 -0700 (Tue, 13 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Provide a mechanism to specify the maximum size of WKThumbnailView snapshots
https://bugs.webkit.org/show_bug.cgi?id=161896
<rdar://problem/28229827>
Reviewed by Simon Fraser.
Some clients know that their thumbnail views will only be displayed up to
a specific size that is significantly smaller than the WKView size. Allow
them to avoid wasting lots of memory on unnecessarily large snapshots.
* UIProcess/API/Cocoa/_WKThumbnailView.h:
* UIProcess/API/Cocoa/_WKThumbnailView.mm:
(-[_WKThumbnailView requestSnapshot]):
(-[_WKThumbnailView _requestSnapshotIfNeeded]):
(-[_WKThumbnailView setMaximumSnapshotSize:]):
Add a maximumSnapshotSize property which can be changed dynamically.
* TestWebKitAPI/Tests/WebKit2/WKThumbnailView.mm:
(TestWebKitAPI::TEST):
Add a test for the new property.
Also fix the old new test to run on arbitrary scale displays without failing.</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>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WKThumbnailViewmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2/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 (205877 => 205878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-13 20:56:22 UTC (rev 205877)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-13 21:09:35 UTC (rev 205878)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-09-13 Tim Horton <timothy_horton@apple.com>
+
+ Provide a mechanism to specify the maximum size of WKThumbnailView snapshots
+ https://bugs.webkit.org/show_bug.cgi?id=161896
+ <rdar://problem/28229827>
+
+ Reviewed by Simon Fraser.
+
+ Some clients know that their thumbnail views will only be displayed up to
+ a specific size that is significantly smaller than the WKView size. Allow
+ them to avoid wasting lots of memory on unnecessarily large snapshots.
+
+ * UIProcess/API/Cocoa/_WKThumbnailView.h:
+ * UIProcess/API/Cocoa/_WKThumbnailView.mm:
+ (-[_WKThumbnailView requestSnapshot]):
+ (-[_WKThumbnailView _requestSnapshotIfNeeded]):
+ (-[_WKThumbnailView setMaximumSnapshotSize:]):
+ Add a maximumSnapshotSize property which can be changed dynamically.
+
</ins><span class="cx"> 2016-09-13 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r196321): Amazon Videos are all black in Fullscreen
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h (205877 => 205878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h 2016-09-13 20:56:22 UTC (rev 205877)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h 2016-09-13 21:09:35 UTC (rev 205878)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic) CGFloat scale;
</span><span class="cx"> @property (nonatomic, readonly) CGSize snapshotSize;
</span><ins>+@property (nonatomic) CGSize maximumSnapshotSize;
</ins><span class="cx"> @property (nonatomic) BOOL exclusivelyUsesSnapshot;
</span><span class="cx">
</span><span class="cx"> // Defaults to NO.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm (205877 => 205878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm 2016-09-13 20:56:22 UTC (rev 205877)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm 2016-09-13 21:09:35 UTC (rev 205878)
</span><span class="lines">@@ -53,7 +53,8 @@
</span><span class="cx"> BOOL _originalSourceViewIsInWindow;
</span><span class="cx">
</span><span class="cx"> BOOL _snapshotWasDeferred;
</span><del>- double _lastSnapshotScale;
</del><ins>+ CGFloat _lastSnapshotScale;
+ CGSize _lastSnapshotMaximumSize;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @synthesize snapshotSize=_snapshotSize;
</span><span class="lines">@@ -94,7 +95,18 @@
</span><span class="cx"> SnapshotOptions options = SnapshotOptionsInViewCoordinates;
</span><span class="cx"> IntSize bitmapSize = snapshotRect.size();
</span><span class="cx"> bitmapSize.scale(_scale * _webPageProxy->deviceScaleFactor());
</span><ins>+
+ if (!CGSizeEqualToSize(_maximumSnapshotSize, CGSizeZero)) {
+ double sizeConstraintScale = 1;
+ if (_maximumSnapshotSize.width)
+ sizeConstraintScale = CGFloatMin(sizeConstraintScale, _maximumSnapshotSize.width / bitmapSize.width());
+ if (_maximumSnapshotSize.height)
+ sizeConstraintScale = CGFloatMin(sizeConstraintScale, _maximumSnapshotSize.height / bitmapSize.height());
+ bitmapSize = IntSize(CGCeiling(bitmapSize.width() * sizeConstraintScale), CGCeiling(bitmapSize.height() * sizeConstraintScale));
+ }
+
</ins><span class="cx"> _lastSnapshotScale = _scale;
</span><ins>+ _lastSnapshotMaximumSize = _maximumSnapshotSize;
</ins><span class="cx"> _webPageProxy->takeSnapshot(snapshotRect, bitmapSize, options, [thumbnailView](const ShareableBitmap::Handle& imageHandle, WebKit::CallbackBase::Error) {
</span><span class="cx"> RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(imageHandle, SharedMemory::Protection::ReadOnly);
</span><span class="cx"> RetainPtr<CGImageRef> cgImage = bitmap ? bitmap->makeCGImage() : nullptr;
</span><span class="lines">@@ -135,7 +147,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_requestSnapshotIfNeeded
</span><span class="cx"> {
</span><del>- if (self.layer.contents && _lastSnapshotScale == _scale)
</del><ins>+ if (self.layer.contents && _lastSnapshotScale == _scale && CGSizeEqualToSize(_lastSnapshotMaximumSize, _maximumSnapshotSize))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [self requestSnapshot];
</span><span class="lines">@@ -180,6 +192,16 @@
</span><span class="cx"> self.layer.sublayerTransform = CATransform3DMakeScale(_scale, _scale, 1);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setMaximumSnapshotSize:(CGSize)maximumSnapshotSize
+{
+ if (CGSizeEqualToSize(_maximumSnapshotSize, maximumSnapshotSize))
+ return;
+
+ _maximumSnapshotSize = maximumSnapshotSize;
+
+ [self _requestSnapshotIfNeeded];
+}
+
</ins><span class="cx"> // This should be removed when all clients go away; it is always YES now.
</span><span class="cx"> - (void)setUsesSnapshot:(BOOL)usesSnapshot
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205877 => 205878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-13 20:56:22 UTC (rev 205877)
+++ trunk/Tools/ChangeLog 2016-09-13 21:09:35 UTC (rev 205878)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-09-13 Tim Horton <timothy_horton@apple.com>
+
+ Provide a mechanism to specify the maximum width of WKThumbnailView snapshots
+ https://bugs.webkit.org/show_bug.cgi?id=161896
+ <rdar://problem/28229827>
+
+ Reviewed by Simon Fraser.
+
+ * TestWebKitAPI/Tests/WebKit2/WKThumbnailView.mm:
+ (TestWebKitAPI::TEST):
+ Add a test for the new property.
+ Also fix the old new test to run on arbitrary scale displays without failing.
+
</ins><span class="cx"> 2016-09-12 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win][Direct2D] Provide Direct2D-based geometry and transform cast operations
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WKThumbnailViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKThumbnailView.mm (205877 => 205878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKThumbnailView.mm 2016-09-13 20:56:22 UTC (rev 205877)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKThumbnailView.mm 2016-09-13 21:09:35 UTC (rev 205878)
</span><span class="lines">@@ -76,11 +76,11 @@
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, WKThumbnailViewKeepSnapshotWhenRemovedFromSuperview)
</span><span class="cx"> {
</span><del>- WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("MouseMoveAfterCrashTest"));
-
</del><ins>+ WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
</ins><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx"> WKView *wkView = webView.platformView();
</span><span class="cx"> setPageLoaderClient(webView.page());
</span><ins>+ WKPageSetCustomBackingScaleFactor(webView.page(), 1);
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("lots-of-text", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="lines">@@ -120,6 +120,59 @@
</span><span class="cx"> [thumbnailView removeObserver:observer.get() forKeyPath:@"snapshotSize" context:snapshotSizeChangeKVOContext];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(WebKit2, WKThumbnailViewMaximumSnapshotSize)
+{
+ WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
+ PlatformWebView webView(context.get());
+ WKView *wkView = webView.platformView();
+ setPageLoaderClient(webView.page());
+ WKPageSetCustomBackingScaleFactor(webView.page(), 1);
+
+ WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("lots-of-text", "html"));
+ WKPageLoadURL(webView.page(), url.get());
+ Util::run(&didFinishLoad);
+ didFinishLoad = false;
+
+ RetainPtr<_WKThumbnailView> thumbnailView = adoptNS([[_WKThumbnailView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) fromWKView:wkView]);
+
+ RetainPtr<SnapshotSizeObserver> observer = adoptNS([[SnapshotSizeObserver alloc] init]);
+
+ [thumbnailView addObserver:observer.get() forKeyPath:@"snapshotSize" options:NSKeyValueObservingOptionNew context:snapshotSizeChangeKVOContext];
+
+ [wkView.window.contentView addSubview:thumbnailView.get()];
+ Util::run(&didTakeSnapshot);
+ didTakeSnapshot = false;
+
+ EXPECT_EQ([thumbnailView snapshotSize].width, 800);
+ EXPECT_FALSE([thumbnailView layer].contents == nil);
+
+ [thumbnailView setMaximumSnapshotSize:CGSizeMake(200, 0)];
+ Util::run(&didTakeSnapshot);
+ didTakeSnapshot = false;
+
+ EXPECT_EQ([thumbnailView snapshotSize].width, 200);
+ EXPECT_EQ([thumbnailView snapshotSize].height, 150);
+ EXPECT_FALSE([thumbnailView layer].contents == nil);
+
+ [thumbnailView setMaximumSnapshotSize:CGSizeMake(0, 300)];
+ Util::run(&didTakeSnapshot);
+ didTakeSnapshot = false;
+
+ EXPECT_EQ([thumbnailView snapshotSize].width, 400);
+ EXPECT_EQ([thumbnailView snapshotSize].height, 300);
+ EXPECT_FALSE([thumbnailView layer].contents == nil);
+
+ [thumbnailView setMaximumSnapshotSize:CGSizeMake(200, 300)];
+ Util::run(&didTakeSnapshot);
+ didTakeSnapshot = false;
+
+ EXPECT_EQ([thumbnailView snapshotSize].width, 200);
+ EXPECT_EQ([thumbnailView snapshotSize].height, 150);
+ EXPECT_FALSE([thumbnailView layer].contents == nil);
+
+ [thumbnailView removeObserver:observer.get() forKeyPath:@"snapshotSize" context:snapshotSizeChangeKVOContext];
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>