<!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>[181240] releases/WebKitGTK/webkit-2.8/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/181240">181240</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-08 03:18:49 -0700 (Sun, 08 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/181138">r181138</a> - REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/180924">r180924</a>): ASSERTION FAILED: !from.isEmpty() in WebCore::TransformationMatrix::rectToRect
https://bugs.webkit.org/show_bug.cgi?id=142345
Reviewed by Martin Robinson.
This was caused by <a href="http://trac.webkit.org/projects/webkit/changeset/180924">r180924</a> that postpones the creation of the
TextureMapper, which could cause that a layer has not yet a size
when TextureMapper::paint() is called. This patch moves the
creation of the TextureMapper to
LayerTreeHostGtk::setNativeSurfaceHandleForCompositing(), so that
it's created as soon as it's possible to create. This method is
called by the drawing area right after creating the
LayerTreeHostGtk if it already have a handler, or when the handle
is received from the UI process.
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::initialize): Remove the
nsureTextureMapper call because at this point the layer context ID
is always 0, so it's impossible to create the TextureMapper.
(WebKit::LayerTreeHostGtk::compositeLayersToContext): Remove the
ensureTextureMapper call from here too, since at this point, if we
have a context, we should also have a TextureMapper. Add an ASSERT
right before using the TextureMapper.
(WebKit::LayerTreeHostGtk::setNativeSurfaceHandleForCompositing):
Create the TextureMapper here.
(WebKit::LayerTreeHostGtk::ensureTextureMapper): Deleted.
* WebProcess/WebPage/gtk/LayerTreeHostGtk.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp">releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkh">releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (181239 => 181240)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-08 10:15:31 UTC (rev 181239)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-08 10:18:49 UTC (rev 181240)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-03-05 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(r180924): ASSERTION FAILED: !from.isEmpty() in WebCore::TransformationMatrix::rectToRect
+ https://bugs.webkit.org/show_bug.cgi?id=142345
+
+ Reviewed by Martin Robinson.
+
+ This was caused by r180924 that postpones the creation of the
+ TextureMapper, which could cause that a layer has not yet a size
+ when TextureMapper::paint() is called. This patch moves the
+ creation of the TextureMapper to
+ LayerTreeHostGtk::setNativeSurfaceHandleForCompositing(), so that
+ it's created as soon as it's possible to create. This method is
+ called by the drawing area right after creating the
+ LayerTreeHostGtk if it already have a handler, or when the handle
+ is received from the UI process.
+
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+ (WebKit::LayerTreeHostGtk::initialize): Remove the
+ nsureTextureMapper call because at this point the layer context ID
+ is always 0, so it's impossible to create the TextureMapper.
+ (WebKit::LayerTreeHostGtk::compositeLayersToContext): Remove the
+ ensureTextureMapper call from here too, since at this point, if we
+ have a context, we should also have a TextureMapper. Add an ASSERT
+ right before using the TextureMapper.
+ (WebKit::LayerTreeHostGtk::setNativeSurfaceHandleForCompositing):
+ Create the TextureMapper here.
+ (WebKit::LayerTreeHostGtk::ensureTextureMapper): Deleted.
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
+
</ins><span class="cx"> 2015-03-05 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Disable RC4
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (181239 => 181240)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2015-03-08 10:15:31 UTC (rev 181239)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2015-03-08 10:18:49 UTC (rev 181240)
</span><span class="lines">@@ -92,17 +92,6 @@
</span><span class="cx"> return m_context->makeContextCurrent();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LayerTreeHostGtk::ensureTextureMapper()
-{
- if (m_textureMapper)
- return;
-
- ASSERT(m_isValid);
- m_textureMapper = TextureMapper::create(TextureMapper::OpenGLMode);
- static_cast<TextureMapperGL*>(m_textureMapper.get())->setEnableEdgeDistanceAntialiasing(true);
- downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setTextureMapper(m_textureMapper.get());
-}
-
</del><span class="cx"> void LayerTreeHostGtk::initialize()
</span><span class="cx"> {
</span><span class="cx"> m_rootLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><span class="lines">@@ -124,13 +113,6 @@
</span><span class="cx">
</span><span class="cx"> m_rootLayer->addChild(m_nonCompositedContentLayer.get());
</span><span class="cx"> m_nonCompositedContentLayer->setNeedsDisplay();
</span><del>-
- // The creation of the TextureMapper needs an active OpenGL context.
- if (!makeContextCurrent())
- return;
-
- ensureTextureMapper();
- scheduleLayerFlush();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayerTreeHostGtk::~LayerTreeHostGtk()
</span><span class="lines">@@ -296,8 +278,6 @@
</span><span class="cx"> if (!makeContextCurrent())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ensureTextureMapper();
-
</del><span class="cx"> // The window size may be out of sync with the page size at this point, and getting
</span><span class="cx"> // the viewport parameters incorrect, means that the content will be misplaced. Thus
</span><span class="cx"> // we set the viewport parameters directly from the window size.
</span><span class="lines">@@ -309,6 +289,7 @@
</span><span class="cx"> glClear(GL_COLOR_BUFFER_BIT);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ASSERT(m_textureMapper);
</ins><span class="cx"> m_textureMapper->beginPainting();
</span><span class="cx"> downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().paint();
</span><span class="cx"> m_textureMapper->endPainting();
</span><span class="lines">@@ -344,7 +325,7 @@
</span><span class="cx">
</span><span class="cx"> void LayerTreeHostGtk::scheduleLayerFlush()
</span><span class="cx"> {
</span><del>- if (!m_layerFlushSchedulingEnabled)
</del><ins>+ if (!m_layerFlushSchedulingEnabled || !m_textureMapper)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // We use a GLib timer because otherwise GTK+ event handling during dragging can starve WebCore timers, which have a lower priority.
</span><span class="lines">@@ -387,6 +368,18 @@
</span><span class="cx"> void LayerTreeHostGtk::setNativeSurfaceHandleForCompositing(uint64_t handle)
</span><span class="cx"> {
</span><span class="cx"> m_layerTreeContext.contextID = handle;
</span><ins>+
+ // The creation of the TextureMapper needs an active OpenGL context.
+ if (!makeContextCurrent())
+ return;
+
+ ASSERT(m_isValid);
+ ASSERT(!m_textureMapper);
+ m_textureMapper = TextureMapper::create(TextureMapper::OpenGLMode);
+ static_cast<TextureMapperGL*>(m_textureMapper.get())->setEnableEdgeDistanceAntialiasing(true);
+ downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setTextureMapper(m_textureMapper.get());
+
+ scheduleLayerFlush();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h (181239 => 181240)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2015-03-08 10:15:31 UTC (rev 181239)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2015-03-08 10:18:49 UTC (rev 181240)
</span><span class="lines">@@ -87,7 +87,6 @@
</span><span class="cx"> void layerFlushTimerFired();
</span><span class="cx">
</span><span class="cx"> bool makeContextCurrent();
</span><del>- void ensureTextureMapper();
</del><span class="cx">
</span><span class="cx"> LayerTreeContext m_layerTreeContext;
</span><span class="cx"> bool m_isValid;
</span></span></pre>
</div>
</div>
</body>
</html>