Title: [91397] branches/chromium/782/Source/WebCore
- Revision
- 91397
- Author
- [email protected]
- Date
- 2011-07-20 13:42:16 -0700 (Wed, 20 Jul 2011)
Log Message
2011-07-20 James Robinson <[email protected]>
Speculative null pointer check to fix crashes seen in the field.
BUG=89193, cros bug 17121
* platform/graphics/chromium/LayerRendererChromium.cpp:
(WebCore::LayerRendererChromium::transferRootLayer):
Modified Paths
Diff
Modified: branches/chromium/782/Source/WebCore/ChangeLog (91396 => 91397)
--- branches/chromium/782/Source/WebCore/ChangeLog 2011-07-20 20:34:56 UTC (rev 91396)
+++ branches/chromium/782/Source/WebCore/ChangeLog 2011-07-20 20:42:16 UTC (rev 91397)
@@ -1,3 +1,11 @@
+2011-07-20 James Robinson <[email protected]>
+
+ Speculative null pointer check to fix crashes seen in the field.
+ BUG=89193, cros bug 17121
+
+ * platform/graphics/chromium/LayerRendererChromium.cpp:
+ (WebCore::LayerRendererChromium::transferRootLayer):
+
2011-07-19 Jeremy Moskovich <[email protected]>
Fix microphone icon placement in speech input control for dir=rtl.
Modified: branches/chromium/782/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (91396 => 91397)
--- branches/chromium/782/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-07-20 20:34:56 UTC (rev 91396)
+++ branches/chromium/782/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2011-07-20 20:42:16 UTC (rev 91397)
@@ -515,7 +515,8 @@
void LayerRendererChromium::transferRootLayer(LayerRendererChromium* other)
{
- other->setLayerRendererRecursive(m_rootLayer.get());
+ if (m_rootLayer)
+ other->setLayerRendererRecursive(m_rootLayer.get());
other->m_rootLayer = m_rootLayer.release();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
