Changeset 102184 in webkit

Timestamp:

Dec 6, 2011, 3:29:48 PM (15 years ago)

Author:

aestes@apple.com

Message:

REGRESSION (r101838): Crash in LayerTreeHostCA::initialize() when accelerated drawing is enabled
​https://bugs.webkit.org/show_bug.cgi?id=73955

Reviewed by Anders Carlsson.

• WebProcess/WebPage/ca/LayerTreeHostCA.cpp:

(WebKit::LayerTreeHostCA::initialize): m_webPage->drawingArea() will be
null here if we are initializing the layer tree host in DrawingArea's
ctor (as is the case when accelerated drawing is enabled), before
WebPage has set its m_drawingArea pointer. Since the layer tree cannot
have been frozen at this point, it's safe to enable layer flush
scheduling if drawingArea() is null.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/ca/LayerTreeHostCA.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-12-06  Andy Estes  <aestes@apple.com>
+
+        REGRESSION (r101838): Crash in LayerTreeHostCA::initialize() when accelerated drawing is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=73955
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/WebPage/ca/LayerTreeHostCA.cpp:
+        (WebKit::LayerTreeHostCA::initialize): m_webPage->drawingArea() will be
+        null here if we are initializing the layer tree host in DrawingArea's
+        ctor (as is the case when accelerated drawing is enabled), before
+        WebPage has set its m_drawingArea pointer. Since the layer tree cannot
+        have been frozen at this point, it's safe to enable layer flush
+        scheduling if drawingArea() is null.
+
 2011-12-06  Alexander Færøy  <alexander.faeroy@nokia.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/ca/LayerTreeHostCA.cpp

@@ -78 +78 @@
     platformInitialize(m_layerTreeContext);
 
-    setLayerFlushSchedulingEnabled(!m_webPage->drawingArea()->layerTreeStateIsFrozen());
+    setLayerFlushSchedulingEnabled(!m_webPage->drawingArea() || !m_webPage->drawingArea()->layerTreeStateIsFrozen());
     scheduleLayerFlush();
 }