Changeset 50057 in webkit


Ignore:
Timestamp:
Oct 26, 2009 5:44:53 AM (15 years ago)
Author:
benm@google.com
Message:

Adds feature ENABLE guards to V8 bindings.
​https://bugs.webkit.org/show_bug.cgi?id=30697

Patch by Steve Block <​steveblock@google.com> on 2009-10-26
Reviewed by Eric Seidel.

This adds guards for the following features to the V8 bindings,
to allow builds with V8 to succeed when these features are not enabled.

  • DATABASE
  • WORKERS
  • SHARED_WORKERS
  • SVG
  • XPATH
  • XSLT
  • INSPECTOR

This is a build fix only, no new tests required.

  • bindings/v8/DOMObjectsInclude.h: Modified.
  • bindings/v8/DerivedSourcesAllInOne.cpp: Modified.
  • bindings/v8/V8Index.cpp: Modified.
  • bindings/v8/V8Index.h: Modified.
Location:
trunk/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r50054 r50057  
     12009-10-26  Steve Block  <steveblock@google.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Adds feature ENABLE guards to V8 bindings.
     6        https://bugs.webkit.org/show_bug.cgi?id=30697
     7
     8        This adds guards for the following features to the V8 bindings,
     9        to allow builds with V8 to succeed when these features are not enabled.
     10        - DATABASE
     11        - WORKERS
     12        - SHARED_WORKERS
     13        - SVG
     14        - XPATH
     15        - XSLT
     16        - INSPECTOR
     17
     18        This is a build fix only, no new tests required.
     19
     20        * bindings/v8/DOMObjectsInclude.h: Modified.
     21        * bindings/v8/DerivedSourcesAllInOne.cpp: Modified.
     22        * bindings/v8/V8Index.cpp: Modified.
     23        * bindings/v8/V8Index.h: Modified.
     24
    1252009-10-26  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
    226

  • trunk/WebCore/bindings/v8/DOMObjectsInclude.h

    r49432 r50057  
    3232#define DOMObjectsInclude_h
    3333
    34 #include "AbstractWorker.h"
    3534#include "BarInfo.h"
    3635#include "BeforeLoadEvent.h"
    … …  
    7877#include "CSSVariablesDeclaration.h"
    7978#include "CSSVariablesRule.h"
    80 #include "Database.h"
    8179#include "DocumentType.h"
    8280#include "DocumentFragment.h"
    … …  
    107105#include "HTMLOptionsCollection.h"
    108106#include "ImageData.h"
    109 #include "InspectorBackend.h"
    110107#include "KeyboardEvent.h"
    111108#include "Location.h"
    … …  
    140137#include "SecurityOrigin.h"
    141138#include "Settings.h"
    142 #include "SharedWorker.h"
    143 #include "SharedWorkerContext.h"
    144 #include "SQLTransaction.h"
    145 #include "SQLResultSet.h"
    146 #include "SQLResultSetRowList.h"
    147139#include "StyleSheet.h"
    148140#include "StyleSheetList.h"
    149 #include "SVGColor.h"
    150 #include "SVGPaint.h"
    151141#include "TextEvent.h"
    152142#include "TextMetrics.h"
    153143#include "TimeRanges.h"
    154144#include "TreeWalker.h"
    155 #include "XSLTProcessor.h"
    156145#include "V8AbstractEventListener.h"
    157146#include "V8CustomEventListener.h"
    … …  
    174163#include "XMLHttpRequestUpload.h"
    175164#include "XMLSerializer.h"
    176 #include "XPathException.h"
    177 #include "XPathExpression.h"
    178 #include "XPathNSResolver.h"
    179 #include "XPathResult.h"
    180165
    181166#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    182167#include "DOMApplicationCache.h"
    183168#endif
     169
     170#if ENABLE(DATABASE)
     171#include "Database.h"
     172#include "SQLTransaction.h"
     173#include "SQLResultSet.h"
     174#include "SQLResultSetRowList.h"
     175#endif // DATABASE
    184176
    185177#if ENABLE(DATAGRID)
    … …  
    196188#include "SVGAngle.h"
    197189#include "SVGAnimatedPoints.h"
     190#include "SVGColor.h"
    198191#include "SVGElement.h"
    199192#include "SVGElementInstance.h"
    … …  
    203196#include "SVGLengthList.h"
    204197#include "SVGNumberList.h"
     198#include "SVGPaint.h"
    205199#include "SVGPathSeg.h"
    206200#include "SVGPathSegArc.h"
    … …  
    232226
    233227#if ENABLE(WORKERS)
     228#include "AbstractWorker.h"
    234229#include "DedicatedWorkerContext.h"
    235230#include "Worker.h"
    … …  
    239234#endif // WORKERS
    240235
     236#if ENABLE(SHARED_WORKERS)
     237#include "SharedWorker.h"
     238#include "SharedWorkerContext.h"
     239#endif  // SHARED_WORKERS
     240
    241241#if ENABLE(NOTIFICATIONS)
    242242#include "Notification.h"
    … …  
    246246#if ENABLE(XPATH)
    247247#include "XPathEvaluator.h"
     248#include "XPathException.h"
     249#include "XPathExpression.h"
     250#include "XPathNSResolver.h"
     251#include "XPathResult.h"
    248252#endif // XPATH
     253
     254#if ENABLE(XSLT)
     255#include "XSLTProcessor.h"
     256#endif // XSLT
     257
     258#if ENABLE(INSPECTOR)
     259#include "InspectorBackend.h"
     260#endif // INSPECTOR
    249261
    250262namespace WebCore {

  • trunk/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp

    r49526 r50057  
    2929 */
    3030
    31 // This source file coalesces the HTML elements into a single object file to
     31// This source file coalesces the V8 derived sources into a single object file to
    3232// reduce bloat and allow us to link release builds on 32-bit Windows.
    3333
    34 #include "bindings/V8AbstractWorker.cpp"
    3534#include "bindings/V8Attr.cpp"
    3635#include "bindings/V8BarInfo.cpp"
    … …  
    8180#include "bindings/V8CSSVariablesDeclaration.cpp"
    8281#include "bindings/V8CSSVariablesRule.cpp"
    83 #include "bindings/V8Database.cpp"
    8482#include "bindings/V8DataGridColumn.cpp"
    8583#include "bindings/V8DataGridColumnList.cpp"
    86 #include "bindings/V8DedicatedWorkerContext.cpp"
    8784#include "bindings/V8Document.cpp"
    8885#include "bindings/V8DocumentFragment.cpp"
    8986#include "bindings/V8DocumentType.cpp"
    90 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
    91 #include "bindings/V8DOMApplicationCache.cpp"
    92 #endif
    9387#include "bindings/V8DOMCoreException.cpp"
    9488#include "bindings/V8DOMImplementation.cpp"
    … …  
    175169#include "bindings/V8HTMLVideoElement.cpp"
    176170#include "bindings/V8ImageData.cpp"
    177 #include "bindings/V8InspectorBackend.cpp"
    178171#include "bindings/V8KeyboardEvent.cpp"
    179172#include "bindings/V8Location.cpp"
    … …  
    208201#include "bindings/V8RGBColor.cpp"
    209202#include "bindings/V8Screen.cpp"
    210 #include "bindings/V8SharedWorker.cpp"
    211 #include "bindings/V8SharedWorkerContext.cpp"
     203#include "bindings/V8StyleSheet.cpp"
     204#include "bindings/V8StyleSheetList.cpp"
     205#include "bindings/V8Text.cpp"
     206#include "bindings/V8TextEvent.cpp"
     207#include "bindings/V8TextMetrics.cpp"
     208#include "bindings/V8TimeRanges.cpp"
     209#include "bindings/V8TreeWalker.cpp"
     210#include "bindings/V8UIEvent.cpp"
     211#include "bindings/V8ValidityState.cpp"
     212#include "bindings/V8WebKitAnimationEvent.cpp"
     213#include "bindings/V8WebKitCSSKeyframeRule.cpp"
     214#include "bindings/V8WebKitCSSKeyframesRule.cpp"
     215#include "bindings/V8WebKitCSSMatrix.cpp"
     216#include "bindings/V8WebKitCSSTransformValue.cpp"
     217#include "bindings/V8WebKitPoint.cpp"
     218#include "bindings/V8WebKitTransitionEvent.cpp"
     219#include "bindings/V8WheelEvent.cpp"
     220#include "bindings/V8XMLHttpRequest.cpp"
     221#include "bindings/V8XMLHttpRequestException.cpp"
     222#include "bindings/V8XMLHttpRequestProgressEvent.cpp"
     223#include "bindings/V8XMLHttpRequestUpload.cpp"
     224#include "bindings/V8XMLSerializer.cpp"
     225
     226#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     227#include "bindings/V8DOMApplicationCache.cpp"
     228#endif
     229
     230#if ENABLE(DOM_STORAGE)
     231#include "bindings/V8Storage.cpp"
     232#include "bindings/V8StorageEvent.cpp"
     233#endif
     234
     235#if ENABLE(WEB_SOCKETS)
     236#include "bindings/V8WebSocket.cpp"
     237#endif
     238
     239#if ENABLE(DATABASE)
     240#include "bindings/V8Database.cpp"
    212241#include "bindings/V8SQLError.cpp"
    213242#include "bindings/V8SQLResultSet.cpp"
    214243#include "bindings/V8SQLResultSetRowList.cpp"
    215244#include "bindings/V8SQLTransaction.cpp"
    216 #if ENABLE(DOM_STORAGE)
    217 #include "bindings/V8Storage.cpp"
    218 #include "bindings/V8StorageEvent.cpp"
    219 #endif
    220 #include "bindings/V8StyleSheet.cpp"
    221 #include "bindings/V8StyleSheetList.cpp"
     245#endif
     246
     247#if ENABLE(WORKERS)
     248#include "bindings/V8AbstractWorker.cpp"
     249#include "bindings/V8DedicatedWorkerContext.cpp"
     250#include "bindings/V8Worker.cpp"
     251#include "bindings/V8WorkerContext.cpp"
     252#include "bindings/V8WorkerLocation.cpp"
     253#include "bindings/V8WorkerNavigator.cpp"
     254#endif
     255
     256#if ENABLE(SHARED_WORKERS)
     257#include "bindings/V8SharedWorker.cpp"
     258#include "bindings/V8SharedWorkerContext.cpp"
     259#endif
     260
     261#if ENABLE(SVG)
    222262#include "bindings/V8SVGAElement.cpp"
    223263#include "bindings/V8SVGAltGlyphElement.cpp"
    … …  
    328368#include "bindings/V8SVGViewElement.cpp"
    329369#include "bindings/V8SVGZoomEvent.cpp"
    330 #include "bindings/V8Text.cpp"
    331 #include "bindings/V8TextEvent.cpp"
    332 #include "bindings/V8TextMetrics.cpp"
    333 #include "bindings/V8TimeRanges.cpp"
    334 #include "bindings/V8TreeWalker.cpp"
    335 #include "bindings/V8UIEvent.cpp"
    336 #include "bindings/V8ValidityState.cpp"
    337 #include "bindings/V8WebKitAnimationEvent.cpp"
    338 #include "bindings/V8WebKitCSSKeyframeRule.cpp"
    339 #include "bindings/V8WebKitCSSKeyframesRule.cpp"
    340 #include "bindings/V8WebKitCSSMatrix.cpp"
    341 #include "bindings/V8WebKitCSSTransformValue.cpp"
    342 #include "bindings/V8WebKitPoint.cpp"
    343 #include "bindings/V8WebKitTransitionEvent.cpp"
    344 #if ENABLE(WEB_SOCKETS)
    345 #include "bindings/V8WebSocket.cpp"
    346 #endif
    347 #include "bindings/V8WheelEvent.cpp"
    348 #include "bindings/V8Worker.cpp"
    349 #include "bindings/V8WorkerContext.cpp"
    350 #include "bindings/V8WorkerLocation.cpp"
    351 #include "bindings/V8WorkerNavigator.cpp"
    352 #include "bindings/V8XMLHttpRequest.cpp"
    353 #include "bindings/V8XMLHttpRequestException.cpp"
    354 #include "bindings/V8XMLHttpRequestProgressEvent.cpp"
    355 #include "bindings/V8XMLHttpRequestUpload.cpp"
    356 #include "bindings/V8XMLSerializer.cpp"
     370#endif
     371
     372#if ENABLE(XPATH)
    357373#include "bindings/V8XPathEvaluator.cpp"
    358374#include "bindings/V8XPathException.cpp"
    … …  
    360376#include "bindings/V8XPathNSResolver.cpp"
    361377#include "bindings/V8XPathResult.cpp"
     378#endif
     379
     380#if ENABLE(XSLT)
    362381#include "bindings/V8XSLTProcessor.cpp"
     382#endif
     383
     384#if ENABLE(INSPECTOR)
     385#include "bindings/V8InspectorBackend.cpp"
     386#endif

  • trunk/WebCore/bindings/v8/V8Index.cpp

    r49526 r50057  
    6666#include "V8DataGridColumn.h"
    6767#include "V8DataGridColumnList.h"
    68 #include "V8Database.h"
    6968#include "V8Document.h"
    7069#include "V8DocumentFragment.h"
    … …  
    145144#include "V8HTMLUListElement.h"
    146145#include "V8ImageData.h"
    147 #include "V8InspectorBackend.h"
    148146#include "V8Media.h"
    149147#include "V8MediaList.h"
    … …  
    193191#include "V8RangeException.h"
    194192#include "V8Rect.h"
    195 #include "V8SQLError.h"
    196 #include "V8SQLResultSet.h"
    197 #include "V8SQLResultSetRowList.h"
    198 #include "V8SQLTransaction.h"
    199193#include "V8NodeIterator.h"
    200194#include "V8TextMetrics.h"
    … …  
    202196#include "V8StyleSheetList.h"
    203197#include "V8DOMImplementation.h"
    204 #include "V8XPathResult.h"
    205 #include "V8XPathException.h"
    206 #include "V8XPathExpression.h"
    207 #include "V8XPathNSResolver.h"
    208198#include "V8XMLHttpRequest.h"
    209199#include "V8XMLHttpRequestException.h"
    … …  
    211201#include "V8XMLHttpRequestUpload.h"
    212202#include "V8XMLSerializer.h"
    213 #include "V8XPathEvaluator.h"
    214 #include "V8XSLTProcessor.h"
    215203#include "V8RGBColor.h"
    216204
    … …  
    424412#endif
    425413
     414#if ENABLE(DATABASE)
     415#include "V8Database.h"
     416#include "V8SQLError.h"
     417#include "V8SQLResultSet.h"
     418#include "V8SQLResultSetRowList.h"
     419#include "V8SQLTransaction.h"
     420#endif
     421
     422#if ENABLE(XPATH)
     423#include "V8XPathResult.h"
     424#include "V8XPathException.h"
     425#include "V8XPathExpression.h"
     426#include "V8XPathNSResolver.h"
     427#include "V8XPathEvaluator.h"
     428#endif
     429
     430#if ENABLE(XSLT)
     431#include "V8XSLTProcessor.h"
     432#endif
     433
     434#if ENABLE(INSPECTOR)
     435#include "V8InspectorBackend.h"
     436#endif
     437
    426438namespace WebCore {
    427439

  • trunk/WebCore/bindings/v8/V8Index.h

    r49526 r50057  
    8484
    8585#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    86 #define APPLICATIONCACHE_NONNODE_WRAPPER_TYPES(V)                      \
     86#define APPLICATIONCACHE_NONNODE_WRAPPER_TYPES(V)                       \
    8787  V(DOMAPPLICATIONCACHE, DOMApplicationCache)
    8888#else
    … …  
    364364    V(IMAGEDATA, ImageData)                                             \
    365365    V(CANVASPIXELARRAY, CanvasPixelArray)                               \
    366     V(INSPECTORBACKEND, InspectorBackend)                               \
    367366    V(KEYBOARDEVENT, KeyboardEvent)                                     \
    368367    V(LOCATION, Location)                                               \
    369     V(MEDIA, Media)                                               \
     368    V(MEDIA, Media)                                                     \
    370369    V(MEDIALIST, MediaList)
    371370
    … …  
    411410    V(XMLHTTPREQUESTPROGRESSEVENT, XMLHttpRequestProgressEvent)         \
    412411    V(XMLSERIALIZER, XMLSerializer)                                     \
    413     V(XPATHEVALUATOR, XPathEvaluator)                                   \
    414     V(XPATHEXCEPTION, XPathException)                                   \
    415     V(XPATHEXPRESSION, XPathExpression)                                 \
    416     V(XPATHNSRESOLVER, XPathNSResolver)                                 \
    417     V(XPATHRESULT, XPathResult)                                         \
    418     V(XSLTPROCESSOR, XSLTProcessor)                                     \
    419412    ACTIVE_DOM_OBJECT_TYPES(V)                                          \
    420413    APPLICATIONCACHE_NONNODE_WRAPPER_TYPES(V)                           \
    … …  
    474467#endif
    475468
     469#if ENABLE(XPATH)
     470#define DOM_OBJECT_XPATH_TYPES(V)                                       \
     471    V(XPATHEVALUATOR, XPathEvaluator)                                   \
     472    V(XPATHEXCEPTION, XPathException)                                   \
     473    V(XPATHEXPRESSION, XPathExpression)                                 \
     474    V(XPATHNSRESOLVER, XPathNSResolver)                                 \
     475    V(XPATHRESULT, XPathResult)
     476#else
     477#define DOM_OBJECT_XPATH_TYPES(V)
     478#endif
     479
     480#if ENABLE(XSLT)
     481#define DOM_OBJECT_XSLT_TYPES(V)                                        \
     482    V(XSLTPROCESSOR, XSLTProcessor)
     483#else
     484#define DOM_OBJECT_XSLT_TYPES(V)
     485#endif
     486
     487#if ENABLE(INSPECTOR)
     488#define DOM_OBJECT_INSPECTOR_TYPES(V)                                   \
     489    V(INSPECTORBACKEND, InspectorBackend)
     490#else
     491#define DOM_OBJECT_INSPECTOR_TYPES(V)
     492#endif
     493
    476494#define DOM_OBJECT_TYPES(V)                                             \
    477495    DOM_OBJECT_TYPES_1(V)                                               \
    … …  
    480498    DOM_OBJECT_STORAGE_TYPES(V)                                         \
    481499    DOM_OBJECT_WORKERS_TYPES(V)                                         \
    482     DOM_OBJECT_3D_CANVAS_TYPES(V)
     500    DOM_OBJECT_3D_CANVAS_TYPES(V)                                       \
     501    DOM_OBJECT_XPATH_TYPES(V)                                           \
     502    DOM_OBJECT_XSLT_TYPES(V)                                            \
     503    DOM_OBJECT_INSPECTOR_TYPES(V)
    483504
    484505#if ENABLE(SVG)
Note: See TracChangeset for help on using the changeset viewer.