Title: [128016] trunk/Source/WebKit/chromium
Revision
128016
Author
[email protected]
Date
2012-09-09 22:25:02 -0700 (Sun, 09 Sep 2012)

Log Message

REGRESSION(r127558): Fix a crash in DateTimeChooserImpl::didClosePopup
https://bugs.webkit.org/show_bug.cgi?id=96222

Reviewed by Kent Tamura.

DateTimeChooserClient will delete DateTimeChooserImpl inside didEndChooser()
so we shouldn't be changing the members after that.

Testing covered by fast/forms/date/calendar-picker-appearance-pre-100.html.

* src/DateTimeChooserImpl.cpp:
(WebKit::DateTimeChooserImpl::didClosePopup):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (128015 => 128016)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-09-10 04:25:23 UTC (rev 128015)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-09-10 05:25:02 UTC (rev 128016)
@@ -1,3 +1,18 @@
+2012-09-09  Keishi Hattori  <[email protected]>
+
+        REGRESSION(r127558): Fix a crash in DateTimeChooserImpl::didClosePopup
+        https://bugs.webkit.org/show_bug.cgi?id=96222
+
+        Reviewed by Kent Tamura.
+
+        DateTimeChooserClient will delete DateTimeChooserImpl inside didEndChooser()
+        so we shouldn't be changing the members after that.
+
+        Testing covered by fast/forms/date/calendar-picker-appearance-pre-100.html.
+
+        * src/DateTimeChooserImpl.cpp:
+        (WebKit::DateTimeChooserImpl::didClosePopup):
+
 2012-09-09  Kenichi Ishibashi  <[email protected]>
 
         [Chromium] Unreviewed gardening after r127907

Modified: trunk/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp (128015 => 128016)


--- trunk/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp	2012-09-10 04:25:23 UTC (rev 128015)
+++ trunk/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp	2012-09-10 05:25:02 UTC (rev 128016)
@@ -121,9 +121,10 @@
 }
 
 void DateTimeChooserImpl::didClosePopup()
-{    
+{
+    ASSERT(m_client);
+    m_popup = 0;
     m_client->didEndChooser();
-    m_popup = 0;
 }
 
 } // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to