Changeset 54649 in webkit


Ignore:
Timestamp:
Feb 11, 2010 2:55:39 AM (14 years ago)
Author:
mjs@apple.com
Message:

2010-02-08 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Cameron Zwarich.

Restore ENABLE_RUBY flag so vendors can ship with Ruby disabled if they choose.
​https://bugs.webkit.org/show_bug.cgi?id=34698

  • Configurations/FeatureDefines.xcconfig:

2010-02-08 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Cameron Zwarich.

Restore ENABLE_RUBY flag so vendors can ship with Ruby disabled if they choose.
​https://bugs.webkit.org/show_bug.cgi?id=34698

  • win/tools/vsprops/FeatureDefines.vsprops:

2010-02-08 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Cameron Zwarich.

Restore ENABLE_RUBY flag so vendors can ship with Ruby disabled if they choose.
​https://bugs.webkit.org/show_bug.cgi?id=34698

  • Configurations/FeatureDefines.xcconfig:

2010-02-08 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Cameron Zwarich.

Restore ENABLE_RUBY flag so vendors can ship with Ruby disabled if they choose.
​https://bugs.webkit.org/show_bug.cgi?id=34698

  • Configurations/FeatureDefines.xcconfig:
  • DerivedSources.make:
  • GNUmakefile.am:
  • html/HTMLTagNames.in: Make the ruby-related tag names conditional.
  • rendering/RenderObject.cpp: (WebCore::RenderObject::createObject): ifdef the code that would create ruby elements.
  • rendering/RenderObject.h: ditto above
  • rendering/RenderRuby.cpp: ifdef this whole file
  • rendering/RenderRuby.h: ditto
  • rendering/RenderRubyBase.cpp: ditto
  • rendering/RenderRubyBase.h: ditto
  • rendering/RenderRubyRun.cpp: ditto
  • rendering/RenderRubyRun.h: ditto
  • rendering/RenderRubyText.cpp: ditto
  • rendering/RenderRubyText.h: ditto

2010-02-08 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Cameron Zwarich.

Restore ENABLE_RUBY flag so vendors can ship with Ruby disabled if they choose.
​https://bugs.webkit.org/show_bug.cgi?id=34698

  • configure.ac:

2010-02-08 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Cameron Zwarich.

Restore ENABLE_RUBY flag so vendors can ship with Ruby disabled if they choose.
​https://bugs.webkit.org/show_bug.cgi?id=34698

  • Scripts/build-webkit:
