<!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>[181272] 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/181272">181272</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-03-09 11:43:08 -0700 (Mon, 09 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>bmalloc: tryFastMalloc shouldn't crash
https://bugs.webkit.org/show_bug.cgi?id=142443
Reviewed by Anders Carlsson.
Part 1: Stop using tryFastRealloc.
* Shared/ShareableBitmap.cpp:
(WebKit::ShareableBitmap::resize): Deleted.
* Shared/ShareableBitmap.h: Removed the resize function because it has
no clients.
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::updateBackingStore): Changed to allocate a new
backing store instead of resizing the old one. This has three advantages:
(1) Might be more memory-efficient, since you don't have to keep the old
one around while allocating the new one.
(2) Avoids the overhead of realloc() copying the contents of the old
backing store even though we only want uninitialized memory.
(3) Makes resize failure consistent with initial allocation failure.
Previously, while initial allocation failure would set the backing store
to null, resize failure would keep the old wrong backing store and then
tell it not to paint. Now, resize failure also sets the backing store to
null.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="#trunkSourceWebKit2WebProcessPluginsPluginProxycpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181271 => 181272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-09 17:49:17 UTC (rev 181271)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-09 18:43:08 UTC (rev 181272)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-03-09 Geoffrey Garen <ggaren@apple.com>
+
+ bmalloc: tryFastMalloc shouldn't crash
+ https://bugs.webkit.org/show_bug.cgi?id=142443
+
+ Reviewed by Anders Carlsson.
+
+ Part 1: Stop using tryFastRealloc.
+
+ * Shared/ShareableBitmap.cpp:
+ (WebKit::ShareableBitmap::resize): Deleted.
+ * Shared/ShareableBitmap.h: Removed the resize function because it has
+ no clients.
+
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::updateBackingStore): Changed to allocate a new
+ backing store instead of resizing the old one. This has three advantages:
+
+ (1) Might be more memory-efficient, since you don't have to keep the old
+ one around while allocating the new one.
+
+ (2) Avoids the overhead of realloc() copying the contents of the old
+ backing store even though we only want uninitialized memory.
+
+ (3) Makes resize failure consistent with initial allocation failure.
+ Previously, while initial allocation failure would set the backing store
+ to null, resize failure would keep the old wrong backing store and then
+ tell it not to paint. Now, resize failure also sets the backing store to
+ null.
+
</ins><span class="cx"> 2015-03-09 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Move DispatchQueue to WTF
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedShareableBitmapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ShareableBitmap.cpp (181271 => 181272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ShareableBitmap.cpp 2015-03-09 17:49:17 UTC (rev 181271)
+++ trunk/Source/WebKit2/Shared/ShareableBitmap.cpp 2015-03-09 18:43:08 UTC (rev 181272)
</span><span class="lines">@@ -138,29 +138,6 @@
</span><span class="cx"> fastFree(m_data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ShareableBitmap::resize(const IntSize& size)
-{
- // We can't resize backing stores that are backed by shared memory.
- ASSERT(!isBackedBySharedMemory());
-
- if (size == m_size)
- return true;
-
- size_t newNumBytes = numBytesForSize(size);
-
- // Try to resize.
- char* newData = 0;
- if (!tryFastRealloc(m_data, newNumBytes).getValue(newData)) {
- // We failed, but the backing store is still kept in a consistent state.
- return false;
- }
-
- m_size = size;
- m_data = newData;
-
- return true;
-}
-
</del><span class="cx"> void* ShareableBitmap::data() const
</span><span class="cx"> {
</span><span class="cx"> if (isBackedBySharedMemory())
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedShareableBitmaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ShareableBitmap.h (181271 => 181272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ShareableBitmap.h 2015-03-09 17:49:17 UTC (rev 181271)
+++ trunk/Source/WebKit2/Shared/ShareableBitmap.h 2015-03-09 18:43:08 UTC (rev 181272)
</span><span class="lines">@@ -95,8 +95,6 @@
</span><span class="cx"> const WebCore::IntSize& size() const { return m_size; }
</span><span class="cx"> WebCore::IntRect bounds() const { return WebCore::IntRect(WebCore::IntPoint(), size()); }
</span><span class="cx">
</span><del>- bool resize(const WebCore::IntSize& size);
-
</del><span class="cx"> // Create a graphics context that can be used to paint into the backing store.
</span><span class="cx"> std::unique_ptr<WebCore::GraphicsContext> createGraphicsContext();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (181271 => 181272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2015-03-09 17:49:17 UTC (rev 181271)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2015-03-09 18:43:08 UTC (rev 181272)
</span><span class="lines">@@ -593,18 +593,15 @@
</span><span class="cx">
</span><span class="cx"> IntSize backingStoreSize = m_pluginSize;
</span><span class="cx"> backingStoreSize.scale(contentsScaleFactor());
</span><del>-
- if (!m_backingStore) {
- m_backingStore = ShareableBitmap::create(backingStoreSize, ShareableBitmap::SupportsAlpha);
- return true;
- }
</del><span class="cx">
</span><del>- if (backingStoreSize != m_backingStore->size()) {
- // The backing store already exists, just resize it.
- return m_backingStore->resize(backingStoreSize);
</del><ins>+ if (m_backingStore) {
+ if (m_backingStore->size() == backingStoreSize)
+ return false;
+ m_backingStore = nullptr; // Give malloc a chance to recycle our backing store.
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return false;
</del><ins>+ m_backingStore = ShareableBitmap::create(backingStoreSize, ShareableBitmap::SupportsAlpha);
+ return !!m_backingStore;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t PluginProxy::windowNPObjectID()
</span></span></pre>
</div>
</div>
</body>
</html>