<!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>[210181] 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/210181">210181</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-27 18:48:19 -0800 (Tue, 27 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>reduce PassRefPtr use in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=166452
Patch by Alex Christensen <achristensen@webkit.org> on 2016-12-27
Reviewed by Yusuke Suzuki.
* Shared/API/c/cg/WKImageCG.cpp:
(WKImageCreateCGImage):
(WKImageCreateFromCGImage):
* Shared/ShareableBitmap.cpp:
(WebKit::ShareableBitmap::createHandle):
* Shared/ShareableBitmap.h:
* Shared/UserData.cpp:
(WebKit::UserData::encode):
(WebKit::UserData::decode):
* Shared/WebImage.cpp:
(WebKit::WebImage::create):
(WebKit::WebImage::WebImage):
* Shared/WebImage.h:
(WebKit::WebImage::bitmap):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didGetImageForFindMatch):
* UIProcess/mac/WKTextFinderClient.mm:
(-[WKTextFinderClient didGetImageForMatchResult:]):
* WebProcess/Automation/WebAutomationSessionProxy.cpp:
(WebKit::WebAutomationSessionProxy::takeScreenshot):
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm:
(-[WKWebProcessPlugInNodeHandle renderedImageWithOptions:]):
* WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
(WebKit::imageForRect):
(WebKit::InjectedBundleNodeHandle::renderedImage):
(WebKit::InjectedBundleNodeHandle::visibleRange):
(WebKit::InjectedBundleNodeHandle::htmlTableCellElementCellAbove):
(WebKit::InjectedBundleNodeHandle::documentFrame):
(WebKit::InjectedBundleNodeHandle::htmlFrameElementContentFrame):
(WebKit::InjectedBundleNodeHandle::htmlIFrameElementContentFrame):
* WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h:
* WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp:
(WebKit::InjectedBundleRangeHandle::renderedImage):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::takeSnapshot):
(WebKit::WebPage::snapshotAtSize):
(WebKit::WebPage::snapshotNode):
(WebKit::WebPage::drawRectToImage):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getPositionInformation):
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::setTopOverhangImage):
(WebKit::WebPage::setBottomOverhangImage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIccairoWKImageCairocpp">trunk/Source/WebKit2/Shared/API/c/cairo/WKImageCairo.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIccgWKImageCGcpp">trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedShareableBitmapcpp">trunk/Source/WebKit2/Shared/ShareableBitmap.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedShareableBitmaph">trunk/Source/WebKit2/Shared/ShareableBitmap.h</a></li>
<li><a href="#trunkSourceWebKit2SharedUserDatacpp">trunk/Source/WebKit2/Shared/UserData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebImagecpp">trunk/Source/WebKit2/Shared/WebImage.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebImageh">trunk/Source/WebKit2/Shared/WebImage.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKTextFinderClientmm">trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessAutomationWebAutomationSessionProxycpp">trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInNodeHandlemm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleNodeHandlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleNodeHandleh">trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleRangeHandlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2016-12-27 Alex Christensen <achristensen@webkit.org>
+
+ reduce PassRefPtr use in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=166452
+
+ Reviewed by Yusuke Suzuki.
+
+ * Shared/API/c/cg/WKImageCG.cpp:
+ (WKImageCreateCGImage):
+ (WKImageCreateFromCGImage):
+ * Shared/ShareableBitmap.cpp:
+ (WebKit::ShareableBitmap::createHandle):
+ * Shared/ShareableBitmap.h:
+ * Shared/UserData.cpp:
+ (WebKit::UserData::encode):
+ (WebKit::UserData::decode):
+ * Shared/WebImage.cpp:
+ (WebKit::WebImage::create):
+ (WebKit::WebImage::WebImage):
+ * Shared/WebImage.h:
+ (WebKit::WebImage::bitmap):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didGetImageForFindMatch):
+ * UIProcess/mac/WKTextFinderClient.mm:
+ (-[WKTextFinderClient didGetImageForMatchResult:]):
+ * WebProcess/Automation/WebAutomationSessionProxy.cpp:
+ (WebKit::WebAutomationSessionProxy::takeScreenshot):
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm:
+ (-[WKWebProcessPlugInNodeHandle renderedImageWithOptions:]):
+ * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
+ (WebKit::imageForRect):
+ (WebKit::InjectedBundleNodeHandle::renderedImage):
+ (WebKit::InjectedBundleNodeHandle::visibleRange):
+ (WebKit::InjectedBundleNodeHandle::htmlTableCellElementCellAbove):
+ (WebKit::InjectedBundleNodeHandle::documentFrame):
+ (WebKit::InjectedBundleNodeHandle::htmlFrameElementContentFrame):
+ (WebKit::InjectedBundleNodeHandle::htmlIFrameElementContentFrame):
+ * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h:
+ * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp:
+ (WebKit::InjectedBundleRangeHandle::renderedImage):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::takeSnapshot):
+ (WebKit::WebPage::snapshotAtSize):
+ (WebKit::WebPage::snapshotNode):
+ (WebKit::WebPage::drawRectToImage):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPositionInformation):
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::setTopOverhangImage):
+ (WebKit::WebPage::setBottomOverhangImage):
+
</ins><span class="cx"> 2016-12-27 Emanuele Aina <emanuele.aina@collabora.com>
</span><span class="cx">
</span><span class="cx"> Ensure NetworkProcess is ready before whitelisting TLS certificates
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIccairoWKImageCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/cairo/WKImageCairo.cpp (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/cairo/WKImageCairo.cpp 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/Shared/API/c/cairo/WKImageCairo.cpp 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> cairo_surface_t* WKImageCreateCairoSurface(WKImageRef imageRef)
</span><span class="cx"> {
</span><span class="cx"> // We cannot pass a RefPtr through the API here, so we just leak the reference.
</span><del>- return toImpl(imageRef)->bitmap()->createCairoSurface().leakRef();
</del><ins>+ return toImpl(imageRef)->bitmap().createCairoSurface().leakRef();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKImageRef WKImageCreateFromCairoSurface(cairo_surface_t* surface, WKImageOptions options)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> {
</span><span class="cx"> IntSize imageSize(cairo_image_surface_get_width(surface), cairo_image_surface_get_height(surface));
</span><span class="cx"> auto webImage = WebImage::create(imageSize, toImageOptions(options));
</span><del>- auto graphicsContext = webImage->bitmap()->createGraphicsContext();
</del><ins>+ auto graphicsContext = webImage->bitmap().createGraphicsContext();
</ins><span class="cx">
</span><span class="cx"> cairo_t* cr = graphicsContext->platformContext()->cr();
</span><span class="cx"> cairo_set_source_surface(cr, surface, 0, 0);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIccgWKImageCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -38,23 +38,21 @@
</span><span class="cx"> CGImageRef WKImageCreateCGImage(WKImageRef imageRef)
</span><span class="cx"> {
</span><span class="cx"> WebImage* webImage = toImpl(imageRef);
</span><del>- if (!webImage || !webImage->bitmap())
- return 0;
</del><ins>+ if (!webImage)
+ return nullptr;
</ins><span class="cx">
</span><del>- return webImage->bitmap()->makeCGImageCopy().leakRef();
</del><ins>+ return webImage->bitmap().makeCGImageCopy().leakRef();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKImageRef WKImageCreateFromCGImage(CGImageRef imageRef, WKImageOptions options)
</span><span class="cx"> {
</span><span class="cx"> if (!imageRef)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> IntSize imageSize(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef));
</span><span class="cx"> auto webImage = WebImage::create(imageSize, toImageOptions(options));
</span><del>- if (!webImage->bitmap())
- return 0;
</del><span class="cx">
</span><del>- auto graphicsContext = webImage->bitmap()->createGraphicsContext();
</del><ins>+ auto graphicsContext = webImage->bitmap().createGraphicsContext();
</ins><span class="cx"> FloatRect rect(FloatPoint(0, 0), imageSize);
</span><span class="cx"> graphicsContext->clearRect(rect);
</span><span class="cx"> graphicsContext->drawNativeImage(imageRef, imageSize, rect, rect);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedShareableBitmapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ShareableBitmap.cpp (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ShareableBitmap.cpp 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/Shared/ShareableBitmap.cpp 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> return create(handle.m_size, handle.m_flags, WTFMove(sharedMemory));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ShareableBitmap::createHandle(Handle& handle, SharedMemory::Protection protection)
</del><ins>+bool ShareableBitmap::createHandle(Handle& handle, SharedMemory::Protection protection) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isBackedBySharedMemory());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedShareableBitmaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ShareableBitmap.h (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ShareableBitmap.h 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/Shared/ShareableBitmap.h 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> static RefPtr<ShareableBitmap> create(const Handle&, SharedMemory::Protection = SharedMemory::Protection::ReadWrite);
</span><span class="cx">
</span><span class="cx"> // Create a handle.
</span><del>- bool createHandle(Handle&, SharedMemory::Protection = SharedMemory::Protection::ReadWrite);
</del><ins>+ bool createHandle(Handle&, SharedMemory::Protection = SharedMemory::Protection::ReadWrite) const;
</ins><span class="cx">
</span><span class="cx"> ~ShareableBitmap();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserData.cpp (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserData.cpp 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -217,8 +217,8 @@
</span><span class="cx"> auto& image = static_cast<const WebImage&>(object);
</span><span class="cx">
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><del>- ASSERT(!image.bitmap() || image.bitmap()->isBackedBySharedMemory());
- if (!image.bitmap() || !image.bitmap()->isBackedBySharedMemory() || !image.bitmap()->createHandle(handle)) {
</del><ins>+ ASSERT(image.bitmap().isBackedBySharedMemory());
+ if (!image.bitmap().isBackedBySharedMemory() || !image.bitmap().createHandle(handle)) {
</ins><span class="cx"> // Initial false indicates no allocated bitmap or is not shareable.
</span><span class="cx"> encoder << false;
</span><span class="cx"> break;
</span><span class="lines">@@ -420,7 +420,11 @@
</span><span class="cx"> if (!decoder.decode(handle))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- result = WebImage::create(ShareableBitmap::create(handle));
</del><ins>+ auto bitmap = ShareableBitmap::create(handle);
+ if (!bitmap)
+ return false;
+
+ result = WebImage::create(bitmap.releaseNonNull());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebImage.cpp (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebImage.cpp 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/Shared/WebImage.cpp 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -32,22 +32,28 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PassRefPtr<WebImage> WebImage::create(const IntSize& size, ImageOptions options)
</del><ins>+RefPtr<WebImage> WebImage::create(const IntSize& size, ImageOptions options)
</ins><span class="cx"> {
</span><del>- if (options & ImageOptionsShareable)
- return WebImage::create(ShareableBitmap::createShareable(size, ShareableBitmap::SupportsAlpha));
- return WebImage::create(ShareableBitmap::create(size, ShareableBitmap::SupportsAlpha));
</del><ins>+ if (options & ImageOptionsShareable) {
+ auto bitmap = ShareableBitmap::createShareable(size, ShareableBitmap::SupportsAlpha);
+ if (!bitmap)
+ return nullptr;
+ return WebImage::create(bitmap.releaseNonNull());
+ }
+ auto bitmap = ShareableBitmap::create(size, ShareableBitmap::SupportsAlpha);
+ if (!bitmap)
+ return nullptr;
+ return WebImage::create(bitmap.releaseNonNull());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebImage> WebImage::create(PassRefPtr<ShareableBitmap> bitmap)
</del><ins>+Ref<WebImage> WebImage::create(Ref<ShareableBitmap>&& bitmap)
</ins><span class="cx"> {
</span><del>- return adoptRef(new WebImage(bitmap));
</del><ins>+ return adoptRef(*new WebImage(WTFMove(bitmap)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WebImage::WebImage(PassRefPtr<ShareableBitmap> bitmap)
- : m_bitmap(bitmap)
</del><ins>+WebImage::WebImage(Ref<ShareableBitmap>&& bitmap)
+ : m_bitmap(WTFMove(bitmap))
</ins><span class="cx"> {
</span><del>- ASSERT(m_bitmap);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebImage::~WebImage()
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebImage.h (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebImage.h 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/Shared/WebImage.h 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -23,15 +23,14 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebImage_h
-#define WebImage_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "ImageOptions.h"
</span><del>-#include <wtf/RefPtr.h>
</del><ins>+#include <wtf/Ref.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>- class IntSize;
</del><ins>+class IntSize;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -42,20 +41,19 @@
</span><span class="cx">
</span><span class="cx"> class WebImage : public API::ObjectImpl<API::Object::Type::Image> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<WebImage> create(const WebCore::IntSize&, ImageOptions);
- static PassRefPtr<WebImage> create(PassRefPtr<ShareableBitmap>);
</del><ins>+ static RefPtr<WebImage> create(const WebCore::IntSize&, ImageOptions);
+ static Ref<WebImage> create(Ref<ShareableBitmap>&&);
</ins><span class="cx"> ~WebImage();
</span><span class="cx">
</span><span class="cx"> const WebCore::IntSize& size() const;
</span><span class="cx">
</span><del>- ShareableBitmap* bitmap() const { return m_bitmap.get(); }
</del><ins>+ ShareableBitmap& bitmap() { return m_bitmap.get(); }
+ const ShareableBitmap& bitmap() const { return m_bitmap.get(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- WebImage(PassRefPtr<ShareableBitmap>);
</del><ins>+ WebImage(Ref<ShareableBitmap>&&);
</ins><span class="cx">
</span><del>- RefPtr<ShareableBitmap> m_bitmap;
</del><ins>+ Ref<ShareableBitmap> m_bitmap;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // WebImage_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -3414,10 +3414,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (RefPtr<ShareableBitmap> image = webImage->bitmap())
- g_task_return_pointer(task.get(), image->createCairoSurface().leakRef(), reinterpret_cast<GDestroyNotify>(cairo_surface_destroy));
- else
- g_task_return_pointer(task.get(), 0, 0);
</del><ins>+ g_task_return_pointer(task.get(), webImage->bitmap().createCairoSurface().leakRef(), reinterpret_cast<GDestroyNotify>(cairo_surface_destroy));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline unsigned webKitSnapshotOptionsToSnapshotOptions(WebKitSnapshotOptions options)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -4434,7 +4434,12 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didGetImageForFindMatch(const ShareableBitmap::Handle& contentImageHandle, uint32_t matchIndex)
</span><span class="cx"> {
</span><del>- m_findMatchesClient->didGetImageForMatchResult(this, WebImage::create(ShareableBitmap::create(contentImageHandle)).get(), matchIndex);
</del><ins>+ auto bitmap = ShareableBitmap::create(contentImageHandle);
+ if (!bitmap) {
+ ASSERT_NOT_REACHED();
+ return;
+ }
+ m_findMatchesClient->didGetImageForMatchResult(this, WebImage::create(bitmap.releaseNonNull()).ptr(), matchIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setTextIndicator(const TextIndicatorData& indicatorData, uint64_t lifetime)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKTextFinderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/UIProcess/mac/WKTextFinderClient.mm 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -248,11 +248,11 @@
</span><span class="cx"> if (_imageReplyCallbacks.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- IntSize size = image->bitmap()->size();
</del><ins>+ IntSize size = image->bitmap().size();
</ins><span class="cx"> size.scale(1 / _page->deviceScaleFactor());
</span><span class="cx">
</span><span class="cx"> auto imageCallback = _imageReplyCallbacks.takeFirst();
</span><del>- imageCallback(adoptNS([[NSImage alloc] initWithCGImage:image->bitmap()->makeCGImage().get() size:size]).get());
</del><ins>+ imageCallback(adoptNS([[NSImage alloc] initWithCGImage:image->bitmap().makeCGImage().get() size:size]).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark - WKTextFinderMatch callbacks
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessAutomationWebAutomationSessionProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.cpp (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.cpp 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.cpp 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -534,7 +534,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebImage> image = page->scaledSnapshotWithOptions(snapshotRect, 1, SnapshotOptionsShareable);
</span><span class="cx"> if (image)
</span><del>- image->bitmap()->createHandle(handle, SharedMemory::Protection::ReadOnly);
</del><ins>+ image->bitmap().createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx">
</span><span class="cx"> WebProcess::singleton().parentProcessConnection()->send(Messages::WebAutomationSession::DidTakeScreenshot(callbackID, handle, String()), 0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInNodeHandlemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -68,10 +68,10 @@
</span><span class="cx"> - (UIImage *)renderedImageWithOptions:(WKSnapshotOptions)options
</span><span class="cx"> {
</span><span class="cx"> RefPtr<WebImage> image = _nodeHandle->renderedImage(options);
</span><del>- if (!image || !image->bitmap())
</del><ins>+ if (!image)
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><del>- return [[[UIImage alloc] initWithCGImage:image->bitmap()->makeCGImage().get()] autorelease];
</del><ins>+ return [[[UIImage alloc] initWithCGImage:image->bitmap().makeCGImage().get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -79,10 +79,10 @@
</span><span class="cx"> - (NSImage *)renderedImageWithOptions:(WKSnapshotOptions)options
</span><span class="cx"> {
</span><span class="cx"> RefPtr<WebImage> image = _nodeHandle->renderedImage(options);
</span><del>- if (!image || !image->bitmap())
</del><ins>+ if (!image)
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><del>- return [[[NSImage alloc] initWithCGImage:image->bitmap()->makeCGImage().get() size:NSZeroSize] autorelease];
</del><ins>+ return [[[NSImage alloc] initWithCGImage:image->bitmap().makeCGImage().get() size:NSZeroSize] autorelease];
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleNodeHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> return m_node->pixelSnappedRenderRect(isReplaced);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<WebImage> imageForRect(FrameView* frameView, const IntRect& rect, SnapshotOptions options)
</del><ins>+static RefPtr<WebImage> imageForRect(FrameView* frameView, const IntRect& rect, SnapshotOptions options)
</ins><span class="cx"> {
</span><span class="cx"> IntSize bitmapSize = rect.size();
</span><span class="cx"> float scaleFactor = frameView->frame().page()->deviceScaleFactor();
</span><span class="lines">@@ -141,10 +141,8 @@
</span><span class="cx"> bitmapSize.scale(scaleFactor);
</span><span class="cx">
</span><span class="cx"> auto snapshot = WebImage::create(bitmapSize, snapshotOptionsToImageOptions(options));
</span><del>- if (!snapshot->bitmap())
- return 0;
</del><span class="cx">
</span><del>- auto graphicsContext = snapshot->bitmap()->createGraphicsContext();
</del><ins>+ auto graphicsContext = snapshot->bitmap().createGraphicsContext();
</ins><span class="cx"> graphicsContext->clearRect(IntRect(IntPoint(), bitmapSize));
</span><span class="cx"> graphicsContext->applyDeviceScaleFactor(scaleFactor);
</span><span class="cx"> graphicsContext->translate(-rect.x(), -rect.y());
</span><span class="lines">@@ -167,7 +165,7 @@
</span><span class="cx"> return snapshot;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebImage> InjectedBundleNodeHandle::renderedImage(SnapshotOptions options)
</del><ins>+RefPtr<WebImage> InjectedBundleNodeHandle::renderedImage(SnapshotOptions options)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = m_node->document().frame();
</span><span class="cx"> if (!frame)
</span><span class="lines">@@ -193,7 +191,7 @@
</span><span class="cx"> return image;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<InjectedBundleRangeHandle> InjectedBundleNodeHandle::visibleRange()
</del><ins>+RefPtr<InjectedBundleRangeHandle> InjectedBundleNodeHandle::visibleRange()
</ins><span class="cx"> {
</span><span class="cx"> VisiblePosition start = firstPositionInNode(m_node.ptr());
</span><span class="cx"> VisiblePosition end = lastPositionInNode(m_node.ptr());
</span><span class="lines">@@ -286,7 +284,7 @@
</span><span class="cx"> return downcast<HTMLInputElement>(m_node.get()).isText();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<InjectedBundleNodeHandle> InjectedBundleNodeHandle::htmlTableCellElementCellAbove()
</del><ins>+RefPtr<InjectedBundleNodeHandle> InjectedBundleNodeHandle::htmlTableCellElementCellAbove()
</ins><span class="cx"> {
</span><span class="cx"> if (!is<HTMLTableCellElement>(m_node))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -294,7 +292,7 @@
</span><span class="cx"> return getOrCreate(downcast<HTMLTableCellElement>(m_node.get()).cellAbove());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebFrame> InjectedBundleNodeHandle::documentFrame()
</del><ins>+RefPtr<WebFrame> InjectedBundleNodeHandle::documentFrame()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_node->isDocumentNode())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -306,7 +304,7 @@
</span><span class="cx"> return WebFrame::fromCoreFrame(*frame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebFrame> InjectedBundleNodeHandle::htmlFrameElementContentFrame()
</del><ins>+RefPtr<WebFrame> InjectedBundleNodeHandle::htmlFrameElementContentFrame()
</ins><span class="cx"> {
</span><span class="cx"> if (!is<HTMLFrameElement>(m_node))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -318,7 +316,7 @@
</span><span class="cx"> return WebFrame::fromCoreFrame(*frame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebFrame> InjectedBundleNodeHandle::htmlIFrameElementContentFrame()
</del><ins>+RefPtr<WebFrame> InjectedBundleNodeHandle::htmlIFrameElementContentFrame()
</ins><span class="cx"> {
</span><span class="cx"> if (!is<HTMLIFrameElement>(m_node))
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleNodeHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -23,20 +23,18 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef InjectedBundleNodeHandle_h
-#define InjectedBundleNodeHandle_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "ImageOptions.h"
</span><span class="cx"> #include <JavaScriptCore/JSBase.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>- class IntRect;
- class Node;
- enum class AutoFillButtonType : uint8_t;
</del><ins>+class IntRect;
+class Node;
+enum class AutoFillButtonType : uint8_t;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -63,8 +61,8 @@
</span><span class="cx"> // Note: These should only be operations that are not exposed to JavaScript.
</span><span class="cx"> WebCore::IntRect elementBounds();
</span><span class="cx"> WebCore::IntRect renderRect(bool*);
</span><del>- PassRefPtr<WebImage> renderedImage(SnapshotOptions);
- PassRefPtr<InjectedBundleRangeHandle> visibleRange();
</del><ins>+ RefPtr<WebImage> renderedImage(SnapshotOptions);
+ RefPtr<InjectedBundleRangeHandle> visibleRange();
</ins><span class="cx"> void setHTMLInputElementValueForUser(const String&);
</span><span class="cx"> void setHTMLInputElementSpellcheckEnabled(bool);
</span><span class="cx"> bool isHTMLInputElementAutoFilled() const;
</span><span class="lines">@@ -76,11 +74,11 @@
</span><span class="cx"> bool htmlTextAreaElementLastChangeWasUserEdit();
</span><span class="cx"> bool isTextField() const;
</span><span class="cx">
</span><del>- PassRefPtr<InjectedBundleNodeHandle> htmlTableCellElementCellAbove();
</del><ins>+ RefPtr<InjectedBundleNodeHandle> htmlTableCellElementCellAbove();
</ins><span class="cx">
</span><del>- PassRefPtr<WebFrame> documentFrame();
- PassRefPtr<WebFrame> htmlFrameElementContentFrame();
- PassRefPtr<WebFrame> htmlIFrameElementContentFrame();
</del><ins>+ RefPtr<WebFrame> documentFrame();
+ RefPtr<WebFrame> htmlFrameElementContentFrame();
+ RefPtr<WebFrame> htmlIFrameElementContentFrame();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static Ref<InjectedBundleNodeHandle> create(WebCore::Node&);
</span><span class="lines">@@ -90,5 +88,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // InjectedBundleNodeHandle_h
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleDOMInjectedBundleRangeHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx">
</span><span class="cx"> frame->selection().setSelection(oldSelection);
</span><span class="cx">
</span><del>- return WebImage::create(backingStore);
</del><ins>+ return WebImage::create(backingStore.releaseNonNull());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -1859,7 +1859,7 @@
</span><span class="cx">
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> if (image)
</span><del>- image->bitmap()->createHandle(handle, SharedMemory::Protection::ReadOnly);
</del><ins>+ image->bitmap().createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx">
</span><span class="cx"> send(Messages::WebPageProxy::ImageCallback(handle, callbackID));
</span><span class="cx"> }
</span><span class="lines">@@ -1900,10 +1900,8 @@
</span><span class="cx"> float scaleFactor = std::max(horizontalScaleFactor, verticalScaleFactor);
</span><span class="cx">
</span><span class="cx"> auto snapshot = WebImage::create(bitmapSize, snapshotOptionsToImageOptions(options));
</span><del>- if (!snapshot->bitmap())
- return nullptr;
</del><span class="cx">
</span><del>- auto graphicsContext = snapshot->bitmap()->createGraphicsContext();
</del><ins>+ auto graphicsContext = snapshot->bitmap().createGraphicsContext();
</ins><span class="cx">
</span><span class="cx"> if (options & SnapshotOptionsPrinting) {
</span><span class="cx"> PrintContext::spoolAllPagesWithBoundaries(*coreFrame, *graphicsContext, snapshotRect.size());
</span><span class="lines">@@ -1969,10 +1967,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto snapshot = WebImage::create(snapshotSize, snapshotOptionsToImageOptions(options));
</span><del>- if (!snapshot->bitmap())
- return nullptr;
</del><span class="cx">
</span><del>- auto graphicsContext = snapshot->bitmap()->createGraphicsContext();
</del><ins>+ auto graphicsContext = snapshot->bitmap().createGraphicsContext();
</ins><span class="cx">
</span><span class="cx"> if (!(options & SnapshotOptionsExcludeDeviceScaleFactor)) {
</span><span class="cx"> double deviceScaleFactor = corePage()->deviceScaleFactor();
</span><span class="lines">@@ -4267,6 +4263,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> auto bitmap = ShareableBitmap::createShareable(imageSize, ShareableBitmap::SupportsAlpha);
</span><ins>+ if (!bitmap) {
+ ASSERT_NOT_REACHED();
+ return;
+ }
</ins><span class="cx"> auto graphicsContext = bitmap->createGraphicsContext();
</span><span class="cx">
</span><span class="cx"> float printingScale = static_cast<float>(imageSize.width()) / rect.width();
</span><span class="lines">@@ -4284,7 +4284,7 @@
</span><span class="cx"> m_printContext->spoolRect(*graphicsContext, rect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- image = WebImage::create(WTFMove(bitmap));
</del><ins>+ image = WebImage::create(bitmap.releaseNonNull());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -4291,7 +4291,7 @@
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx">
</span><span class="cx"> if (image)
</span><del>- image->bitmap()->createHandle(handle, SharedMemory::Protection::ReadOnly);
</del><ins>+ image->bitmap().createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx">
</span><span class="cx"> send(Messages::WebPageProxy::ImageCallback(handle, callbackID));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -2335,7 +2335,7 @@
</span><span class="cx"> if (request.includeSnapshot) {
</span><span class="cx"> // Ensure that the image contains at most 600K pixels, so that it is not too big.
</span><span class="cx"> if (RefPtr<WebImage> snapshot = snapshotNode(*element, SnapshotOptionsShareable, 600 * 1024))
</span><del>- info.image = snapshot->bitmap();
</del><ins>+ info.image = &snapshot->bitmap();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (request.includeLinkIndicator) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (210180 => 210181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2016-12-27 17:57:18 UTC (rev 210180)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2016-12-28 02:48:19 UTC (rev 210181)
</span><span class="lines">@@ -786,7 +786,7 @@
</span><span class="cx"> layer->setSize(image->size());
</span><span class="cx"> layer->setPosition(FloatPoint(0, -image->size().height()));
</span><span class="cx">
</span><del>- RetainPtr<CGImageRef> cgImage = image->bitmap()->makeCGImageCopy();
</del><ins>+ RetainPtr<CGImageRef> cgImage = image->bitmap().makeCGImageCopy();
</ins><span class="cx"> layer->platformLayer().contents = (id)cgImage.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -802,7 +802,7 @@
</span><span class="cx">
</span><span class="cx"> layer->setSize(image->size());
</span><span class="cx">
</span><del>- RetainPtr<CGImageRef> cgImage = image->bitmap()->makeCGImageCopy();
</del><ins>+ RetainPtr<CGImageRef> cgImage = image->bitmap().makeCGImageCopy();
</ins><span class="cx"> layer->platformLayer().contents = (id)cgImage.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>