Changeset 128629 in webkit

Timestamp:

Sep 14, 2012 10:54:22 AM (12 years ago)

Author:

tkent@chromium.org

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• testing/InternalSettings.cpp (modified) (3 diffs)
• testing/InternalSettings.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/testing/InternalSettings.cpp

@@ -99 +99 @@
     , 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
 {
 }
@@ -133 +136 @@
     page->setCanStartMedia(m_canStartMedia);
     settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
+#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
     RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttributeAwareFormControlUIEnabled);
+#endif
 }
 
@@ -649 +654 @@
 void InternalSettings::setLangAttributeAwareFormControlUIEnabled(bool enabled)
 {
+#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
     RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(enabled);
-}
-
-}
+#else
+    UNUSED_PARAM(enabled);
+#endif
+}
+
+}

trunk/Source/WebCore/testing/InternalSettings.h

@@ -81 +81 @@
         bool m_canStartMedia;
         bool m_originalMockScrollbarsEnabled;
+#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
         bool m_langAttributeAwareFormControlUIEnabled;
+#endif
     };