Changeset 55043 in webkit


Ignore:
Timestamp:
Feb 19, 2010 7:06:28 PM (14 years ago)
Author:
mjs@apple.com
Message:

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

Reviewed by David Levin.

Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
​https://bugs.webkit.org/show_bug.cgi?id=35147

  • Configurations/FeatureDefines.xcconfig:

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

Reviewed by David Levin.

Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
​https://bugs.webkit.org/show_bug.cgi?id=35147

  • win/tools/vsprops/FeatureDefines.vsprops:

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

Reviewed by David Levin.

Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
​https://bugs.webkit.org/show_bug.cgi?id=35147

  • features.gypi:

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

Reviewed by David Levin.

Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
​https://bugs.webkit.org/show_bug.cgi?id=35147

  • Configurations/FeatureDefines.xcconfig:

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

Reviewed by David Levin.

Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
​https://bugs.webkit.org/show_bug.cgi?id=35147

I made ENABLE(SANDBOX) only control the sandbox attribute itself;
I did not ifdef the infrastructure to make sandboxing
switchable. This is because the likely concerns about sandboxing
are not stability of the infrastructure code, but rather the fact
that the security model exposed to authors is still evolving.

  • Configurations/FeatureDefines.xcconfig:
  • GNUmakefile.am:
  • WebCore.pri:
  • html/HTMLIFrameElement.cpp: (WebCore::HTMLIFrameElement::parseMappedAttribute):

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

Reviewed by David Levin.

Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
​https://bugs.webkit.org/show_bug.cgi?id=35147

  • configure.ac:

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

