<!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>[192417] 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/192417">192417</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-11-13 09:02:40 -0800 (Fri, 13 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/189628">r189628</a>. rdar://problem/22846841</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="#branchessafari601146branchSourceWebKit2UIProcessmacViewSnapshotStoreh">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessmacViewSnapshotStoremm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.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 (192416 => 192417)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-11-13 15:59:27 UTC (rev 192416)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-11-13 17:02:40 UTC (rev 192417)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2015-11-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r189628. rdar://problem/22846841
+
+ 2015-09-11 Beth Dakin <bdakin@apple.com>
+
+ Should use CARenderServerRenderLayerWithTransform for snapshots on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=149069
+ -and corresponding-
+ rdar://problem/19726953
+
+ Reviewed by Tim Horton.
+
+ This will let us own the backing IOSurface, which will let us share more code
+ with Mac.
+
+ Use CARenderServerRenderLayerWithTransform
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _takeViewSnapshot]):
+ (-[WKWebView _zoomToPoint:atScale:animated:]):
+
+ We can eliminate things needed for the slot-based API.
+ * UIProcess/mac/ViewSnapshotStore.h:
+ (WebKit::ViewSnapshot::setDeviceScaleFactor):
+ (WebKit::ViewSnapshot::deviceScaleFactor):
+ (WebKit::ViewSnapshot::surface):
+ (WebKit::ViewSnapshot::imageSizeInBytes):
+ (WebKit::ViewSnapshot::size):
+ * UIProcess/mac/ViewSnapshotStore.mm:
+ (WebKit::ViewSnapshotStore::singleton):
+ (WebKit::ViewSnapshotStore::didAddImageToSnapshot):
+ (WebKit::ViewSnapshotStore::discardSnapshotImages):
+ (WebKit::ViewSnapshot::create):
+ (WebKit::ViewSnapshot::ViewSnapshot):
+ (WebKit::ViewSnapshot::~ViewSnapshot):
+ (WebKit::ViewSnapshot::setSurface):
+ (WebKit::ViewSnapshot::hasImage):
+ (WebKit::ViewSnapshot::clearImage):
+ (WebKit::ViewSnapshot::asLayerContents):
+ (WebKit::ViewSnapshotStore::snapshottingContext): Deleted.
+
</ins><span class="cx"> 2015-11-06 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r189753.
</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 (192416 => 192417)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-13 15:59:27 UTC (rev 192416)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-13 17:02:40 UTC (rev 192417)
</span><span class="lines">@@ -1105,20 +1105,14 @@
</span><span class="cx"> - (PassRefPtr<WebKit::ViewSnapshot>)_takeViewSnapshot
</span><span class="cx"> {
</span><span class="cx"> float deviceScale = WKGetScreenScaleFactor();
</span><del>- CGSize snapshotSize = self.bounds.size;
- snapshotSize.width *= deviceScale;
- snapshotSize.height *= deviceScale;
</del><ins>+ WebCore::FloatSize snapshotSize(self.bounds.size);
+ snapshotSize.scale(deviceScale, deviceScale);
</ins><span class="cx">
</span><del>- uint32_t slotID = [WebKit::ViewSnapshotStore::snapshottingContext() createImageSlot:snapshotSize hasAlpha:YES];
-
- if (!slotID)
- return nullptr;
-
</del><span class="cx"> CATransform3D transform = CATransform3DMakeScale(deviceScale, deviceScale, 1);
</span><del>- CARenderServerCaptureLayerWithTransform(MACH_PORT_NULL, self.layer.context.contextId, (uint64_t)self.layer, slotID, 0, 0, &transform);
</del><ins>+ auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(snapshotSize), WebCore::ColorSpaceDeviceRGB);
+ CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform);
</ins><span class="cx">
</span><del>- WebCore::IntSize imageSize = WebCore::expandedIntSize(WebCore::FloatSize(snapshotSize));
- return WebKit::ViewSnapshot::create(slotID, imageSize, imageSize.width() * imageSize.height() * 4);
</del><ins>+ return WebKit::ViewSnapshot::create(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_zoomToPoint:(WebCore::FloatPoint)point atScale:(double)scale animated:(BOOL)animated
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessmacViewSnapshotStoreh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h (192416 => 192417)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h 2015-11-13 15:59:27 UTC (rev 192416)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.h 2015-11-13 17:02:40 UTC (rev 192417)
</span><span class="lines">@@ -41,14 +41,6 @@
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS CAContext;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
-#define USE_IOSURFACE_VIEW_SNAPSHOTS 1
-#define USE_RENDER_SERVER_VIEW_SNAPSHOTS 0
-#else
-#define USE_IOSURFACE_VIEW_SNAPSHOTS 0
-#define USE_RENDER_SERVER_VIEW_SNAPSHOTS 1
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> class IOSurface;
</span><span class="cx"> }
</span><span class="lines">@@ -61,11 +53,7 @@
</span><span class="cx">
</span><span class="cx"> class ViewSnapshot : public RefCounted<ViewSnapshot> {
</span><span class="cx"> public:
</span><del>-#if USE_IOSURFACE_VIEW_SNAPSHOTS
</del><span class="cx"> static Ref<ViewSnapshot> create(std::unique_ptr<WebCore::IOSurface>);
</span><del>-#elif USE_RENDER_SERVER_VIEW_SNAPSHOTS
- static Ref<ViewSnapshot> create(uint32_t slotID, WebCore::IntSize, size_t imageSizeInBytes);
-#endif
</del><span class="cx">
</span><span class="cx"> ~ViewSnapshot();
</span><span class="cx">
</span><span class="lines">@@ -82,29 +70,20 @@
</span><span class="cx"> void setDeviceScaleFactor(float deviceScaleFactor) { m_deviceScaleFactor = deviceScaleFactor; }
</span><span class="cx"> float deviceScaleFactor() const { return m_deviceScaleFactor; }
</span><span class="cx">
</span><del>- size_t imageSizeInBytes() const { return m_imageSizeInBytes; }
-#if USE_IOSURFACE_VIEW_SNAPSHOTS
</del><span class="cx"> WebCore::IOSurface* surface() const { return m_surface.get(); }
</span><del>-#endif
- WebCore::IntSize size() const { return m_size; }
</del><span class="cx">
</span><ins>+ size_t imageSizeInBytes() const { return m_surface ? m_surface->totalBytes() : 0; }
+ WebCore::IntSize size() const { return m_surface ? m_surface->size() : WebCore::IntSize(); }
+
+ void setSurface(std::unique_ptr<WebCore::IOSurface>);
+
</ins><span class="cx"> private:
</span><del>-#if USE_IOSURFACE_VIEW_SNAPSHOTS
</del><span class="cx"> explicit ViewSnapshot(std::unique_ptr<WebCore::IOSurface>);
</span><del>-#elif USE_RENDER_SERVER_VIEW_SNAPSHOTS
- explicit ViewSnapshot(uint32_t slotID, WebCore::IntSize, size_t imageSizeInBytes);
-#endif
</del><span class="cx">
</span><del>-#if USE_IOSURFACE_VIEW_SNAPSHOTS
</del><span class="cx"> std::unique_ptr<WebCore::IOSurface> m_surface;
</span><del>-#elif USE_RENDER_SERVER_VIEW_SNAPSHOTS
- uint32_t m_slotID;
-#endif
</del><span class="cx">
</span><del>- size_t m_imageSizeInBytes;
</del><span class="cx"> uint64_t m_renderTreeSize;
</span><span class="cx"> float m_deviceScaleFactor;
</span><del>- WebCore::IntSize m_size;
</del><span class="cx"> WebCore::Color m_backgroundColor;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -121,10 +100,6 @@
</span><span class="cx">
</span><span class="cx"> void discardSnapshotImages();
</span><span class="cx">
</span><del>-#if USE_RENDER_SERVER_VIEW_SNAPSHOTS
- static CAContext *snapshottingContext();
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> void didAddImageToSnapshot(ViewSnapshot&);
</span><span class="cx"> void willRemoveImageFromSnapshot(ViewSnapshot&);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessmacViewSnapshotStoremm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm (192416 => 192417)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm 2015-11-13 15:59:27 UTC (rev 192416)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/ViewSnapshotStore.mm 2015-11-13 17:02:40 UTC (rev 192417)
</span><span class="lines">@@ -37,11 +37,10 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#if USE_IOSURFACE_VIEW_SNAPSHOTS
-static const size_t maximumSnapshotCacheSize = 400 * (1024 * 1024);
-#elif USE_RENDER_SERVER_VIEW_SNAPSHOTS
-// Because render server snapshots are not purgeable, we should keep fewer around.
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> static const size_t maximumSnapshotCacheSize = 50 * (1024 * 1024);
</span><ins>+#else
+static const size_t maximumSnapshotCacheSize = 400 * (1024 * 1024);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -62,24 +61,6 @@
</span><span class="cx"> return store;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE_RENDER_SERVER_VIEW_SNAPSHOTS
-CAContext *ViewSnapshotStore::snapshottingContext()
-{
- static CAContext *context;
- static dispatch_once_t onceToken;
- dispatch_once(&onceToken, ^{
- NSDictionary *options = @{
- kCAContextDisplayName: @"WebKitSnapshotting",
- kCAContextIgnoresHitTest: @YES,
- kCAContextDisplayId : @20000
- };
- context = [[CAContext remoteContextWithOptions:options] retain];
- });
-
- return context;
-}
-#endif
-
</del><span class="cx"> void ViewSnapshotStore::didAddImageToSnapshot(ViewSnapshot& snapshot)
</span><span class="cx"> {
</span><span class="cx"> bool isNewEntry = m_snapshotsWithImages.add(&snapshot).isNewEntry;
</span><span class="lines">@@ -132,30 +113,13 @@
</span><span class="cx"> m_snapshotsWithImages.first()->clearImage();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-#if USE_IOSURFACE_VIEW_SNAPSHOTS
</del><span class="cx"> Ref<ViewSnapshot> ViewSnapshot::create(std::unique_ptr<IOSurface> surface)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new ViewSnapshot(WTF::move(surface)));
</span><span class="cx"> }
</span><del>-#elif USE_RENDER_SERVER_VIEW_SNAPSHOTS
-Ref<ViewSnapshot> ViewSnapshot::create(uint32_t slotID, IntSize size, size_t imageSizeInBytes)
-{
- return adoptRef(*new ViewSnapshot(slotID, size, imageSizeInBytes));
-}
-#endif
</del><span class="cx">
</span><del>-#if USE_IOSURFACE_VIEW_SNAPSHOTS
</del><span class="cx"> ViewSnapshot::ViewSnapshot(std::unique_ptr<IOSurface> surface)
</span><span class="cx"> : m_surface(WTF::move(surface))
</span><del>- , m_imageSizeInBytes(m_surface->totalBytes())
- , m_size(m_surface->size())
-#elif USE_RENDER_SERVER_VIEW_SNAPSHOTS
-ViewSnapshot::ViewSnapshot(uint32_t slotID, IntSize size, size_t imageSizeInBytes)
- : m_slotID(slotID)
- , m_imageSizeInBytes(imageSizeInBytes)
- , m_size(size)
-#endif
</del><span class="cx"> {
</span><span class="cx"> if (hasImage())
</span><span class="cx"> ViewSnapshotStore::singleton().didAddImageToSnapshot(*this);
</span><span class="lines">@@ -166,13 +130,21 @@
</span><span class="cx"> clearImage();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ViewSnapshot::setSurface(std::unique_ptr<WebCore::IOSurface> surface)
+{
+ ASSERT(!m_surface);
+ if (!surface) {
+ clearImage();
+ return;
+ }
+
+ m_surface = WTF::move(surface);
+ ViewSnapshotStore::singleton().didAddImageToSnapshot(*this);
+}
+
</ins><span class="cx"> bool ViewSnapshot::hasImage() const
</span><span class="cx"> {
</span><del>-#if USE_IOSURFACE_VIEW_SNAPSHOTS
</del><span class="cx"> return !!m_surface;
</span><del>-#elif USE_RENDER_SERVER_VIEW_SNAPSHOTS
- return m_slotID;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ViewSnapshot::clearImage()
</span><span class="lines">@@ -182,18 +154,11 @@
</span><span class="cx">
</span><span class="cx"> ViewSnapshotStore::singleton().willRemoveImageFromSnapshot(*this);
</span><span class="cx">
</span><del>-#if USE_IOSURFACE_VIEW_SNAPSHOTS
</del><span class="cx"> m_surface = nullptr;
</span><del>-#elif USE_RENDER_SERVER_VIEW_SNAPSHOTS
- [ViewSnapshotStore::snapshottingContext() deleteSlot:m_slotID];
- m_slotID = 0;
-#endif
- m_imageSizeInBytes = 0;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> id ViewSnapshot::asLayerContents()
</span><span class="cx"> {
</span><del>-#if USE_IOSURFACE_VIEW_SNAPSHOTS
</del><span class="cx"> if (!m_surface)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -203,9 +168,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return (id)m_surface->surface();
</span><del>-#elif USE_RENDER_SERVER_VIEW_SNAPSHOTS
- return [CAContext objectForSlot:m_slotID];
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>