Changeset 95112 in webkit


Ignore:
Timestamp:
Sep 14, 2011 1:02:55 PM (13 years ago)
Author:
eric@webkit.org
Message:

Remove ENABLE_SVG_USE as <use> is required by HTML5
​https://bugs.webkit.org/show_bug.cgi?id=68019

Reviewed by Ryosuke Niwa.

I missed a couple uses of SVG_USE in my previous patch.

Source/WebCore:

  • dom/DOMImplementation.cpp:

(WebCore::isSVG10Feature):
(WebCore::isSVG11Feature):

  • svg/SVGUseElement.cpp:

(WebCore::SVGUseElement::associateInstancesWithShadowTreeElements):

  • svg/SVGUseElement.h:

WebKitLibraries:

  • win/tools/vsprops/FeatureDefines.vsprops:
  • win/tools/vsprops/FeatureDefinesCairo.vsprops:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r95108 r95112  
     12011-09-14  Eric Seidel  <eric@webkit.org>
     2
     3        Remove ENABLE_SVG_USE as <use> is required by HTML5
     4        https://bugs.webkit.org/show_bug.cgi?id=68019
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        I missed a couple uses of SVG_USE in my previous patch.
     9
     10        * dom/DOMImplementation.cpp:
     11        (WebCore::isSVG10Feature):
     12        (WebCore::isSVG11Feature):
     13        * svg/SVGUseElement.cpp:
     14        (WebCore::SVGUseElement::associateInstancesWithShadowTreeElements):
     15        * svg/SVGUseElement.h:
     16
    1172011-09-14  Mark Hahnenberg  <mhahnenberg@apple.com>
    218

  • trunk/Source/WebCore/dom/DOMImplementation.cpp

    r95040 r95112  
    7373    DEFINE_STATIC_LOCAL(FeatureSet, svgFeatures, ());
    7474    if (!initialized) {
    75 #if ENABLE(SVG_USE) && ENABLE(FILTERS) && ENABLE(SVG_FONTS)
     75#if ENABLE(FILTERS) && ENABLE(SVG_FONTS)
    7676        addString(svgFeatures, "svg");
    7777        addString(svgFeatures, "svg.static");
    … …  
    8181//      addString(svgFeatures, "svg.dom.animation");
    8282//      addString(svgFeatures, "svg.dom.dynamic");
    83 #if ENABLE(SVG_USE) && ENABLE(FILTERS) && ENABLE(SVG_FONTS)
     83#if ENABLE(FILTERS) && ENABLE(SVG_FONTS)
    8484        addString(svgFeatures, "dom");
    8585        addString(svgFeatures, "dom.svg");
    … …  
    101101        // lack of Font and Filter support.
    102102        // http://bugs.webkit.org/show_bug.cgi?id=15480
    103 #if ENABLE(SVG_USE) && ENABLE(FILTERS) && ENABLE(SVG_FONTS)
     103#if ENABLE(FILTERS) && ENABLE(SVG_FONTS)
    104104        addString(svgFeatures, "SVG");
    105105        addString(svgFeatures, "SVGDOM");
    … …  
    114114//      addString(svgFeatures, "SVGDOM-dynamic);
    115115        addString(svgFeatures, "CoreAttribute");
    116 #if ENABLE(SVG_USE)
    117116        addString(svgFeatures, "Structure");
    118117        addString(svgFeatures, "BasicStructure");
    119 #endif
    120118        addString(svgFeatures, "ContainerAttribute");
    121119        addString(svgFeatures, "ConditionalProcessing");

  • trunk/Source/WebCore/svg/SVGUseElement.cpp

    r95040 r95112  
    568568    buildShadowTree(shadowRoot, target, m_targetElementInstance.get());
    569569
    570 #if ENABLE(SVG) && ENABLE(SVG_USE)
    571570    // Expand all <use> elements in the shadow tree.
    572571    // Expand means: replace the actual <use> element by what it references.
    … …  
    576575    // Expand means: replace the actual <symbol> element by the <svg> element.
    577576    expandSymbolElementsInShadowTree(shadowRoot);
    578 #endif
    579577
    580578    // Now that the shadow tree is completly expanded, we can associate
    … …  
    823821}
    824822
    825 #if ENABLE(SVG) && ENABLE(SVG_USE)
    826823void SVGUseElement::expandUseElementsInShadowTree(Node* element)
    827824{
    … …  
    937934}
    938935
    939 #endif
    940 
    941936void SVGUseElement::transferEventListenersToShadowTree(SVGElementInstance* target)
    942937{
    … …  
    975970
    976971    if (originalElement->hasTagName(SVGNames::useTag)) {
    977 #if ENABLE(SVG) && ENABLE(SVG_USE)
    978972        // <use> gets replaced by <g>
    979973        ASSERT(target->nodeName() == SVGNames::gTag);
    980 #else
    981         ASSERT(target->nodeName() == SVGNames::gTag || target->nodeName() == SVGNames::useTag);
    982 #endif
    983974    } else if (originalElement->hasTagName(SVGNames::symbolTag)) {
    984975        // <symbol> gets replaced by <svg>
    985 #if ENABLE(SVG) && ENABLE(SVG_USE)
    986976        ASSERT(target->nodeName() == SVGNames::svgTag);
    987 #endif
    988977    } else
    989978        ASSERT(target->nodeName() == originalElement->nodeName());

  • trunk/Source/WebCore/svg/SVGUseElement.h

    r94406 r95112  
    9292    void buildShadowTree(SVGShadowTreeRootElement*, SVGElement* target, SVGElementInstance* targetInstance);
    9393
    94 #if ENABLE(SVG) && ENABLE(SVG_USE)
    9594    void expandUseElementsInShadowTree(Node* element);
    9695    void expandSymbolElementsInShadowTree(Node* element);
    97 #endif
    9896
    9997    // "Tree connector"

  • trunk/WebKitLibraries/ChangeLog

    r95107 r95112  
     12011-09-14  Eric Seidel  <eric@webkit.org>
     2
     3        Remove ENABLE_SVG_USE as <use> is required by HTML5
     4        https://bugs.webkit.org/show_bug.cgi?id=68019
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        I missed a couple uses of SVG_USE in my previous patch.
     9
     10        * win/tools/vsprops/FeatureDefines.vsprops:
     11        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
     12
    1132011-09-13  Eric Seidel  <eric@webkit.org>
    214

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

    r95107 r95112  
    1010  <Tool
    1111                Name="VCCLCompilerTool"
    12                 PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
     12                PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(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_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
    1313        />
    1414  <UserMacro

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

    r95107 r95112  
    1010  <Tool
    1111                Name="VCCLCompilerTool"
    12                 PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
     12                PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(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_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
    1313        />
    1414  <UserMacro
Note: See TracChangeset for help on using the changeset viewer.