Title: [120134] trunk/Source/WebKit/blackberry
- Revision
- 120134
- Author
- [email protected]
- Date
- 2012-06-12 15:52:31 -0700 (Tue, 12 Jun 2012)
Log Message
[BlackBerry] Crash when rendering web page that's being destroyed
https://bugs.webkit.org/show_bug.cgi?id=88915
Patch by Arvid Nilsson <[email protected]> on 2012-06-12
Reviewed by Rob Buis.
PR #164943
This was a null pointer dereference that happened when the compositor
was asked to render after being disconnected from its web page.
* Api/WebPageCompositor.cpp:
(BlackBerry::WebKit::WebPageCompositorPrivate::render):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp (120133 => 120134)
--- trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp 2012-06-12 22:47:56 UTC (rev 120133)
+++ trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp 2012-06-12 22:52:31 UTC (rev 120134)
@@ -116,7 +116,7 @@
// For thread safety, we have to do it using a round-trip to the WebKit thread, so the
// embedder might call this before the round-trip to WebPagePrivate::setCompositor() is
// done.
- if (m_webPage->compositor() != this)
+ if (!m_webPage || m_webPage->compositor() != this)
return;
m_layerRenderer->setClearSurfaceOnDrawLayers(false);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (120133 => 120134)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-06-12 22:47:56 UTC (rev 120133)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-06-12 22:52:31 UTC (rev 120134)
@@ -1,3 +1,18 @@
+2012-06-12 Arvid Nilsson <[email protected]>
+
+ [BlackBerry] Crash when rendering web page that's being destroyed
+ https://bugs.webkit.org/show_bug.cgi?id=88915
+
+ Reviewed by Rob Buis.
+
+ PR #164943
+
+ This was a null pointer dereference that happened when the compositor
+ was asked to render after being disconnected from its web page.
+
+ * Api/WebPageCompositor.cpp:
+ (BlackBerry::WebKit::WebPageCompositorPrivate::render):
+
2012-06-12 Jacky Jiang <[email protected]>
[BlackBerry] Scale was incorrect when reloading a simple web page after initial load
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
