Merge 140778

Source/WebCore/WebCore.gyp/WebCore.gyp

Index: Source/WebCore/WebCore.gyp/WebCore.gyp
===================================================================
--- Source/WebCore/WebCore.gyp/WebCore.gyp	(revision 141208)
+++ Source/WebCore/WebCore.gyp/WebCore.gyp	(working copy)
@@ -960,6 +960,8 @@
           'inputs': [
             '../Resources/pagepopups/calendarPicker.css',
             '../Resources/pagepopups/calendarPicker.js',
+            '../Resources/pagepopups/chromium/calendarPickerChromium.css',
+            '../Resources/pagepopups/chromium/pickerCommonChromium.css',
             '../Resources/pagepopups/suggestionPicker.css',
             '../Resources/pagepopups/suggestionPicker.js',
           ],
@@ -977,24 +979,6 @@
           ],
         },
         {
-          'action_name': 'CalendarPickerMac',
-          'inputs': [
-            '../Resources/pagepopups/calendarPickerMac.css',
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPickerMac.h',
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPickerMac.cpp',
-          ],
-          'action': [
-            'python',
-            '../make-file-arrays.py',
-            '--condition=ENABLE(CALENDAR_PICKER)',
-            '--out-h=<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPickerMac.h',
-            '--out-cpp=<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPickerMac.cpp',
-            '<@(_inputs)',
-          ],
-        },
-        {
           'action_name': 'ColorSuggestionPicker',
           'inputs': [
             '../Resources/pagepopups/colorSuggestionPicker.css',
@@ -1330,9 +1314,6 @@
           'include_dirs': [
             '<(chromium_src_dir)/third_party/apple_webkit',
           ],
-          'sources': [
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/CalendarPickerMac.cpp',
-          ],
         }],
         ['OS=="win"', {
           'defines': [