Location:
trunk
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r54498 r54649  
     12010-02-08  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by Cameron Zwarich.
     4
     5        Restore ENABLE_RUBY flag so vendors can ship with Ruby disabled if they choose.
     6        https://bugs.webkit.org/show_bug.cgi?id=34698
     7
     8        * configure.ac:
     9
    1102010-02-08  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
    211

  • trunk/JavaScriptCore/ChangeLog

    r54633 r54649  
     12010-02-08  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by Cameron Zwarich.
     4
     5        Restore ENABLE_RUBY flag so vendors can ship with Ruby disabled if they choose.
     6        https://bugs.webkit.org/show_bug.cgi?id=34698
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102010-02-10  Kevin Watters  <kevinwatters@gmail.com>
    211

  • trunk/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r54097 r54649  
    5757ENABLE_NOTIFICATIONS = ;
    5858ENABLE_OFFLINE_WEB_APPLICATIONS = ENABLE_OFFLINE_WEB_APPLICATIONS;
     59ENABLE_RUBY = ENABLE_RUBY;
    5960ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
    6061ENABLE_SVG = ENABLE_SVG;
    … …  
    7374ENABLE_XSLT = ENABLE_XSLT;
    7475
    75 FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     76FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_RUBY) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);

  • trunk/WebCore/ChangeLog

    r54647 r54649  
     12010-02-08  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by Cameron Zwarich.
     4
     5        Restore ENABLE_RUBY flag so vendors can ship with Ruby disabled if they choose.
     6        https://bugs.webkit.org/show_bug.cgi?id=34698
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9        * DerivedSources.make:
     10        * GNUmakefile.am:
     11        * html/HTMLTagNames.in: Make the ruby-related tag names conditional.
     12        * rendering/RenderObject.cpp:
     13        (WebCore::RenderObject::createObject): ifdef the code that would create ruby elements.
     14        * rendering/RenderObject.h: ditto above
     15        * rendering/RenderRuby.cpp: ifdef this whole file
     16        * rendering/RenderRuby.h: ditto
     17        * rendering/RenderRubyBase.cpp: ditto
     18        * rendering/RenderRubyBase.h: ditto
     19        * rendering/RenderRubyRun.cpp: ditto
     20        * rendering/RenderRubyRun.h: ditto
     21        * rendering/RenderRubyText.cpp: ditto
     22        * rendering/RenderRubyText.h: ditto
     23
    1242010-02-11  Kent Tamura  <tkent@chromium.org>
    225

  • trunk/WebCore/Configurations/FeatureDefines.xcconfig

    r54097 r54649  
    5757ENABLE_NOTIFICATIONS = ;
    5858ENABLE_OFFLINE_WEB_APPLICATIONS = ENABLE_OFFLINE_WEB_APPLICATIONS;
     59ENABLE_RUBY = ENABLE_RUBY;
    5960ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
    6061ENABLE_SVG = ENABLE_SVG;
    … …  
    7374ENABLE_XSLT = ENABLE_XSLT;
    7475
    75 FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     76FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_RUBY) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);

  • trunk/WebCore/DerivedSources.make

    r53764 r54649  
    625625endif
    626626
     627ifeq ($(findstring ENABLE_RUBY,$(FEATURE_DEFINES)), ENABLE_RUBY)
     628    HTML_FLAGS := $(HTML_FLAGS) ENABLE_RUBY=1
     629endif
     630
    627631ifdef HTML_FLAGS
    628632

  • trunk/WebCore/GNUmakefile.am

    r54597 r54649  
    24382438
    24392439# ----
     2440# Ruby Support
     2441# ----
     2442if ENABLE_RUBY
     2443
     2444HTML_FEATURES += ENABLE_RUBY=1
     2445webcore_cppflags += -DENABLE_RUBY=1
     2446
     2447endif # END ENABLE_RUBY
     2448
     2449# ----
    24402450# XPath Support
    24412451# ----

  • trunk/WebCore/html/HTMLTagNames.in

    r52846 r54649  
    9191pre createWithNew
    9292q interfaceName=HTMLQuoteElement, createWithNew
    93 rp interfaceName=HTMLElement
    94 rt interfaceName=HTMLElement
    95 ruby interfaceName=HTMLElement
     93rp interfaceName=HTMLElement, conditional=RUBY
     94rt interfaceName=HTMLElement, conditional=RUBY
     95ruby interfaceName=HTMLElement, conditional=RUBY
    9696s interfaceName=HTMLElement
    9797samp interfaceName=HTMLElement

  • trunk/WebCore/rendering/RenderObject.cpp

    r54557 r54649  
    112112    }
    113113
     114#if ENABLE(RUBY)
    114115    if (node->hasTagName(rubyTag)) {
    115116        if (style->display() == INLINE)
    … …  
    121122    if (node->hasTagName(rtTag) && style->display() == BLOCK)
    122123        return new (arena) RenderRubyText(node);
     124#endif
    123125
    124126    switch (style->display()) {

  • trunk/WebCore/rendering/RenderObject.h

    r54503 r54649  
    284284    virtual bool isRenderView() const { return false; }
    285285    virtual bool isReplica() const { return false; }
     286#if ENABLE(RUBY)
    286287    virtual bool isRuby() const { return false; }
    287288    virtual bool isRubyBase() const { return false; }
    288289    virtual bool isRubyRun() const { return false; }
    289290    virtual bool isRubyText() const { return false; }
     291#endif
    290292    virtual bool isSlider() const { return false; }
    291293    virtual bool isTable() const { return false; }

  • trunk/WebCore/rendering/RenderRuby.cpp

    r50397 r54649  
    3030
    3131#include "config.h"
     32
     33#if ENABLE(RUBY)
    3234#include "RenderRuby.h"
    3335
    … …  
    193195} // namespace WebCore
    194196
     197#endif

  • trunk/WebCore/rendering/RenderRuby.h

    r52184 r54649  
    3131#ifndef RenderRuby_h
    3232#define RenderRuby_h
     33
     34#if ENABLE(RUBY)
    3335
    3436#include "RenderBlock.h"
    … …  
    8587} // namespace WebCore
    8688
     89#endif
     90
    8791#endif // RenderRuby_h

  • trunk/WebCore/rendering/RenderRubyBase.cpp

    r53525 r54649  
    3030
    3131#include "config.h"
     32
     33#if ENABLE(RUBY)
    3234#include "RenderRubyBase.h"
    3335
    … …  
    185187
    186188} // namespace WebCore
     189
     190#endif

  • trunk/WebCore/rendering/RenderRubyBase.h

    r53525 r54649  
    3232#define RenderRubyBase_h
    3333
     34#if ENABLE(RUBY)
     35
    3436#include "RenderBlock.h"
    3537
    … …  
    6163} // namespace WebCore
    6264
     65#endif
     66
    6367#endif // RenderRubyBase_h

  • trunk/WebCore/rendering/RenderRubyRun.cpp

    r53525 r54649  
    3030
    3131#include "config.h"
     32
     33#if ENABLE(RUBY)
    3234#include "RenderRubyRun.h"
    3335
    … …  
    223225
    224226} // namespace WebCore
     227
     228#endif

  • trunk/WebCore/rendering/RenderRubyRun.h

    r52184 r54649  
    3131#ifndef RenderRubyRun_h
    3232#define RenderRubyRun_h
     33
     34#if ENABLE(RUBY)
    3335
    3436#include "RenderBlock.h"
    … …  
    7981} // namespace WebCore
    8082
     83#endif
     84
    8185#endif // RenderRubyRun_h

  • trunk/WebCore/rendering/RenderRubyText.cpp

    r50397 r54649  
    3030
    3131#include "config.h"
     32
     33#if ENABLE(RUBY)
    3234#include "RenderRubyText.h"
    3335
    … …  
    4951
    5052} // namespace WebCore
     53
     54#endif

  • trunk/WebCore/rendering/RenderRubyText.h

    r50397 r54649  
    3232#define RenderRubyText_h
    3333
     34#if ENABLE(RUBY)
     35
    3436#include "RenderBlock.h"
    3537
    … …  
    5052} // namespace WebCore
    5153
     54#endif
     55
    5256#endif // RenderRubyText_h

  • trunk/WebKit/mac/ChangeLog

    r54618 r54649  
     12010-02-08  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by Cameron Zwarich.
     4
     5        Restore ENABLE_RUBY flag so vendors can ship with Ruby disabled if they choose.
     6        https://bugs.webkit.org/show_bug.cgi?id=34698
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102010-02-09  Alexey Proskuryakov  <ap@apple.com>
    211

  • trunk/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r54097 r54649  
    5757ENABLE_NOTIFICATIONS = ;
    5858ENABLE_OFFLINE_WEB_APPLICATIONS = ENABLE_OFFLINE_WEB_APPLICATIONS;
     59ENABLE_RUBY = ENABLE_RUBY;
    5960ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
    6061ENABLE_SVG = ENABLE_SVG;
    … …  
    7374ENABLE_XSLT = ENABLE_XSLT;
    7475
    75 FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     76FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_RUBY) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);

  • trunk/WebKitLibraries/ChangeLog

    r54369 r54649  
     12010-02-08  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by Cameron Zwarich.
     4
     5        Restore ENABLE_RUBY flag so vendors can ship with Ruby disabled if they choose.
     6        https://bugs.webkit.org/show_bug.cgi?id=34698
     7
     8        * win/tools/vsprops/FeatureDefines.vsprops:
     9
    1102010-02-04  Mark Rowe  <mrowe@apple.com>
    211

  • trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops

    r54098 r54649  
    1010  <Tool
    1111                Name="VCCLCompilerTool"
    12                 PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
     12                PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_RUBY)$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
    1313        />
    1414  <UserMacro
    1515                Name="ENABLE_3D_CANVAS"
    16                 Value=""
     16                Value="ENABLE_3D_CANVAS"
    1717                PerformEnvironmentSet="true"
    1818        />
    … …  
    5959  <UserMacro
    6060                Name="ENABLE_FILTERS"
    61                 Value="ENABLE_FILTERS"
     61                Value=""
    6262                PerformEnvironmentSet="true"
    6363        />
    … …  
    9595                Name="ENABLE_OFFLINE_WEB_APPLICATIONS"
    9696                Value="ENABLE_OFFLINE_WEB_APPLICATIONS"
     97                PerformEnvironmentSet="true"
     98        />
     99  <UserMacro
     100                Name="ENABLE_RUBY"
     101                Value="ENABLE_RUBY"
    97102                PerformEnvironmentSet="true"
    98103        />

  • trunk/WebKitTools/ChangeLog

    r54635 r54649  
     12010-02-08  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by Cameron Zwarich.
     4
     5        Restore ENABLE_RUBY flag so vendors can ship with Ruby disabled if they choose.
     6        https://bugs.webkit.org/show_bug.cgi?id=34698
     7
     8        * Scripts/build-webkit:
     9
    1102010-02-10  Dirk Pranke  <dpranke@chromium.org>
    211

  • trunk/WebKitTools/Scripts/build-webkit

    r54549 r54649  
    5353my ($threeDCanvasSupport, $threeDRenderingSupport, $channelMessagingSupport, $clientBasedGeolocationSupport, $databaseSupport, $datagridSupport, $datalistSupport,
    5454    $domStorageSupport, $eventsourceSupport, $filtersSupport, $geolocationSupport, $iconDatabaseSupport, $indexedDatabaseSupport,
    55     $javaScriptDebuggerSupport, $mathmlSupport, $offlineWebApplicationSupport, $sharedWorkersSupport,
     55    $javaScriptDebuggerSupport, $mathmlSupport, $offlineWebApplicationSupport, $rubySupport, $sharedWorkersSupport,
    5656    $svgSupport, $svgAnimationSupport, $svgAsImageSupport, $svgDOMObjCBindingsSupport, $svgFontsSupport,
    5757    $svgForeignObjectSupport, $svgUseSupport, $videoSupport, $webSocketsSupport, $wmlSupport, $wcssSupport, $xhtmlmpSupport, $workersSupport,
    … …  
    112112    { option => "offline-web-applications", desc => "Toggle Offline Web Application Support",
    113113      define => "ENABLE_OFFLINE_WEB_APPLICATIONS", default => 1, value => \$offlineWebApplicationSupport },
     114
     115    { option => "ruby", desc => "Toggle HTML5 Ruby support",
     116      define => "ENABLE_RUBY", default => 1, value => \$rubySupport },
    114117
    115118    { option => "shared-workers", desc => "Toggle SharedWorkers support",

  • trunk/configure.ac

    r54498 r54649  
    371371              [],[enable_datalist="yes"])
    372372AC_MSG_RESULT([$enable_datalist])
     373
     374# check whether to enable HTML5 ruby support
     375AC_MSG_CHECKING([whether to enable HTML5 ruby support])
     376AC_ARG_ENABLE(ruby,
     377              AC_HELP_STRING([--enable-ruby],
     378                             [enable HTML5 ruby support [default=yes]]),
     379              [],[enable_ruby="yes"])
     380AC_MSG_RESULT([$enable_ruby])
     381
     382# check whether to enable HTML5 ruby support
     383AC_MSG_CHECKING([whether to enable HTML5 ruby support])
     384AC_ARG_ENABLE(ruby,
     385              AC_HELP_STRING([--enable-ruby],
     386                             [enable HTML5 ruby support [default=yes]]),
     387              [],[enable_ruby="yes"])
     388AC_MSG_RESULT([$enable_ruby])
    373389
    374390# check whether to enable HTML5 audio/video support
    … …  
    768784AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
    769785AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
     786AM_CONDITIONAL([ENABLE_RUBY],[test "$enable_ruby" = "yes"])
    770787AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
    771788AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"])
    … …  
    822839 HTML5 client-side session and persistent storage support : $enable_dom_storage
    823840 HTML5 client-side database storage support               : $enable_database
     841 HTML5 ruby support                                       : $enable_ruby
    824842 HTML5 server-sent events support                         : $enable_eventsource
    825843 HTML5 video element support                              : $enable_video
Note: See TracChangeset for help on using the changeset viewer.