<!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>[150735] trunk/Source/WebKit/blackberry</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/150735">150735</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-05-26 23:55:18 -0700 (Sun, 26 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[BlackBerry] Make screen updates dependent on the existence of a drawing buffer.
https://bugs.webkit.org/show_bug.cgi?id=116539
Internal PR 330917

Patch by Jakob Petsovits &lt;jpetsovits@blackberry.com&gt; on 2013-05-26
Reviewed by Carlos Garcia Campos.
Internally reviewed by Xiaobo Wang and Arvid Nilsson.

This reduces complexity by relying on the current state,
rather than the suspend counter, which in turn makes it
possible to simplify the code in setCompositor().

* Api/BackingStore.cpp:
(BlackBerry::WebKit::BackingStorePrivate::updateSuspendScreenUpdateState):
(BlackBerry::WebKit::BackingStorePrivate::createSurfaces):
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::setCompositor):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitblackberryApiBackingStorecpp">trunk/Source/WebKit/blackberry/Api/BackingStore.cpp</a></li>
<li><a href="#trunkSourceWebKitblackberryApiWebPagecpp">trunk/Source/WebKit/blackberry/Api/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKitblackberryChangeLog">trunk/Source/WebKit/blackberry/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitblackberryApiBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/Api/BackingStore.cpp (150734 => 150735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/Api/BackingStore.cpp        2013-05-27 02:33:09 UTC (rev 150734)
+++ trunk/Source/WebKit/blackberry/Api/BackingStore.cpp        2013-05-27 06:55:18 UTC (rev 150735)
</span><span class="lines">@@ -410,6 +410,7 @@
</span><span class="cx">         &amp;&amp; (m_suspendBackingStoreUpdates || !m_renderQueue-&gt;hasCurrentVisibleZoomJob()); // Backingstore is not usable while we're waiting for an (&quot;atomic&quot;) zoom job to finish.
</span><span class="cx"> 
</span><span class="cx">     bool shouldSuspend = m_suspendScreenUpdateCounterWebKitThread
</span><ins>+        || !buffer()
</ins><span class="cx">         || !m_webPage-&gt;isVisible()
</span><span class="cx">         || (!isBackingStoreUsable &amp;&amp; !m_webPage-&gt;d-&gt;compositorDrawsRootLayer());
</span><span class="cx"> 
</span><span class="lines">@@ -1698,9 +1699,9 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    // Don't try to blit to screen unless we have a buffer.
-    if (!buffer())
-        suspendScreenUpdates();
</del><ins>+    // Initialize (initially, probably suspend) screen updates based on various
+    // conditions, including whether or not we have a drawing target buffer.
+    updateSuspendScreenUpdateState();
</ins><span class="cx"> 
</span><span class="cx">     SurfacePool* surfacePool = SurfacePool::globalSurfacePool();
</span><span class="cx">     surfacePool-&gt;initialize(tileSize());
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryApiWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (150734 => 150735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp        2013-05-27 02:33:09 UTC (rev 150734)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp        2013-05-27 06:55:18 UTC (rev 150735)
</span><span class="lines">@@ -5339,15 +5339,13 @@
</span><span class="cx">     // That seems extremely likely to be the case, but let's assert just to make sure.
</span><span class="cx">     ASSERT(webKitThreadMessageClient()-&gt;isCurrentThread());
</span><span class="cx"> 
</span><del>-    if (m_compositor || m_client-&gt;window())
-        m_backingStore-&gt;d-&gt;suspendScreenUpdates();
</del><ins>+    m_backingStore-&gt;d-&gt;suspendScreenUpdates();
</ins><span class="cx"> 
</span><span class="cx">     // The m_compositor member has to be modified during a sync call for thread
</span><span class="cx">     // safe access to m_compositor and its refcount.
</span><span class="cx">     userInterfaceThreadMessageClient()-&gt;dispatchSyncMessage(createMethodCallMessage(&amp;WebPagePrivate::setCompositorHelper, this, compositor));
</span><span class="cx"> 
</span><del>-    if (m_compositor || m_client-&gt;window()) // the new compositor, if one was set
-        m_backingStore-&gt;d-&gt;resumeScreenUpdates(BackingStore::RenderAndBlit);
</del><ins>+    m_backingStore-&gt;d-&gt;resumeScreenUpdates(BackingStore::RenderAndBlit);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebPagePrivate::setCompositorHelper(PassRefPtr&lt;WebPageCompositorPrivate&gt; compositor)
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/ChangeLog (150734 => 150735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/ChangeLog        2013-05-27 02:33:09 UTC (rev 150734)
+++ trunk/Source/WebKit/blackberry/ChangeLog        2013-05-27 06:55:18 UTC (rev 150735)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-05-26  Jakob Petsovits  &lt;jpetsovits@blackberry.com&gt;
+
+        [BlackBerry] Make screen updates dependent on the existence of a drawing buffer.
+        https://bugs.webkit.org/show_bug.cgi?id=116539
+        Internal PR 330917
+
+        Reviewed by Carlos Garcia Campos.
+        Internally reviewed by Xiaobo Wang and Arvid Nilsson.
+
+        This reduces complexity by relying on the current state,
+        rather than the suspend counter, which in turn makes it
+        possible to simplify the code in setCompositor().
+
+        * Api/BackingStore.cpp:
+        (BlackBerry::WebKit::BackingStorePrivate::updateSuspendScreenUpdateState):
+        (BlackBerry::WebKit::BackingStorePrivate::createSurfaces):
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::setCompositor):
+
</ins><span class="cx"> 2013-05-26  Kent Tamura  &lt;tkent@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove ENABLE_CALENDAR_PICKER
</span></span></pre>
</div>
</div>

</body>
</html>