summaryrefslogtreecommitdiffstats
path: root/layout/base/nsCSSFrameConstructor.cpp
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-17 08:26:02 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-17 08:26:02 +0200
commitb18a9cf86ea25bc52d9cfea584e3aa8bfbe81f0a (patch)
tree2e3d8df53e48b5dd2897f796295401faaec42a85 /layout/base/nsCSSFrameConstructor.cpp
parent90c68b34abf51ae0b1a2848094fc3115b30ee498 (diff)
parente719d7b3be222dfafad78c71761bad2bafb1243d (diff)
downloadUXP-b18a9cf86ea25bc52d9cfea584e3aa8bfbe81f0a.tar
UXP-b18a9cf86ea25bc52d9cfea584e3aa8bfbe81f0a.tar.gz
UXP-b18a9cf86ea25bc52d9cfea584e3aa8bfbe81f0a.tar.lz
UXP-b18a9cf86ea25bc52d9cfea584e3aa8bfbe81f0a.tar.xz
UXP-b18a9cf86ea25bc52d9cfea584e3aa8bfbe81f0a.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into pm_url_1
Diffstat (limited to 'layout/base/nsCSSFrameConstructor.cpp')
-rw-r--r--layout/base/nsCSSFrameConstructor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index a118c38f9..f8c7f52a9 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -3658,13 +3658,13 @@ nsCSSFrameConstructor::FindInputData(Element* aElement,
nsCSSAnonBoxes::buttonContent) },
// TODO: this is temporary until a frame is written: bug 635240.
SIMPLE_INT_CREATE(NS_FORM_INPUT_NUMBER, NS_NewNumberControlFrame),
- // TODO: this is temporary until a frame is written: bug 888320.
- SIMPLE_INT_CREATE(NS_FORM_INPUT_DATE, NS_NewTextControlFrame),
#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK)
// On Android/B2G, date/time input appears as a normal text box.
SIMPLE_INT_CREATE(NS_FORM_INPUT_TIME, NS_NewTextControlFrame),
+ SIMPLE_INT_CREATE(NS_FORM_INPUT_DATE, NS_NewTextControlFrame),
#else
SIMPLE_INT_CREATE(NS_FORM_INPUT_TIME, NS_NewDateTimeControlFrame),
+ SIMPLE_INT_CREATE(NS_FORM_INPUT_DATE, NS_NewDateTimeControlFrame),
#endif
// TODO: this is temporary until a frame is written: bug 888320
SIMPLE_INT_CREATE(NS_FORM_INPUT_MONTH, NS_NewTextControlFrame),