Title: [154330] trunk/Source/WebCore
- Revision
- 154330
- Author
- [email protected]
- Date
- 2013-08-20 09:12:11 -0700 (Tue, 20 Aug 2013)
Log Message
[BlackBerry] Avoid an assertion from calling releaseBufferDrawable(nullptr)
https://bugs.webkit.org/show_bug.cgi?id=119862
JIRA 470760
Patch by Jakob Petsovits <[email protected]> on 2013-08-20
Reviewed by Antonio Gomes.
destroyBuffer() finds a null pointer valid but
releaseBufferDrawable() does not. Fix by adding a
null pointer check.
No new tests, caught by existing layout test runs.
* platform/graphics/blackberry/ImageBufferBlackBerry.cpp:
(WebCore::ImageBuffer::~ImageBuffer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154329 => 154330)
--- trunk/Source/WebCore/ChangeLog 2013-08-20 15:57:38 UTC (rev 154329)
+++ trunk/Source/WebCore/ChangeLog 2013-08-20 16:12:11 UTC (rev 154330)
@@ -1,3 +1,20 @@
+2013-08-20 Jakob Petsovits <[email protected]>
+
+ [BlackBerry] Avoid an assertion from calling releaseBufferDrawable(nullptr)
+ https://bugs.webkit.org/show_bug.cgi?id=119862
+ JIRA 470760
+
+ Reviewed by Antonio Gomes.
+
+ destroyBuffer() finds a null pointer valid but
+ releaseBufferDrawable() does not. Fix by adding a
+ null pointer check.
+
+ No new tests, caught by existing layout test runs.
+
+ * platform/graphics/blackberry/ImageBufferBlackBerry.cpp:
+ (WebCore::ImageBuffer::~ImageBuffer):
+
2013-08-19 Gustavo Noronha Silva <[email protected]>
<https://webkit.org/b/120048> [GTK] Add stubs for APIs that went missing in the DOM bindings
Modified: trunk/Source/WebCore/platform/graphics/blackberry/ImageBufferBlackBerry.cpp (154329 => 154330)
--- trunk/Source/WebCore/platform/graphics/blackberry/ImageBufferBlackBerry.cpp 2013-08-20 15:57:38 UTC (rev 154329)
+++ trunk/Source/WebCore/platform/graphics/blackberry/ImageBufferBlackBerry.cpp 2013-08-20 16:12:11 UTC (rev 154330)
@@ -204,9 +204,11 @@
&CanvasLayerWebKitThread::clearBuffer, m_data.m_platformLayer.get()));
}
- BlackBerry::Platform::Graphics::releaseBufferDrawable(m_data.m_buffer);
- BlackBerry::Platform::Graphics::destroyBuffer(m_data.m_buffer);
- m_data.m_buffer = 0;
+ if (m_data.m_buffer) {
+ BlackBerry::Platform::Graphics::releaseBufferDrawable(m_data.m_buffer);
+ BlackBerry::Platform::Graphics::destroyBuffer(m_data.m_buffer);
+ m_data.m_buffer = 0;
+ }
}
GraphicsContext* ImageBuffer::context() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
