Commit 3e304c72 authored by tkent@chromium.org's avatar tkent@chromium.org
Browse files

Unreviewed, a workaround for a mysterious crash on Apple Windows port.

https://bugs.webkit.org/show_bug.cgi?id=96636

* testing/InternalSettings.cpp:
Touch RuntimeEnabledFeatures::langAttributeAwareFormControlUIEnabled only if
ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setLangAttributeAwareFormControlUIEnabled):
* testing/InternalSettings.h:
(Backup):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@128629 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 741e8122
2012-09-14 Kent Tamura <tkent@chromium.org>
Unreviewed, a workaround for a mysterious crash on Apple Windows port.
https://bugs.webkit.org/show_bug.cgi?id=96636
* testing/InternalSettings.cpp:
Touch RuntimeEnabledFeatures::langAttributeAwareFormControlUIEnabled only if
ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setLangAttributeAwareFormControlUIEnabled):
* testing/InternalSettings.h:
(Backup):
2012-09-14 David Grogan <dgrogan@chromium.org>
 
IndexedDB: Print console warning about setVersion
......@@ -98,7 +98,10 @@ InternalSettings::Backup::Backup(Page* page, Settings* settings)
#endif
, m_canStartMedia(page->canStartMedia())
, m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled())
#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
// FIXME: This is a workaround for Apple Windows crash.
, m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttributeAwareFormControlUIEnabled())
#endif
{
}
......@@ -132,7 +135,9 @@ void InternalSettings::Backup::restoreTo(Page* page, Settings* settings)
#endif
page->setCanStartMedia(m_canStartMedia);
settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttributeAwareFormControlUIEnabled);
#endif
}
InternalSettings* InternalSettings::from(Page* page)
......@@ -648,7 +653,11 @@ void InternalSettings::setStorageBlockingPolicy(const String& mode, ExceptionCod
void InternalSettings::setLangAttributeAwareFormControlUIEnabled(bool enabled)
{
#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(enabled);
#else
UNUSED_PARAM(enabled);
#endif
}
}
......@@ -80,7 +80,9 @@ public:
#endif
bool m_canStartMedia;
bool m_originalMockScrollbarsEnabled;
#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
bool m_langAttributeAwareFormControlUIEnabled;
#endif
};
typedef RefCountedSupplement<Page, InternalSettings> SuperType;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment