Title: [136935] trunk/Source/WebKit/chromium
- Revision
- 136935
- Author
- [email protected]
- Date
- 2012-12-07 01:09:37 -0800 (Fri, 07 Dec 2012)
Log Message
REGRESSION(r136631): Fix null pointer dereference in WebPagePopupImpl::paint
https://bugs.webkit.org/show_bug.cgi?id=104350
Reviewed by Hajime Morita.
We changed WebPagePopupImpl so that it deleted m_page in
closePopup. However, paint function is still called.
* src/WebPagePopupImpl.cpp:
(WebKit::WebPagePopupImpl::paint): Block by m_closing.
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (136934 => 136935)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-07 08:49:24 UTC (rev 136934)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-07 09:09:37 UTC (rev 136935)
@@ -1,3 +1,16 @@
+2012-12-07 Kent Tamura <[email protected]>
+
+ REGRESSION(r136631): Fix null pointer dereference in WebPagePopupImpl::paint
+ https://bugs.webkit.org/show_bug.cgi?id=104350
+
+ Reviewed by Hajime Morita.
+
+ We changed WebPagePopupImpl so that it deleted m_page in
+ closePopup. However, paint function is still called.
+
+ * src/WebPagePopupImpl.cpp:
+ (WebKit::WebPagePopupImpl::paint): Block by m_closing.
+
2012-12-06 Kent Tamura <[email protected]>
Refactoring: Clean up placeholder attribute usage
Modified: trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp (136934 => 136935)
--- trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp 2012-12-07 08:49:24 UTC (rev 136934)
+++ trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp 2012-12-07 09:09:37 UTC (rev 136935)
@@ -261,7 +261,8 @@
void WebPagePopupImpl::paint(WebCanvas* canvas, const WebRect& rect, PaintOptions)
{
- PageWidgetDelegate::paint(m_page.get(), 0, canvas, rect, PageWidgetDelegate::Opaque, m_webView->settingsImpl()->applyDeviceScaleFactorInCompositor());
+ if (!m_closing)
+ PageWidgetDelegate::paint(m_page.get(), 0, canvas, rect, PageWidgetDelegate::Opaque, m_webView->settingsImpl()->applyDeviceScaleFactorInCompositor());
}
void WebPagePopupImpl::resize(const WebSize& newSize)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
