Title: [178276] releases/WebKitGTK/webkit-2.6/Source/WebCore
- Revision
- 178276
- Author
- carlo...@webkit.org
- Date
- 2015-01-12 10:02:11 -0800 (Mon, 12 Jan 2015)
Log Message
Merge r176554 - CrashTracer: com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::HTMLPlugInImageElement::updateSnapshot + 108
https://bugs.webkit.org/show_bug.cgi?id=139057
Reviewed by Anders Carlsson.
No test, don't know how to repro.
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::updateSnapshot): Null check the renderer.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (178275 => 178276)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-12 17:57:59 UTC (rev 178275)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-12 18:02:11 UTC (rev 178276)
@@ -1,3 +1,15 @@
+2014-11-27 Antti Koivisto <an...@apple.com>
+
+ CrashTracer: com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::HTMLPlugInImageElement::updateSnapshot + 108
+ https://bugs.webkit.org/show_bug.cgi?id=139057
+
+ Reviewed by Anders Carlsson.
+
+ No test, don't know how to repro.
+
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::updateSnapshot): Null check the renderer.
+
2014-11-25 Philippe Normand <pnorm...@igalia.com>
[GStreamer] gstmpegts is not initialized
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/html/HTMLPlugInImageElement.cpp (178275 => 178276)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-01-12 17:57:59 UTC (rev 178275)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-01-12 18:02:11 UTC (rev 178276)
@@ -334,6 +334,9 @@
m_snapshotImage = image;
+ if (!renderer())
+ return;
+
if (renderer()->isSnapshottedPlugIn()) {
toRenderSnapshottedPlugIn(renderer())->updateSnapshot(image);
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
