Title: [134784] trunk/Source/WebCore
- Revision
- 134784
- Author
- [email protected]
- Date
- 2012-11-15 09:06:49 -0800 (Thu, 15 Nov 2012)
Log Message
Remove unnecesary dependencies INPUT_TYPE_COLOR
https://bugs.webkit.org/show_bug.cgi?id=102379
Patch by Miguel Garcia <[email protected]> on 2012-11-15
Reviewed by Darin Adler.
Platforms should be able to enable INPUT_TYPE_COLOR without enabling
CALENDAR_PICKER and DATALIST_ELEMENT. Before this patch however there would be
compile errors in such configuration.
No new tests since this is not adding any extra functionality.
* WebCore.gyp/WebCore.gyp:
* html/ColorInputType.cpp:
(WebCore::ColorInputType::shouldShowSuggestions):
* make-file-arrays.py:
(main):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (134783 => 134784)
--- trunk/Source/WebCore/ChangeLog 2012-11-15 17:05:29 UTC (rev 134783)
+++ trunk/Source/WebCore/ChangeLog 2012-11-15 17:06:49 UTC (rev 134784)
@@ -1,3 +1,22 @@
+2012-11-15 Miguel Garcia <[email protected]>
+
+ Remove unnecesary dependencies INPUT_TYPE_COLOR
+ https://bugs.webkit.org/show_bug.cgi?id=102379
+
+ Reviewed by Darin Adler.
+
+ Platforms should be able to enable INPUT_TYPE_COLOR without enabling
+ CALENDAR_PICKER and DATALIST_ELEMENT. Before this patch however there would be
+ compile errors in such configuration.
+
+ No new tests since this is not adding any extra functionality.
+
+ * WebCore.gyp/WebCore.gyp:
+ * html/ColorInputType.cpp:
+ (WebCore::ColorInputType::shouldShowSuggestions):
+ * make-file-arrays.py:
+ (main):
+
2012-11-15 Eric Carlson <[email protected]>
Update computed line position algorithm
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (134783 => 134784)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-11-15 17:05:29 UTC (rev 134783)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-11-15 17:06:49 UTC (rev 134784)
@@ -937,7 +937,7 @@
'action': [
'python',
'../make-file-arrays.py',
- '--condition=ENABLE(CALENDAR_PICKER)',
+ '--condition=ENABLE(CALENDAR_PICKER) OR ENABLE(INPUT_TYPE_COLOR)',
'--out-h=<(SHARED_INTERMEDIATE_DIR)/webkit/PickerCommon.h',
'--out-cpp=<(SHARED_INTERMEDIATE_DIR)/webkit/PickerCommon.cpp',
'<@(_inputs)',
@@ -995,7 +995,7 @@
'action': [
'python',
'../make-file-arrays.py',
- '--condition=ENABLE(INPUT_TYPE_COLOR) AND ENABLE(DATALIST_ELEMENT) AND ENABLE(PAGE_POPUP)',
+ '--condition=ENABLE(INPUT_TYPE_COLOR)',
'--out-h=<(SHARED_INTERMEDIATE_DIR)/webkit/ColorSuggestionPicker.h',
'--out-cpp=<(SHARED_INTERMEDIATE_DIR)/webkit/ColorSuggestionPicker.cpp',
'<@(_inputs)',
Modified: trunk/Source/WebCore/html/ColorInputType.cpp (134783 => 134784)
--- trunk/Source/WebCore/html/ColorInputType.cpp 2012-11-15 17:05:29 UTC (rev 134783)
+++ trunk/Source/WebCore/html/ColorInputType.cpp 2012-11-15 17:06:49 UTC (rev 134784)
@@ -221,6 +221,8 @@
{
#if ENABLE(DATALIST_ELEMENT)
return element()->fastHasAttribute(listAttr);
+#else
+ return false;
#endif
}
Modified: trunk/Source/WebCore/make-file-arrays.py (134783 => 134784)
--- trunk/Source/WebCore/make-file-arrays.py 2012-11-15 17:05:29 UTC (rev 134783)
+++ trunk/Source/WebCore/make-file-arrays.py 2012-11-15 17:06:49 UTC (rev 134784)
@@ -90,6 +90,7 @@
if options.flag:
options.flag = options.flag.replace(" AND ", " && ")
+ options.flag = options.flag.replace(" OR ", " || ")
header_file = open(options.out_header, "w")
if options.flag:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
