Title: [123844] trunk/Source/WebCore
- Revision
- 123844
- Author
- [email protected]
- Date
- 2012-07-27 00:44:19 -0700 (Fri, 27 Jul 2012)
Log Message
[chromium] Don't add a HUD layer when there is no rootLayer
https://bugs.webkit.org/show_bug.cgi?id=92442
Reviewed by Adrienne Walker.
When the compositor is shutting down in threaded mode, it does a commit
without a root layer. We should not try stick the hud layer onto the
null root layer.
* platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
(WebCore::CCLayerTreeHost::willCommit):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (123843 => 123844)
--- trunk/Source/WebCore/ChangeLog 2012-07-27 07:30:27 UTC (rev 123843)
+++ trunk/Source/WebCore/ChangeLog 2012-07-27 07:44:19 UTC (rev 123844)
@@ -1,3 +1,17 @@
+2012-07-27 Dana Jansens <[email protected]>
+
+ [chromium] Don't add a HUD layer when there is no rootLayer
+ https://bugs.webkit.org/show_bug.cgi?id=92442
+
+ Reviewed by Adrienne Walker.
+
+ When the compositor is shutting down in threaded mode, it does a commit
+ without a root layer. We should not try stick the hud layer onto the
+ null root layer.
+
+ * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+ (WebCore::CCLayerTreeHost::willCommit):
+
2012-07-27 Alec Flett <[email protected]>
IndexedDB: inject index keys on cursor/objectstore/index get success handlers
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp (123843 => 123844)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-07-27 07:30:27 UTC (rev 123843)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-07-27 07:44:19 UTC (rev 123844)
@@ -254,7 +254,7 @@
void CCLayerTreeHost::willCommit()
{
m_client->willCommit();
- if (m_settings.showDebugInfo()) {
+ if (m_rootLayer && m_settings.showDebugInfo()) {
if (!m_hudLayer)
m_hudLayer = HeadsUpDisplayLayerChromium::create(m_settings, layerRendererCapabilities().maxTextureSize);
m_rootLayer->addChild(m_hudLayer);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
