Changeset 112658 in webkit


Ignore:
Timestamp:
Mar 30, 2012, 6:15:27 AM (13 years ago)
Author:
[email protected]
Message:

Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium
https://bugs.webkit.org/show_bug.cgi?id=80972

Reviewed by Kent Tamura.

.:

  • Source/cmake/OptionsBlackBerry.cmake:
  • configure.ac:

Source/JavaScriptCore:

  • Configurations/FeatureDefines.xcconfig:

Source/WebCore:

  • CMakeLists.txt:
  • Configurations/FeatureDefines.xcconfig:
  • GNUmakefile.am:
  • WebCore.exp.in:
  • css/html.css:
  • html/ColorInputType.cpp:
  • html/ColorInputType.h:
  • html/HTMLInputElement.cpp:

(WebCore):

  • html/HTMLInputElement.h:

(HTMLInputElement):

  • html/InputType.cpp:

(WebCore::createInputTypeFactoryMap):
(WebCore):
(InputTypeNames):

  • html/InputType.h:

(InputType):
(InputTypeNames):

  • loader/EmptyClients.h:

(EmptyChromeClient):

  • page/Chrome.cpp:

(WebCore):

  • page/Chrome.h:

(WebCore):
(Chrome):

  • page/ChromeClient.h:

(WebCore):
(ChromeClient):

  • platform/ColorChooser.h:
  • platform/ColorChooserClient.h:
  • testing/InternalSettings.cpp:
  • testing/Internals.cpp:

(WebCore):

  • testing/Internals.h:

(Internals):

  • testing/Internals.idl:

Source/WebKit/blackberry:

  • WebCoreSupport/AboutDataEnableFeatures.in:
  • WebCoreSupport/ChromeClientBlackBerry.h:

(ChromeClientBlackBerry):

  • WebKitSupport/DOMSupport.cpp:

(BlackBerry::WebKit::DOMSupport::isColorInputField):

  • WebKitSupport/InputHandler.cpp:

(BlackBerry::WebKit::convertInputType):

Source/WebKit/chromium:

  • features.gypi:
  • src/ChromeClientImpl.cpp:

(WebKit):

  • src/ChromeClientImpl.h:

(WebCore):
(ChromeClientImpl):

  • src/ColorChooserProxy.cpp:
  • src/ColorChooserProxy.h:
  • src/WebColorChooserClientImpl.cpp:
  • src/WebColorChooserClientImpl.h:

Source/WebKit/mac:

  • Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

  • Configurations/FeatureDefines.xcconfig:

Tools:

  • Scripts/build-webkit:
  • qmake/mkspecs/features/features.prf:

WebKitLibraries:

  • win/tools/vsprops/FeatureDefines.vsprops:
  • win/tools/vsprops/FeatureDefinesCairo.vsprops:

LayoutTests:

  • platform/efl/Skipped:
  • platform/qt/Skipped:
