Title: [128629] trunk/Source/WebCore
- Revision
- 128629
- Author
- [email protected]
- Date
- 2012-09-14 10:54:22 -0700 (Fri, 14 Sep 2012)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128628 => 128629)
--- trunk/Source/WebCore/ChangeLog 2012-09-14 17:37:44 UTC (rev 128628)
+++ trunk/Source/WebCore/ChangeLog 2012-09-14 17:54:22 UTC (rev 128629)
@@ -1,3 +1,17 @@
+2012-09-14 Kent Tamura <[email protected]>
+
+ 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 <[email protected]>
IndexedDB: Print console warning about setVersion
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (128628 => 128629)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2012-09-14 17:37:44 UTC (rev 128628)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2012-09-14 17:54:22 UTC (rev 128629)
@@ -98,7 +98,10 @@
#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 @@
#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::setLangAttributeAwareFormControlUIEnabled(bool enabled)
{
+#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(enabled);
+#else
+ UNUSED_PARAM(enabled);
+#endif
}
}
Modified: trunk/Source/WebCore/testing/InternalSettings.h (128628 => 128629)
--- trunk/Source/WebCore/testing/InternalSettings.h 2012-09-14 17:37:44 UTC (rev 128628)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2012-09-14 17:54:22 UTC (rev 128629)
@@ -80,7 +80,9 @@
#endif
bool m_canStartMedia;
bool m_originalMockScrollbarsEnabled;
+#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
bool m_langAttributeAwareFormControlUIEnabled;
+#endif
};
typedef RefCountedSupplement<Page, InternalSettings> SuperType;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
