Changeset 181138 in webkit

Timestamp:

Mar 5, 2015 10:16:04 PM (9 years ago)

Author:

Carlos Garcia Campos

Message:

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:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (modified) (6 diffs)
• WebProcess/WebPage/gtk/LayerTreeHostGtk.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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:
+
 2015-03-05  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp

@@ -93 +93 @@
 }
 
-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());
-}
-
 void LayerTreeHostGtk::initialize()
 {
@@ -125 +114 @@
     m_rootLayer->addChild(m_nonCompositedContentLayer.get());
     m_nonCompositedContentLayer->setNeedsDisplay();
-
-    // The creation of the TextureMapper needs an active OpenGL context.
-    if (!makeContextCurrent())
-        return;
-
-    ensureTextureMapper();
-    scheduleLayerFlush();
 }
 
@@ -297 +279 @@
         return;
 
-    ensureTextureMapper();
-
     // The window size may be out of sync with the page size at this point, and getting
     // the viewport parameters incorrect, means that the content will be misplaced. Thus
@@ -310 +290 @@
     }
 
+    ASSERT(m_textureMapper);
     m_textureMapper->beginPainting();
     downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().paint();
@@ -345 +326 @@
 void LayerTreeHostGtk::scheduleLayerFlush()
 {
-    if (!m_layerFlushSchedulingEnabled)
+    if (!m_layerFlushSchedulingEnabled || !m_textureMapper)
         return;
 
@@ -388 +369 @@
 {
     m_layerTreeContext.contextID = handle;
+
+    // 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();
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h

@@ -88 +88 @@
 
     bool makeContextCurrent();
-    void ensureTextureMapper();
 
     LayerTreeContext m_layerTreeContext;