Merge 116611

Source/WebCore/html/shadow/CalendarPickerElement.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 50 matching lines @@
     , m_popup(0)
 {
     setShadowPseudoId("-webkit-calendar-picker-indicator");
 }
 
 PassRefPtr<CalendarPickerElement> CalendarPickerElement::create(Document* document)
 {
     return adoptRef(new CalendarPickerElement(document));
 }
 
+CalendarPickerElement::~CalendarPickerElement()
+{
+    closePopup();
+    ASSERT(!m_popup);
+}
+
 RenderObject* CalendarPickerElement::createRenderer(RenderArena* arena, RenderStyle*)
 {
     return new (arena) RenderDetailsMarker(this);
 }
 
 inline HTMLInputElement* CalendarPickerElement::hostInput()
 {
     ASSERT(shadowAncestorNode());
     ASSERT(shadowAncestorNode()->hasTagName(inputTag));
     return static_cast<HTMLInputElement*>(shadowAncestorNode());
@@ skipping 163 matching lines @@
 }
 
 void CalendarPickerElement::didClosePopup()
 {
     m_popup = 0;
 }
 
 }
 
 #endif