Unreviewed, rolling out r134566.
authorharaken@chromium.org <haraken@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Nov 2012 09:54:14 +0000 (09:54 +0000)
committerharaken@chromium.org <haraken@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Nov 2012 09:54:14 +0000 (09:54 +0000)
http://trac.webkit.org/changeset/134566
https://bugs.webkit.org/show_bug.cgi?id=102197

"it broke Chromium Android Release build" (Requested by
haraken on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-11-14

Source/WebCore:

* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::setupDateTimeChooserParameters):
* platform/DateTimeChooser.h:
(DateTimeChooserParameters):

Source/WebKit/chromium:

* src/DateTimeChooserImpl.cpp:
(WebKit::DateTimeChooserImpl::DateTimeChooserImpl):
(WebKit::DateTimeChooserImpl::writeDocument):

LayoutTests:

* platform/chromium-mac/platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png: Removed.
* platform/chromium/TestExpectations:
* platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.txt: Removed.
* platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru.html: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@134576 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/chromium-mac/platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png [deleted file]
LayoutTests/platform/chromium/TestExpectations
LayoutTests/platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.txt [deleted file]
LayoutTests/platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru.html [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/html/HTMLInputElement.cpp
Source/WebCore/platform/DateTimeChooser.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/DateTimeChooserImpl.cpp

index 1d4f3b4..dd93175 100644 (file)
@@ -1,3 +1,17 @@
+2012-11-14  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r134566.
+        http://trac.webkit.org/changeset/134566
+        https://bugs.webkit.org/show_bug.cgi?id=102197
+
+        "it broke Chromium Android Release build" (Requested by
+        haraken on #webkit).
+
+        * platform/chromium-mac/platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png: Removed.
+        * platform/chromium/TestExpectations:
+        * platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.txt: Removed.
+        * platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru.html: Removed.
+
 2012-11-14  Zan Dobersek  <zandobersek@gmail.com>
 
         Unreviewed GTK gardening.
diff --git a/LayoutTests/platform/chromium-mac/platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png b/LayoutTests/platform/chromium-mac/platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
deleted file mode 100644 (file)
index d7fd673..0000000
Binary files a/LayoutTests/platform/chromium-mac/platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png and /dev/null differ
index cce522c..18f7019 100644 (file)
@@ -2820,9 +2820,6 @@ webkit.org/b/96720 fast/forms/time-multiple-fields/time-multiple-fields-preserve
 webkit.org/b/96720 fast/forms/date-multiple-fields/date-multiple-fields-preserve-value-after-history-back.html [ Pass Timeout ]
 webkit.org/b/98906 platform/chromium/fast/forms/suggestion-picker/date-suggestion-picker-mouse-operations.html [ Pass Failure ]
 
-# Need rebaseline
-webkit.org/b/102181 platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru.html [ Pass ImageOnlyFailure Missing ]
-
 # New test added in r87324
 crbug.com/83994 [ Win ] platform/win/plugins/call-javascript-that-destroys-plugin.html [ Failure ]
 
diff --git a/LayoutTests/platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.txt b/LayoutTests/platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.txt
deleted file mode 100644 (file)
index bdaf3ac..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru.html b/LayoutTests/platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru.html
deleted file mode 100644 (file)
index 023c46a..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-window.enablePixelTesting = true;
-if (window.internals)
-    internals.settings.setLangAttributeAwareFormControlUIEnabled(true);
-</script>
-<script src="../../../../../fast/js/resources/js-test-pre.js"></script>
-<script src="../../../../../fast/forms/resources/picker-common.js"></script>
-<script src="resources/calendar-picker-common.js"></script>
-</head>
-<body>
-<input type=date id=date value="12345-05-12" lang="ru-ru">
-
-<p id="description" style="opacity: 0"></p>
-<div id="console" style="opacity: 0"></div>
-
-<script>
-openPicker(document.getElementById('date'), finishJSTest);
-</script>
-<script src="../../../../../fast/js/resources/js-test-post.js"></script>
-</body>
-</html>
index 104b685..0235517 100644 (file)
@@ -1,3 +1,17 @@
+2012-11-14  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r134566.
+        http://trac.webkit.org/changeset/134566
+        https://bugs.webkit.org/show_bug.cgi?id=102197
+
+        "it broke Chromium Android Release build" (Requested by
+        haraken on #webkit).
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::setupDateTimeChooserParameters):
+        * platform/DateTimeChooser.h:
+        (DateTimeChooserParameters):
+
 2012-11-08  Vsevolod Vlasov  <vsevik@chromium.org>
 
         Web Inspector: No content available for requests made from flash
index efcfc82..e4c4609 100644 (file)
@@ -51,7 +51,6 @@
 #include "IdTargetObserver.h"
 #include "InputType.h"
 #include "KeyboardEvent.h"
-#include "Language.h"
 #include "LocalizedStrings.h"
 #include "MouseEvent.h"
 #include "NumberInputType.h"
@@ -1914,12 +1913,6 @@ bool HTMLInputElement::setupDateTimeChooserParameters(DateTimeChooserParameters&
     parameters.minimum = minimum();
     parameters.maximum = maximum();
     parameters.required = required();
-    if (!RuntimeEnabledFeatures::langAttributeAwareFormControlUIEnabled())
-        parameters.locale = defaultLanguage();
-    else {
-        AtomicString computedLocale = computeInheritedLanguage();
-        parameters.locale = computedLocale.isEmpty() ? AtomicString(defaultLanguage()) : computedLocale;
-    }
 
     StepRange stepRange = createStepRange(RejectAny);
     if (stepRange.hasStep()) {
index ee948cf..405dfdd 100644 (file)
@@ -41,10 +41,6 @@ namespace WebCore {
 struct DateTimeChooserParameters {
     AtomicString type;
     IntRect anchorRectInRootView;
-    // Locale name for which the chooser should be localized. This
-    // might be an invalid name because it comes from HTML lang
-    // attributes.
-    AtomicString locale;
     String currentValue;
     Vector<String> suggestionValues;
     Vector<String> localizedSuggestionValues;
index cabe0c2..20d5fee 100644 (file)
@@ -1,3 +1,16 @@
+2012-11-14  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r134566.
+        http://trac.webkit.org/changeset/134566
+        https://bugs.webkit.org/show_bug.cgi?id=102197
+
+        "it broke Chromium Android Release build" (Requested by
+        haraken on #webkit).
+
+        * src/DateTimeChooserImpl.cpp:
+        (WebKit::DateTimeChooserImpl::DateTimeChooserImpl):
+        (WebKit::DateTimeChooserImpl::writeDocument):
+
 2012-11-14  Kent Tamura  <tkent@chromium.org>
 
         Support for localization tests of calendar picker
index f636f65..0563015 100644 (file)
@@ -60,7 +60,7 @@ DateTimeChooserImpl::DateTimeChooserImpl(ChromeClientImpl* chromeClient, WebCore
     , m_client(client)
     , m_popup(0)
     , m_parameters(parameters)
-    , m_locale(WebCore::Locale::create(parameters.locale))
+    , m_locale(WebCore::Locale::createDefault())
 {
     ASSERT(m_chromeClient);
     ASSERT(m_client);
@@ -144,7 +144,7 @@ void DateTimeChooserImpl::writeDocument(WebCore::DocumentWriter& writer)
     addProperty("stepBase", stepBaseString, writer);
     addProperty("required", m_parameters.required, writer);
     addProperty("currentValue", m_parameters.currentValue, writer);
-    addProperty("locale", m_parameters.locale.string(), writer);
+    addProperty("locale", WebCore::defaultLanguage(), writer);
     addProperty("todayLabel", todayLabelString, writer);
     addProperty("clearLabel", Platform::current()->queryLocalizedString(WebLocalizedString::CalendarClear), writer);
     addProperty("weekLabel", Platform::current()->queryLocalizedString(WebLocalizedString::WeekNumberLabel), writer);