Reviewed by David Levin.

Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
​https://bugs.webkit.org/show_bug.cgi?id=35147

  • Scripts/build-webkit: Handle new flag.
Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r54960 r55043  
     12010-02-19  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by David Levin.
     4
     5        Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
     6        https://bugs.webkit.org/show_bug.cgi?id=35147
     7
     8        * configure.ac:
     9
    1102010-02-18  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    211

  • trunk/JavaScriptCore/ChangeLog

    r55035 r55043  
     12010-02-19  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by David Levin.
     4
     5        Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
     6        https://bugs.webkit.org/show_bug.cgi?id=35147
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102010-02-19  Gavin Barraclough  <barraclough@apple.com>
    211

  • trunk/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r54649 r55043  
    5858ENABLE_OFFLINE_WEB_APPLICATIONS = ENABLE_OFFLINE_WEB_APPLICATIONS;
    5959ENABLE_RUBY = ENABLE_RUBY;
     60ENABLE_SANDBOX = ENABLE_SANDBOX;
    6061ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
    6162ENABLE_SVG = ENABLE_SVG;
    … …  
    7475ENABLE_XSLT = ENABLE_XSLT;
    7576
    76 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_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);
     77FEATURE_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_SANDBOX) $(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

    r55041 r55043  
     12010-02-19  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by David Levin.
     4
     5        Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
     6        https://bugs.webkit.org/show_bug.cgi?id=35147
     7
     8        I made ENABLE(SANDBOX) only control the sandbox attribute itself;
     9        I did not ifdef the infrastructure to make sandboxing
     10        switchable. This is because the likely concerns about sandboxing
     11        are not stability of the infrastructure code, but rather the fact
     12        that the security model exposed to authors is still evolving.
     13
     14        * Configurations/FeatureDefines.xcconfig:
     15        * GNUmakefile.am:
     16        * WebCore.pri:
     17        * html/HTMLIFrameElement.cpp:
     18        (WebCore::HTMLIFrameElement::parseMappedAttribute):
     19
    1202010-02-19  Alexey Proskuryakov  <ap@apple.com>
    221

  • trunk/WebCore/Configurations/FeatureDefines.xcconfig

    r54649 r55043  
    5858ENABLE_OFFLINE_WEB_APPLICATIONS = ENABLE_OFFLINE_WEB_APPLICATIONS;
    5959ENABLE_RUBY = ENABLE_RUBY;
     60ENABLE_SANDBOX = ENABLE_SANDBOX;
    6061ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
    6162ENABLE_SVG = ENABLE_SVG;
    … …  
    7475ENABLE_XSLT = ENABLE_XSLT;
    7576
    76 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_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);
     77FEATURE_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_SANDBOX) $(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/GNUmakefile.am

    r54991 r55043  
    24412441
    24422442# ----
     2443# Sandboxed IFrame Support
     2444# ----
     2445if ENABLE_SANDBOX
     2446
     2447HTML_FEATURES += ENABLE_SANDBOX=1
     2448webcore_cppflags += -DENABLE_SANDBOX=1
     2449
     2450endif # END ENABLE_SANDBOX
     2451
     2452# ----
    24432453# Ruby Support
    24442454# ----

  • trunk/WebCore/WebCore.pri

    r54656 r55043  
    5454!contains(DEFINES, ENABLE_VIDEO=.): DEFINES += ENABLE_VIDEO=1
    5555!contains(DEFINES, ENABLE_RUBY=.): DEFINES += ENABLE_RUBY=1
     56!contains(DEFINES, ENABLE_SANDBOX=.): DEFINES += ENABLE_SANDBOX=1
    5657
    5758# SVG support

  • trunk/WebCore/html/HTMLIFrameElement.cpp

    r52946 r55043  
    6868}
    6969
     70#if ENABLE(SANDBOX)
    7071static SandboxFlags parseSandboxAttribute(MappedAttribute* attribute)
    7172{
    … …  
    101102    return flags;
    102103}
     104#endif
    103105
    104106void HTMLIFrameElement::parseMappedAttribute(MappedAttribute* attr)
    … …  
    124126            // Add a rule that nulls out our border width.
    125127            addCSSLength(attr, CSSPropertyBorderWidth, "0");
    126     } else if (attr->name() == sandboxAttr)
     128    }
     129#if ENABLE(SANDBOX)
     130    else if (attr->name() == sandboxAttr)
    127131        setSandboxFlags(parseSandboxAttribute(attr));
     132#endif
    128133    else
    129134        HTMLFrameElementBase::parseMappedAttribute(attr);

  • trunk/WebKit/chromium/ChangeLog

    r55037 r55043  
     12010-02-19  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by David Levin.
     4
     5        Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
     6        https://bugs.webkit.org/show_bug.cgi?id=35147
     7
     8        * features.gypi:
     9
    1102010-02-19  James Hawkins  <jhawkins@chromium.org>
    211

  • trunk/WebKit/chromium/features.gypi

    r54904 r55043  
    5656        'ENABLE_ORIENTATION_EVENTS=0',
    5757        'ENABLE_RUBY=1',
     58        'ENABLE_SANDBOX=1',
    5859        'ENABLE_XHTMLMP=0',
    5960        'ENABLE_XSLT=1',

  • trunk/WebKit/mac/ChangeLog

    r55041 r55043  
     12010-02-19  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by David Levin.
     4
     5        Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
     6        https://bugs.webkit.org/show_bug.cgi?id=35147
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102010-02-19  Alexey Proskuryakov  <ap@apple.com>
    211

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

    r54649 r55043  
    5858ENABLE_OFFLINE_WEB_APPLICATIONS = ENABLE_OFFLINE_WEB_APPLICATIONS;
    5959ENABLE_RUBY = ENABLE_RUBY;
     60ENABLE_SANDBOX = ENABLE_SANDBOX;
    6061ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
    6162ENABLE_SVG = ENABLE_SVG;
    … …  
    7475ENABLE_XSLT = ENABLE_XSLT;
    7576
    76 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_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);
     77FEATURE_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_SANDBOX) $(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

    r54943 r55043  
     12010-02-19  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by David Levin.
     4
     5        Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
     6        https://bugs.webkit.org/show_bug.cgi?id=35147
     7
     8        * win/tools/vsprops/FeatureDefines.vsprops:
     9
    1102010-02-18  Steve Falkenburg  <sfalken@apple.com>
    211

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

    r54686 r55043  
    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_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)"
     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_SANDBOX);$(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
    … …  
    103103        />
    104104  <UserMacro
     105                Name="ENABLE_SANDBOX"
     106                Value="ENABLE_SANDBOX"
     107                PerformEnvironmentSet="true"
     108        />
     109  <UserMacro
    105110                Name="ENABLE_SHARED_WORKERS"
    106111                Value="ENABLE_SHARED_WORKERS"

  • trunk/WebKitTools/ChangeLog

    r55042 r55043  
     12010-02-19  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Reviewed by David Levin.
     4
     5        Add an ENABLE flag for sandboxed iframes to make it possible to disable it in releases
     6        https://bugs.webkit.org/show_bug.cgi?id=35147
     7
     8        * Scripts/build-webkit: Handle new flag.
     9
    1102010-02-19  Leandro Pereira  <leandro@profusion.mobi>
    211

  • trunk/WebKitTools/Scripts/build-webkit

    r54698 r55043  
    5454my ($threeDCanvasSupport, $threeDRenderingSupport, $channelMessagingSupport, $clientBasedGeolocationSupport, $databaseSupport, $datagridSupport, $datalistSupport,
    5555    $domStorageSupport, $eventsourceSupport, $filtersSupport, $geolocationSupport, $iconDatabaseSupport, $indexedDatabaseSupport,
    56     $javaScriptDebuggerSupport, $mathmlSupport, $offlineWebApplicationSupport, $rubySupport, $sharedWorkersSupport,
     56    $javaScriptDebuggerSupport, $mathmlSupport, $offlineWebApplicationSupport, $rubySupport, $sandboxSupport, $sharedWorkersSupport,
    5757    $svgSupport, $svgAnimationSupport, $svgAsImageSupport, $svgDOMObjCBindingsSupport, $svgFontsSupport,
    5858    $svgForeignObjectSupport, $svgUseSupport, $videoSupport, $webSocketsSupport, $wmlSupport, $wcssSupport, $xhtmlmpSupport, $workersSupport,
    … …  
    116116    { option => "ruby", desc => "Toggle HTML5 Ruby support",
    117117      define => "ENABLE_RUBY", default => 1, value => \$rubySupport },
     118
     119    { option => "sandbox", desc => "Toggle HTML5 Sandboxed iframe support",
     120      define => "ENABLE_SANDBOX", default => 1, value => \$sandboxSupport },
    118121
    119122    { option => "shared-workers", desc => "Toggle SharedWorkers support",

  • trunk/configure.ac

    r54878 r55043  
    388388AC_MSG_RESULT([$enable_ruby])
    389389
    390 # check whether to enable HTML5 ruby support
    391 AC_MSG_CHECKING([whether to enable HTML5 ruby support])
     390# check whether to enable HTML5 sandbox iframe support
     391AC_MSG_CHECKING([whether to enable HTML5 sandboxed iframe support])
    392392AC_ARG_ENABLE(ruby,
    393               AC_HELP_STRING([--enable-ruby],
    394                              [enable HTML5 ruby support [default=yes]]),
    395               [],[enable_ruby="yes"])
    396 AC_MSG_RESULT([$enable_ruby])
     393              AC_HELP_STRING([--enable-sandbox],
     394                             [enable HTML5 sandboxed iframe support [default=yes]]),
     395              [],[enable_sandbox="yes"])
     396AC_MSG_RESULT([$enable_sandbox])
    397397
    398398# check whether to enable HTML5 audio/video support
    … …  
    793793AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
    794794AM_CONDITIONAL([ENABLE_RUBY],[test "$enable_ruby" = "yes"])
     795AM_CONDITIONAL([ENABLE_SANDBOX],[test "$enable_sandbox" = "yes"])
    795796AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
    796797AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"])
    … …  
    848849 HTML5 client-side database storage support               : $enable_database
    849850 HTML5 ruby support                                       : $enable_ruby
     851 HTML5 sandboxed iframe support                           : $enable_sandbox
    850852 HTML5 server-sent events support                         : $enable_eventsource
    851853 HTML5 video element support                              : $enable_video
Note: See TracChangeset for help on using the changeset viewer.