[chromium] Add temporary diagnostics for LayerTreeHost::commitTo crash

https://bugs.webkit.org/show_bug.cgi?id=68204

Reviewed by James Robinson.

Add CRASH calls to determine which assumptions are being violated.

Source/WebCore:

* platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
(WebCore::CCLayerTreeHost::commitTo):

Source/WebKit/chromium:

* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::composite):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95256 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 26fa9af..b2fea08 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-09-15  Adrienne Walker  <enne@google.com>
+
+        [chromium] Add temporary diagnostics for LayerTreeHost::commitTo crash
+        https://bugs.webkit.org/show_bug.cgi?id=68204
+
+        Reviewed by James Robinson.
+
+        Add CRASH calls to determine which assumptions are being violated.
+
+        * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+        (WebCore::CCLayerTreeHost::commitTo):
+
 2011-09-15  Mark Hahnenberg  <mhahnenberg@apple.com>
 
         Unzip initialization lists and constructors in JSCell hierarchy (7/7)

diff --git a/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp b/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp
index e821aeb..a257b41 100644 (file)
--- a/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp
+++ b/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp
@@ -112,6 +112,10 @@ void CCLayerTreeHost::commitTo(CCLayerTreeHostImpl* hostImpl)
     TRACE_EVENT("CCLayerTreeHost::commitTo", this, 0);
     hostImpl->setSourceFrameNumber(frameNumber());
 
+    // FIXME: Temporary diagnostic for crbug 96719. This shouldn't happen.
+    if (!contentsTextureManager())
+        CRASH();
+
     contentsTextureManager()->reduceMemoryToLimit(TextureManager::reclaimLimitBytes());
     contentsTextureManager()->deleteEvictedTextures(hostImpl->context());
 

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index ba7ac3c..4dea957 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2011-09-15  Adrienne Walker  <enne@google.com>
+
+        [chromium] Add temporary diagnostics for LayerTreeHost::commitTo crash
+        https://bugs.webkit.org/show_bug.cgi?id=68204
+
+        Reviewed by James Robinson.
+
+        Add CRASH calls to determine which assumptions are being violated.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::composite):
+
 2011-09-15  David Levin  <levin@chromium.org>
 
         Remove TestWebKitAPI from the chromium build until it is made to work

diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
index bd1fa0c..608a9be 100644 (file)
--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -1170,6 +1170,10 @@ void WebViewImpl::composite(bool)
     if (m_pageOverlay)
         m_pageOverlay->update();
 
+    // FIXME: Temporary diagnostic for crbug 96719. This shouldn't happen.
+    if (!m_layerTreeHost)
+        CRASH();
+
     m_layerTreeHost->composite();
 #endif
 #endif