Changeset 140716 in webkit

Timestamp:

Jan 24, 2013 1:31:00 PM (11 years ago)

Author:

jamesr@google.com

Message:

[chromium] Null check WebLayerTreeView before dereffing in WebViewImpl::invalidateRect
​https://bugs.webkit.org/show_bug.cgi?id=107855

Reviewed by Adrienne Walker.

During frame shutdown, WebViewImpl::m_layerTreeView may become 0 while commits are deferred but we still
may get invalidateRect() calls before shutdown completes.

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::invalidateRect):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-24  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Null check WebLayerTreeView before dereffing in WebViewImpl::invalidateRect
+        https://bugs.webkit.org/show_bug.cgi?id=107855
+
+        Reviewed by Adrienne Walker.
+
+        During frame shutdown, WebViewImpl::m_layerTreeView may become 0 while commits are deferred but we still
+        may get invalidateRect() calls before shutdown completes.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::invalidateRect):
+
 2013-01-24  Mihai Maerean  <mmaerean@adobe.com>
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -3958 +3958 @@
         // If we receive an invalidation from WebKit while in deferred commit mode,
         // that means it's time to start producing frames again so un-defer.
-        m_layerTreeView->setDeferCommits(false);
+        if (m_layerTreeView)
+            m_layerTreeView->setDeferCommits(false);
         m_layerTreeViewCommitsDeferred = false;
     }