Merge 132895

Source/WebKit/chromium/src/DateTimeChooserImpl.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 46 matching lines @@
     , m_client(client)
     , m_popup(0)
     , m_parameters(parameters)
     , m_locale(WebCore::Locale::createDefault())
 {
     ASSERT(m_chromeClient);
     ASSERT(m_client);
     m_popup = m_chromeClient->openPagePopup(this, m_parameters.anchorRectInRootView);
 }
 
+PassRefPtr<DateTimeChooserImpl> DateTimeChooserImpl::create(ChromeClientImpl* chromeClient, WebCore::DateTimeChooserClient* client, const WebCore::DateTimeChooserParameters& parameters)
+{
+    return adoptRef(new DateTimeChooserImpl(chromeClient, client, parameters));
+}
+
 DateTimeChooserImpl::~DateTimeChooserImpl()
 {
 }
 
 void DateTimeChooserImpl::endChooser()
 {
     if (!m_popup)
         return;
     m_chromeClient->closePagePopup(m_popup);
 }
@@ skipping 66 matching lines @@
     addString("</script></body>\n", writer);
 }
 
 WebCore::Locale& DateTimeChooserImpl::locale()
 {
     return *m_locale;
 }
 
 void DateTimeChooserImpl::setValueAndClosePopup(int numValue, const String& stringValue)
 {
+    RefPtr<DateTimeChooserImpl> protector(this);
     if (numValue >= 0)
         m_client->didChooseValue(stringValue);
     endChooser();
 }
 
 void DateTimeChooserImpl::didClosePopup()
 {
     ASSERT(m_client);
     m_popup = 0;
     m_client->didEndChooser();
 }
 
 } // namespace WebKit
 
 #endif // ENABLE(CALENDAR_PICKER)