Location:
trunk
Files:
53 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r112654 r112658  
     12012-03-30  Keishi Hattori  <[email protected]>
     2
     3        Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=80972
     5
     6        Reviewed by Kent Tamura.
     7
     8        * Source/cmake/OptionsBlackBerry.cmake:
     9        * configure.ac:
     10
    1112012-03-30  Charles Wei  <[email protected]>
    212
  • trunk/LayoutTests/ChangeLog

    r112655 r112658  
     12012-03-30  Keishi Hattori  <[email protected]>
     2
     3        Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=80972
     5
     6        Reviewed by Kent Tamura.
     7
     8        * platform/efl/Skipped:
     9        * platform/qt/Skipped:
     10
    1112012-03-30  Alexander Pavlov  <[email protected]>
    212
  • trunk/LayoutTests/platform/efl/Skipped

    r112647 r112658  
    300300fast/dom/shadow
    301301
    302 # defined(ENABLE_INPUT_COLOR) is disabled
     302# defined(ENABLE_INPUT_TYPE_COLOR) is disabled
    303303fast/forms/color/input-color-onchange-event.html
    304304
  • trunk/LayoutTests/platform/qt/Skipped

    r112582 r112658  
    6868# =========================================================================== #
    6969
    70 # ENABLE(INPUT_COLOR) is disabled.
     70# ENABLE_INPUT_TYPE_COLOR is disabled.
    7171fast/forms/color
    7272
  • trunk/Source/JavaScriptCore/ChangeLog

    r112624 r112658  
     12012-03-30  Keishi Hattori  <[email protected]>
     2
     3        Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=80972
     5
     6        Reviewed by Kent Tamura.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102012-03-29  Mark Hahnenberg  <[email protected]>
    211
  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r111931 r112658  
    8383ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
    8484ENABLE_INDEXED_DATABASE = ;
    85 ENABLE_INPUT_COLOR = ;
     85ENABLE_INPUT_TYPE_COLOR = ;
    8686ENABLE_INPUT_SPEECH = ;
    8787ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
     
    128128ENABLE_XSLT = ENABLE_XSLT;
    129129
    130 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
     130FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
  • trunk/Source/WebCore/CMakeLists.txt

    r112490 r112658  
    24602460FOREACH(_feature ${FEATURE_DEFINES})
    24612461    # filter out color input since we have our own solution
    2462     IF (NOT CMAKE_SYSTEM_NAME MATCHES "QNX" OR NOT _feature MATCHES "ENABLE_INPUT_COLOR")
     2462    IF (NOT CMAKE_SYSTEM_NAME MATCHES "QNX" OR NOT _feature MATCHES "ENABLE_INPUT_TYPE_COLOR")
    24632463        SET(FEATURE_DEFINES_WITH_SPACE_SEPARATOR "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} ${_feature}")
    24642464    ENDIF()
  • trunk/Source/WebCore/ChangeLog

    r112657 r112658  
     12012-03-30  Keishi Hattori  <[email protected]>
     2
     3        Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=80972
     5
     6        Reviewed by Kent Tamura.
     7
     8        * CMakeLists.txt:
     9        * Configurations/FeatureDefines.xcconfig:
     10        * GNUmakefile.am:
     11        * WebCore.exp.in:
     12        * css/html.css:
     13        * html/ColorInputType.cpp:
     14        * html/ColorInputType.h:
     15        * html/HTMLInputElement.cpp:
     16        (WebCore):
     17        * html/HTMLInputElement.h:
     18        (HTMLInputElement):
     19        * html/InputType.cpp:
     20        (WebCore::createInputTypeFactoryMap):
     21        (WebCore):
     22        (InputTypeNames):
     23        * html/InputType.h:
     24        (InputType):
     25        (InputTypeNames):
     26        * loader/EmptyClients.h:
     27        (EmptyChromeClient):
     28        * page/Chrome.cpp:
     29        (WebCore):
     30        * page/Chrome.h:
     31        (WebCore):
     32        (Chrome):
     33        * page/ChromeClient.h:
     34        (WebCore):
     35        (ChromeClient):
     36        * platform/ColorChooser.h:
     37        * platform/ColorChooserClient.h:
     38        * testing/InternalSettings.cpp:
     39        * testing/Internals.cpp:
     40        (WebCore):
     41        * testing/Internals.h:
     42        (Internals):
     43        * testing/Internals.idl:
     44
    1452012-03-30  Charles Wei  <[email protected]>
    246
  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r111931 r112658  
    8383ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
    8484ENABLE_INDEXED_DATABASE = ;
    85 ENABLE_INPUT_COLOR = ;
     85ENABLE_INPUT_TYPE_COLOR = ;
    8686ENABLE_INPUT_SPEECH = ;
    8787ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
     
    128128ENABLE_XSLT = ENABLE_XSLT;
    129129
    130 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
     130FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
  • trunk/Source/WebCore/GNUmakefile.am

    r111871 r112658  
    288288# Color Input API support
    289289# ----
    290 if ENABLE_INPUT_COLOR
    291 FEATURE_DEFINES += ENABLE_INPUT_COLOR=1
    292 webcore_cppflags += -DENABLE_INPUT_COLOR=1
    293 else
    294 webcore_cppflags += -DENABLE_INPUT_COLOR=0
    295 endif # END ENABLE_INPUT_COLOR
     290if ENABLE_INPUT_TYPE_COLOR
     291FEATURE_DEFINES += ENABLE_INPUT_TYPE_COLOR=1
     292webcore_cppflags += -DENABLE_INPUT_TYPE_COLOR=1
     293else
     294webcore_cppflags += -DENABLE_INPUT_TYPE_COLOR=0
     295endif # END ENABLE_INPUT_TYPE_COLOR
    296296
    297297# ----
  • trunk/Source/WebCore/WebCore.exp.in

    r112559 r112658  
    21232123#endif
    21242124
    2125 #if ENABLE(INPUT_COLOR)
     2125#if ENABLE(INPUT_TYPE_COLOR)
    21262126__ZN7WebCore5ColorC1ERKN3WTF6StringE
    21272127__ZN7WebCore16HTMLInputElement25selectColorInColorChooserERKNS_5ColorE
  • trunk/Source/WebCore/css/html.css

    r103468 r112658  
    626626}
    627627
    628 #if defined(ENABLE_INPUT_COLOR) && ENABLE_INPUT_COLOR
     628#if defined(ENABLE_INPUT_TYPE_COLOR) && ENABLE_INPUT_TYPE_COLOR
    629629
    630630input[type="color"] {
     
    667667#endif // defined(ENABLE_DATALIST) && ENABLE_DATALIST
    668668
    669 #endif // defined(ENABLE_INPUT_COLOR) && ENABLE_INPUT_COLOR
     669#endif // defined(ENABLE_INPUT_TYPE_COLOR) && ENABLE_INPUT_TYPE_COLOR
    670670
    671671select {
  • trunk/Source/WebCore/html/ColorInputType.cpp

    r108975 r112658  
    4545#include <wtf/text/WTFString.h>
    4646
    47 #if ENABLE(INPUT_COLOR)
     47#if ENABLE(INPUT_TYPE_COLOR)
    4848
    4949namespace WebCore {
     
    193193} // namespace WebCore
    194194
    195 #endif // ENABLE(INPUT_COLOR)
     195#endif // ENABLE(INPUT_TYPE_COLOR)
  • trunk/Source/WebCore/html/ColorInputType.h

    r108976 r112658  
    3535#include "ColorChooserClient.h"
    3636
    37 #if ENABLE(INPUT_COLOR)
     37#if ENABLE(INPUT_TYPE_COLOR)
    3838
    3939namespace WebCore {
     
    7070} // namespace WebCore
    7171
    72 #endif // ENABLE(INPUT_COLOR)
     72#endif // ENABLE(INPUT_TYPE_COLOR)
    7373
    7474#endif // ColorInputType_h
  • trunk/Source/WebCore/html/HTMLInputElement.cpp

    r112589 r112658  
    5858#include <wtf/StdLibExtras.h>
    5959
    60 #if ENABLE(INPUT_COLOR)
     60#if ENABLE(INPUT_TYPE_COLOR)
    6161#include "ColorInputType.h"
    6262#endif
     
    15061506}
    15071507
    1508 #if ENABLE(INPUT_COLOR)
     1508#if ENABLE(INPUT_TYPE_COLOR)
    15091509void HTMLInputElement::selectColorInColorChooser(const Color& color)
    15101510{
  • trunk/Source/WebCore/html/HTMLInputElement.h

    r111051 r112658  
    229229    void cacheSelectionInResponseToSetValue(int caretOffset) { cacheSelection(caretOffset, caretOffset, SelectionHasNoDirection); }
    230230
    231 #if ENABLE(INPUT_COLOR)
     231#if ENABLE(INPUT_TYPE_COLOR)
    232232    // For test purposes.
    233233    void selectColorInColorChooser(const Color&);
  • trunk/Source/WebCore/html/InputType.cpp

    r110927 r112658  
    8181    map->add(InputTypeNames::button(), ButtonInputType::create);
    8282    map->add(InputTypeNames::checkbox(), CheckboxInputType::create);
    83 #if ENABLE(INPUT_COLOR)
     83#if ENABLE(INPUT_TYPE_COLOR)
    8484    map->add(InputTypeNames::color(), ColorInputType::create);
    8585#endif
     
    699699}
    700700
    701 #if ENABLE(INPUT_COLOR)
     701#if ENABLE(INPUT_TYPE_COLOR)
    702702bool InputType::isColorControl() const
    703703{
     
    759759}
    760760
    761 #if ENABLE(INPUT_COLOR)
     761#if ENABLE(INPUT_TYPE_COLOR)
    762762const AtomicString& color()
    763763{
  • trunk/Source/WebCore/html/InputType.h

    r110927 r112658  
    9393    // scattered code with special cases for various types.
    9494
    95 #if ENABLE(INPUT_COLOR)
     95#if ENABLE(INPUT_TYPE_COLOR)
    9696    virtual bool isColorControl() const;
    9797#endif
     
    284284const AtomicString& button();
    285285const AtomicString& checkbox();
    286 #if ENABLE(INPUT_COLOR)
     286#if ENABLE(INPUT_TYPE_COLOR)
    287287const AtomicString& color();
    288288#endif
  • trunk/Source/WebCore/loader/EmptyClients.h

    r112474 r112658  
    5151#endif
    5252
    53 #if ENABLE(INPUT_COLOR)
     53#if ENABLE(INPUT_TYPE_COLOR)
    5454#include "ColorChooser.h"
    5555#endif
     
    201201#endif
    202202
    203 #if ENABLE(INPUT_COLOR)
     203#if ENABLE(INPUT_TYPE_COLOR)
    204204    virtual PassOwnPtr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) { return nullptr; }
    205205#endif
  • trunk/Source/WebCore/page/Chrome.cpp

    r110669 r112658  
    5151#include <wtf/text/StringBuilder.h>
    5252
    53 #if ENABLE(INPUT_COLOR)
     53#if ENABLE(INPUT_TYPE_COLOR)
    5454#include "ColorChooser.h"
    5555#endif
     
    453453#endif
    454454
    455 #if ENABLE(INPUT_COLOR)
     455#if ENABLE(INPUT_TYPE_COLOR)
    456456PassOwnPtr<ColorChooser> Chrome::createColorChooser(ColorChooserClient* client, const Color& initialColor)
    457457{
  • trunk/Source/WebCore/page/Chrome.h

    r108957 r112658  
    3737
    3838    class ChromeClient;
    39 #if ENABLE(INPUT_COLOR)
     39#if ENABLE(INPUT_TYPE_COLOR)
    4040    class ColorChooser;
    4141    class ColorChooserClient;
     
    150150        void print(Frame*);
    151151
    152 #if ENABLE(INPUT_COLOR)
     152#if ENABLE(INPUT_TYPE_COLOR)
    153153        PassOwnPtr<ColorChooser> createColorChooser(ColorChooserClient*, const Color& initialColor);
    154154#endif
  • trunk/Source/WebCore/page/ChromeClient.h

    r111930 r112658  
    7575#endif
    7676
    77 #if ENABLE(INPUT_COLOR)
     77#if ENABLE(INPUT_TYPE_COLOR)
    7878    class ColorChooser;
    7979    class ColorChooserClient;
     
    216216        virtual bool paintCustomOverhangArea(GraphicsContext*, const IntRect&, const IntRect&, const IntRect&);
    217217
    218 #if ENABLE(INPUT_COLOR)
     218#if ENABLE(INPUT_TYPE_COLOR)
    219219        virtual PassOwnPtr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) = 0;
    220220#endif
  • trunk/Source/WebCore/platform/ColorChooser.h

    r103168 r112658  
    3131#define ColorChooser_h
    3232
    33 #if ENABLE(INPUT_COLOR)
     33#if ENABLE(INPUT_TYPE_COLOR)
    3434
    3535namespace WebCore {
     
    4747} // namespace WebCore
    4848
    49 #endif // ENABLE(INPUT_COLOR)
     49#endif // ENABLE(INPUT_TYPE_COLOR)
    5050
    5151#endif // ColorChooser_h
  • trunk/Source/WebCore/platform/ColorChooserClient.h

    r106625 r112658  
    22#define ColorChooserClient_h
    33
    4 #if ENABLE(INPUT_COLOR)
     4#if ENABLE(INPUT_TYPE_COLOR)
    55
    66#include "ColorChooser.h"
     
    2222} // namespace WebCore
    2323
    24 #endif // ENABLE(INPUT_COLOR)
     24#endif // ENABLE(INPUT_TYPE_COLOR)
    2525
    2626#endif // ColorChooserClient_h
  • trunk/Source/WebCore/testing/InternalSettings.cpp

    r112196 r112658  
    3939#include "Settings.h"
    4040
    41 #if ENABLE(INPUT_COLOR)
     41#if ENABLE(INPUT_TYPE_COLOR)
    4242#include "ColorChooser.h"
    4343#endif
  • trunk/Source/WebCore/testing/Internals.cpp

    r112055 r112658  
    6060#include "TextIterator.h"
    6161
    62 #if ENABLE(INPUT_COLOR)
     62#if ENABLE(INPUT_TYPE_COLOR)
    6363#include "ColorChooser.h"
    6464#endif
     
    354354}
    355355
    356 #if ENABLE(INPUT_COLOR)
     356#if ENABLE(INPUT_TYPE_COLOR)
    357357void Internals::selectColorInColorChooser(Element* element, const String& colorValue)
    358358{
  • trunk/Source/WebCore/testing/Internals.h

    r112055 r112658  
    9191    Node* traversePreviousNodeInReifiedTree(Node*, ExceptionCode&);
    9292
    93 #if ENABLE(INPUT_COLOR)
     93#if ENABLE(INPUT_TYPE_COLOR)
    9494    void selectColorInColorChooser(Element*, const String& colorValue);
    9595#endif
  • trunk/Source/WebCore/testing/Internals.idl

    r112506 r112658  
    6464        boolean attached(in Node node) raises(DOMException);
    6565
    66 #if defined(ENABLE_INPUT_COLOR) && ENABLE_INPUT_COLOR
     66#if defined(ENABLE_INPUT_TYPE_COLOR) && ENABLE_INPUT_TYPE_COLOR
    6767        void selectColorInColorChooser(in Element element, in DOMString colorValue);
    6868#endif
  • trunk/Source/WebKit/blackberry/ChangeLog

    r112570 r112658  
     12012-03-30  Keishi Hattori  <[email protected]>
     2
     3        Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=80972
     5
     6        Reviewed by Kent Tamura.
     7
     8        * WebCoreSupport/AboutDataEnableFeatures.in:
     9        * WebCoreSupport/ChromeClientBlackBerry.h:
     10        (ChromeClientBlackBerry):
     11        * WebKitSupport/DOMSupport.cpp:
     12        (BlackBerry::WebKit::DOMSupport::isColorInputField):
     13        * WebKitSupport/InputHandler.cpp:
     14        (BlackBerry::WebKit::convertInputType):
     15
    1162012-03-29  Sheriff Bot  <[email protected]>
    217
  • trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in

    r111050 r112658  
    5252IMAGE_DECODER_DOWN_SAMPLING
    5353INDEXED_DATABASE
    54 INPUT_COLOR
    5554INPUT_SPEECH
     55INPUT_TYPE_COLOR
    5656INPUT_TYPE_DATE
    5757INPUT_TYPE_DATETIME
  • trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h

    r111050 r112658  
    104104#endif
    105105
    106 #if ENABLE(INPUT_COLOR)
     106#if ENABLE(INPUT_TYPE_COLOR)
    107107    virtual PassOwnPtr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&);
    108108    void openColorChooser(ColorChooser*, const Color&) { }
  • trunk/Source/WebKit/blackberry/WebKitSupport/DOMSupport.cpp

    r111772 r112658  
    166166    const HTMLInputElement* inputElement = static_cast<const HTMLInputElement*>(element);
    167167
    168 #if ENABLE(INPUT_COLOR)
     168#if ENABLE(INPUT_TYPE_COLOR)
    169169    if (inputElement->isColorControl())
    170170        return true;
  • trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp

    r111772 r112658  
    142142    if (inputElement->isURLField())
    143143        return InputTypeURL;
    144 #if ENABLE(INPUT_COLOR)
     144#if ENABLE(INPUT_TYPE_COLOR)
    145145    if (inputElement->isColorControl())
    146146        return InputTypeColor;
  • trunk/Source/WebKit/chromium/ChangeLog

    r112634 r112658  
     12012-03-30  Keishi Hattori  <[email protected]>
     2
     3        Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=80972
     5
     6        Reviewed by Kent Tamura.
     7
     8        * features.gypi:
     9        * src/ChromeClientImpl.cpp:
     10        (WebKit):
     11        * src/ChromeClientImpl.h:
     12        (WebCore):
     13        (ChromeClientImpl):
     14        * src/ColorChooserProxy.cpp:
     15        * src/ColorChooserProxy.h:
     16        * src/WebColorChooserClientImpl.cpp:
     17        * src/WebColorChooserClientImpl.h:
     18
    1192012-03-29  Adam Barth  <[email protected]>
    220
  • trunk/Source/WebKit/chromium/features.gypi

    r112411 r112658  
    5353      'ENABLE_ICONDATABASE=0',
    5454      'ENABLE_INDEXED_DATABASE=1',
    55       'ENABLE_INPUT_COLOR=0',
    5655      'ENABLE_INPUT_SPEECH=1',
    57       'ENABLE_INPUT_TYPE_COLOR=0',
     56      'ENABLE_INPUT_TYPE_COLOR=1',
    5857      'ENABLE_INPUT_TYPE_DATE=0',
    5958      'ENABLE_INPUT_TYPE_DATETIME=0',
  • trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp

    r112088 r112658  
    3535#include "AXObjectCache.h"
    3636#include "AccessibilityObject.h"
    37 #if ENABLE(INPUT_COLOR)
     37#if ENABLE(INPUT_TYPE_COLOR)
    3838#include "ColorChooser.h"
    3939#include "ColorChooserClient.h"
     
    7373#endif
    7474#include "WebAccessibilityObject.h"
    75 #if ENABLE(INPUT_COLOR)
     75#if ENABLE(INPUT_TYPE_COLOR)
    7676#include "WebColorChooser.h"
    7777#include "WebColorChooserClientImpl.h"
     
    699699}
    700700
    701 #if ENABLE(INPUT_COLOR)
     701#if ENABLE(INPUT_TYPE_COLOR)
    702702PassOwnPtr<ColorChooser> ChromeClientImpl::createColorChooser(ColorChooserClient* chooserClient, const Color& initialColor)
    703703{
  • trunk/Source/WebKit/chromium/src/ChromeClientImpl.h

    r110595 r112658  
    4040namespace WebCore {
    4141class AccessibilityObject;
    42 #if ENABLE(INPUT_COLOR)
     42#if ENABLE(INPUT_TYPE_COLOR)
    4343class ColorChooser;
    4444class ColorChooserClient;
     
    138138    virtual void reachedApplicationCacheOriginQuota(WebCore::SecurityOrigin*, int64_t totalSpaceNeeded);
    139139    virtual bool paintCustomOverhangArea(WebCore::GraphicsContext*, const WebCore::IntRect&, const WebCore::IntRect&, const WebCore::IntRect&);
    140 #if ENABLE(INPUT_COLOR)
     140#if ENABLE(INPUT_TYPE_COLOR)
    141141    virtual PassOwnPtr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) OVERRIDE;
    142142#endif
  • trunk/Source/WebKit/chromium/src/ColorChooserProxy.cpp

    r103215 r112658  
    3131#include "platform/WebColor.h"
    3232
    33 #if ENABLE(INPUT_COLOR)
     33#if ENABLE(INPUT_TYPE_COLOR)
    3434
    3535namespace WebKit {
     
    6060}
    6161
    62 #endif // ENABLE(INPUT_COLOR)
     62#endif // ENABLE(INPUT_TYPE_COLOR)
  • trunk/Source/WebKit/chromium/src/ColorChooserProxy.h

    r103215 r112658  
    3232#include <wtf/PassOwnPtr.h>
    3333
    34 #if ENABLE(INPUT_COLOR)
     34#if ENABLE(INPUT_TYPE_COLOR)
    3535
    3636namespace WebKit {
     
    5050} // namespace WebKit
    5151
    52 #endif // ENABLE(INPUT_COLOR)
     52#endif // ENABLE(INPUT_TYPE_COLOR)
    5353
    5454#endif // ColorChooserProxy_h
  • trunk/Source/WebKit/chromium/src/WebColorChooserClientImpl.cpp

    r103215 r112658  
    3030#include "ColorChooserClient.h"
    3131
    32 #if ENABLE(INPUT_COLOR)
     32#if ENABLE(INPUT_TYPE_COLOR)
    3333
    3434namespace WebKit {
     
    5858}
    5959
    60 #endif // ENABLE(INPUT_COLOR)
     60#endif // ENABLE(INPUT_TYPE_COLOR)
  • trunk/Source/WebKit/chromium/src/WebColorChooserClientImpl.h

    r103215 r112658  
    2929#include "WebColorChooserClient.h"
    3030
    31 #if ENABLE(INPUT_COLOR)
     31#if ENABLE(INPUT_TYPE_COLOR)
    3232
    3333namespace WebCore {
     
    5151}
    5252
    53 #endif // ENABLE(INPUT_COLOR)
     53#endif // ENABLE(INPUT_TYPE_COLOR)
    5454
    5555#endif // WebColorChooserClientImpl_h
  • trunk/Source/WebKit/mac/ChangeLog

    r112571 r112658  
     12012-03-30  Keishi Hattori  <[email protected]>
     2
     3        Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=80972
     5
     6        Reviewed by Kent Tamura.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102012-03-28  Alexey Proskuryakov  <[email protected]>
    211
  • trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r111931 r112658  
    8383ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
    8484ENABLE_INDEXED_DATABASE = ;
    85 ENABLE_INPUT_COLOR = ;
     85ENABLE_INPUT_TYPE_COLOR = ;
    8686ENABLE_INPUT_SPEECH = ;
    8787ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
     
    128128ENABLE_XSLT = ENABLE_XSLT;
    129129
    130 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
     130FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
  • trunk/Source/WebKit2/ChangeLog

    r112651 r112658  
     12012-03-30  Keishi Hattori  <[email protected]>
     2
     3        Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=80972
     5
     6        Reviewed by Kent Tamura.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102012-03-29  Ádám Kallai  <[email protected]>
    211
  • trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

    r111931 r112658  
    8383ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
    8484ENABLE_INDEXED_DATABASE = ;
    85 ENABLE_INPUT_COLOR = ;
     85ENABLE_INPUT_TYPE_COLOR = ;
    8686ENABLE_INPUT_SPEECH = ;
    8787ENABLE_JAVASCRIPT_DEBUGGER = ENABLE_JAVASCRIPT_DEBUGGER;
     
    128128ENABLE_XSLT = ENABLE_XSLT;
    129129
    130 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
     130FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
  • trunk/Source/cmake/OptionsBlackBerry.cmake

    r112654 r112658  
    151151WEBKIT_FEATURE(ENABLE_IMAGE_DECODER_DOWN_SAMPLING "Enable image decoder down sampling" DEFAULT ON)
    152152WEBKIT_FEATURE(ENABLE_INDEXED_DATABASE "Enable IndexDB" DEFAULT OFF)
    153 WEBKIT_FEATURE(ENABLE_INPUT_COLOR "Enable Color Input" DEFAULT ON)
     153WEBKIT_FEATURE(ENABLE_INPUT_TYPE_COLOR "Enable Color Input" DEFAULT ON)
    154154WEBKIT_FEATURE(ENABLE_INSPECTOR "Enable inspector" DEFAULT ON)
    155155WEBKIT_FEATURE(ENABLE_JAVASCRIPT_DEBUGGER "Enable JavaScript debugger" DEFAULT ON)
  • trunk/Tools/ChangeLog

    r112651 r112658  
     12012-03-30  Keishi Hattori  <[email protected]>
     2
     3        Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=80972
     5
     6        Reviewed by Kent Tamura.
     7
     8        * Scripts/build-webkit:
     9        * qmake/mkspecs/features/features.prf:
     10
    1112012-03-29  Ádám Kallai  <[email protected]>
    212
  • trunk/Tools/Scripts/build-webkit

    r112470 r112658  
    9494    $imageResizerSupport,
    9595    $indexedDatabaseSupport,
    96     $inputColorSupport,
     96    $inputTypeColorSupport,
    9797    $inputSpeechSupport,
    9898    $scriptedSpeechSupport,
     
    225225      define => "ENABLE_INDEXED_DATABASE", default => 0, value => \$indexedDatabaseSupport },
    226226
    227     { option => "input-color", desc => "Color Input support",
    228       define => "ENABLE_INPUT_COLOR", default => isBlackBerry(), value => \$inputColorSupport },
    229 
    230227    { option => "input-speech", desc => "Speech Input API support",
    231228      define => "ENABLE_INPUT_SPEECH", default => 0, value => \$inputSpeechSupport },
     
    233230    { option => "scripted-speech", desc => "Scripted Speech API support",
    234231      define => "ENABLE_SCRIPTED_SPEECH", default => 0, value => \$scriptedSpeechSupport },
     232
     233    { option => "input-type-color", desc => "Toggle color type <input> support",
     234      define => "ENABLE_INPUT_TYPE_COLOR", default => isBlackBerry(), value => \$inputTypeColorSupport },
    235235
    236236    { option => "input-type-date", desc => "Toggle date type <input> support",
  • trunk/Tools/qmake/mkspecs/features/features.prf

    r111679 r112658  
    7878!contains(DEFINES, ENABLE_LEGACY_NOTIFICATIONS=.): DEFINES += ENABLE_LEGACY_NOTIFICATIONS=1
    7979!contains(DEFINES, ENABLE_NOTIFICATIONS=.): DEFINES += ENABLE_NOTIFICATIONS=1
    80 !contains(DEFINES, ENABLE_INPUT_COLOR=.): DEFINES += ENABLE_INPUT_COLOR=0
     80!contains(DEFINES, ENABLE_INPUT_TYPE_COLOR=.): DEFINES += ENABLE_INPUT_TYPE_COLOR=0
    8181!contains(DEFINES, ENABLE_INPUT_SPEECH=.): DEFINES += ENABLE_INPUT_SPEECH=0
    8282!contains(DEFINES, ENABLE_SCRIPTED_SPEECH=.): DEFINES += ENABLE_SCRIPTED_SPEECH=0
  • trunk/WebKitLibraries/ChangeLog

    r111462 r112658  
     12012-03-30  Keishi Hattori  <[email protected]>
     2
     3        Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=80972
     5
     6        Reviewed by Kent Tamura.
     7
     8        * win/tools/vsprops/FeatureDefines.vsprops:
     9        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
     10
    1112012-03-20  Steve Falkenburg  <[email protected]>
    212
  • trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops

    r110595 r112658  
    1010  <Tool
    1111                Name="VCCLCompilerTool"
    12                 PreprocessorDefinitions="$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
     12                PreprocessorDefinitions="$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
    1313        />
    1414  <UserMacro
     
    138138        />
    139139  <UserMacro
    140                 Name="ENABLE_INPUT_COLOR"
     140                Name="ENABLE_INPUT_TYPE_COLOR"
    141141                Value=""
    142142                PerformEnvironmentSet="true"
  • trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops

    r110595 r112658  
    1010  <Tool
    1111                Name="VCCLCompilerTool"
    12                 PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
     12                PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
    1313        />
    1414  <UserMacro
     
    133133        />
    134134  <UserMacro
    135                 Name="ENABLE_INPUT_COLOR"
     135                Name="ENABLE_INPUT_TYPE_COLOR"
    136136                Value=""
    137137                PerformEnvironmentSet="true"
  • trunk/configure.ac

    r112396 r112658  
    683683# check whether to enable the color input
    684684AC_MSG_CHECKING([whether to enable the color input])
    685 AC_ARG_ENABLE(input_color,
    686               AC_HELP_STRING([--enable-input-color],
     685AC_ARG_ENABLE(input_type_color,
     686              AC_HELP_STRING([--enable-input-type-color],
    687687                             [enable the color input [default=no]]),
    688               [],[enable_input_color="no"])
    689 AC_MSG_RESULT([$enable_input_color])
     688              [],[enable_input_type_color="no"])
     689AC_MSG_RESULT([$enable_input_type_color])
    690690
    691691# check whether to enable the speech input API
     
    13531353AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"])
    13541354AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
    1355 AM_CONDITIONAL([ENABLE_INPUT_COLOR],[test "$enable_input_color" = "yes"])
     1355AM_CONDITIONAL([ENABLE_INPUT_TYPE_COLOR],[test "$enable_input_type_color" = "yes"])
    13561356AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"])
    13571357AM_CONDITIONAL([ENABLE_SCRIPTED_SPEECH],[test "$enable_scripted_speech" = "yes"])
     
    14761476 Shadow DOM support                                       : $enable_shadow_dom
    14771477 SharedWorkers support                                    : $enable_shared_workers
    1478  Color input support                                      : $enable_input_color
     1478 Color input support                                      : $enable_input_type_color
    14791479 Speech input support                                     : $enable_input_speech
    14801480 Scripted speech support                                  : $enable_scripted_speech
Note: See TracChangeset for help on using the changeset viewer.