Title: [118422] branches/chromium/1132
- Revision
- 118422
- Author
- [email protected]
- Date
- 2012-05-24 15:07:12 -0700 (Thu, 24 May 2012)
Log Message
Merge 116611
BUG=127424
Review URL: https://chromiumcodereview.appspot.com/10449013
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1132/ManualTests/forms/calendar-picker-crash-by-type-change.html (from rev 116611, trunk/ManualTests/forms/calendar-picker-crash-by-type-change.html) (0 => 118422)
--- branches/chromium/1132/ManualTests/forms/calendar-picker-crash-by-type-change.html (rev 0)
+++ branches/chromium/1132/ManualTests/forms/calendar-picker-crash-by-type-change.html 2012-05-24 22:07:12 UTC (rev 118422)
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<script>
+var input = document.createElement('input')
+input.type = 'date'
+var event = document.createEvent('KeyboardEvent')
+event.initKeyboardEvent('keydown', false, false, null, 'Down')
+input.dispatchEvent(event)
+input.type = 'color'
+</script>
+<p>Success if the browser didn't crash.</p>
Modified: branches/chromium/1132/Source/WebCore/html/shadow/CalendarPickerElement.cpp (118421 => 118422)
--- branches/chromium/1132/Source/WebCore/html/shadow/CalendarPickerElement.cpp 2012-05-24 22:03:33 UTC (rev 118421)
+++ branches/chromium/1132/Source/WebCore/html/shadow/CalendarPickerElement.cpp 2012-05-24 22:07:12 UTC (rev 118422)
@@ -68,6 +68,12 @@
return adoptRef(new CalendarPickerElement(document));
}
+CalendarPickerElement::~CalendarPickerElement()
+{
+ closePopup();
+ ASSERT(!m_popup);
+}
+
RenderObject* CalendarPickerElement::createRenderer(RenderArena* arena, RenderStyle*)
{
return new (arena) RenderDetailsMarker(this);
Modified: branches/chromium/1132/Source/WebCore/html/shadow/CalendarPickerElement.h (118421 => 118422)
--- branches/chromium/1132/Source/WebCore/html/shadow/CalendarPickerElement.h 2012-05-24 22:03:33 UTC (rev 118421)
+++ branches/chromium/1132/Source/WebCore/html/shadow/CalendarPickerElement.h 2012-05-24 22:07:12 UTC (rev 118422)
@@ -43,6 +43,7 @@
class CalendarPickerElement : public HTMLDivElement, public PagePopupClient {
public:
static PassRefPtr<CalendarPickerElement> create(Document*);
+ virtual ~CalendarPickerElement();
void openPopup();
void closePopup();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
