<!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>[129133] releases/WebKitGTK/webkit-1.10/Source/WebCore</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/129133">129133</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2012-09-20 07:37:56 -0700 (Thu, 20 Sep 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merger <a href="http://trac.webkit.org/projects/webkit/changeset/128996">r128996</a> - [GTK] REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/128907">r128907</a>): it broke several WebKit2 API tests
https://bugs.webkit.org/show_bug.cgi?id=97092

Reviewed by Martin Robinson.

Calling resizeLater() from the constructor of
RedirectedXCompositeWindow can cause the callback to be called
later by the main loop after the RedirectedXCompositeWindow object
has been destroyed. Instead of calling resizeLater(), initialize
the usable size to the given initial size.

* platform/gtk/RedirectedXCompositeWindow.cpp:
(WebCore::RedirectedXCompositeWindow::RedirectedXCompositeWindow):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit110SourceWebCoreChangeLog">releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit110SourceWebCoreplatformgtkRedirectedXCompositeWindowcpp">releases/WebKitGTK/webkit-1.10/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit110SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog (129132 => 129133)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog        2012-09-20 14:34:24 UTC (rev 129132)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog        2012-09-20 14:37:56 UTC (rev 129133)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2012-09-19  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
+        [GTK] REGRESSION(r128907): it broke several WebKit2 API tests
+        https://bugs.webkit.org/show_bug.cgi?id=97092
+
+        Reviewed by Martin Robinson.
+
+        Calling resizeLater() from the constructor of
+        RedirectedXCompositeWindow can cause the callback to be called
+        later by the main loop after the RedirectedXCompositeWindow object
+        has been destroyed. Instead of calling resizeLater(), initialize
+        the usable size to the given initial size.
+
+        * platform/gtk/RedirectedXCompositeWindow.cpp:
+        (WebCore::RedirectedXCompositeWindow::RedirectedXCompositeWindow):
+
</ins><span class="cx"> 2012-09-18  Martin Robinson  &lt;mrobinson@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] [WebKit2] Use XComposite window for accelerated compositing
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit110SourceWebCoreplatformgtkRedirectedXCompositeWindowcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp (129132 => 129133)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-1.10/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp        2012-09-20 14:34:24 UTC (rev 129132)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp        2012-09-20 14:37:56 UTC (rev 129133)
</span><span class="lines">@@ -43,7 +43,8 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RedirectedXCompositeWindow::RedirectedXCompositeWindow(const IntSize&amp; size)
</span><del>-    : m_window(0)
</del><ins>+    : m_usableSize(size)
+    , m_window(0)
</ins><span class="cx">     , m_parentWindow(0)
</span><span class="cx">     , m_pixmap(0)
</span><span class="cx">     , m_surface(0)
</span><span class="lines">@@ -90,7 +91,6 @@
</span><span class="cx">     XCompositeRedirectWindow(display, m_window, CompositeRedirectManual);
</span><span class="cx"> 
</span><span class="cx">     resize(size);
</span><del>-    resizeLater(); // Force update of the usable area.
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RedirectedXCompositeWindow::~RedirectedXCompositeWindow()
</span></span></pre>
</div>
</div>

</body>
</html>