Changeset 104872 in webkit

Timestamp:

Jan 12, 2012 3:57:29 PM (12 years ago)

Author:

eric@webkit.org

Message:

Refactor DOMImplementation.hasFeature logic into helper functions.
​https://bugs.webkit.org/show_bug.cgi?id=76212

Reviewed by Adam Barth.

This patch should not have any behavior change. The goal was
to move our feature detection towards a more modular architecture
(as that seems to be the current trend in webkit). In a future
patch we could easily move the SVG feature detection into the
SVG directory, for example. I've also added a list of all the
Event3 features (currently commented out) which makes it obvious
how many we're missing.

• dom/DOMImplementation.cpp:

(WebCore::isSVG10Feature):
(WebCore::isSVG11Feature):
(WebCore::isEvents2Feature):
(WebCore::isEvents3Feature):
(WebCore::DOMImplementation::hasFeature):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/DOMImplementation.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-12  Eric Seidel  <eric@webkit.org>
+
+        Refactor DOMImplementation.hasFeature logic into helper functions.
+        https://bugs.webkit.org/show_bug.cgi?id=76212
+
+        Reviewed by Adam Barth.
+
+        This patch should not have any behavior change.  The goal was
+        to move our feature detection towards a more modular architecture
+        (as that seems to be the current trend in webkit).  In a future
+        patch we could easily move the SVG feature detection into the
+        SVG directory, for example.  I've also added a list of all the
+        Event3 features (currently commented out) which makes it obvious
+        how many we're missing.
+
+        * dom/DOMImplementation.cpp:
+        (WebCore::isSVG10Feature):
+        (WebCore::isSVG11Feature):
+        (WebCore::isEvents2Feature):
+        (WebCore::isEvents3Feature):
+        (WebCore::DOMImplementation::hasFeature):
+
 2012-01-12  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/dom/DOMImplementation.cpp

@@ -61 +61 @@
 namespace WebCore {
 
+typedef HashSet<String, CaseFoldingHash> FeatureSet;
+
+static void addString(FeatureSet& set, const char* string)
+{
+    set.add(string);
+}
+
 #if ENABLE(SVG)
 
-typedef HashSet<String, CaseFoldingHash> FeatureSet;
-
-static void addString(FeatureSet& set, const char* string)
-{
-    set.add(string);
-}
-
-static bool isSVG10Feature(const String &feature)
-{
+static bool isSVG10Feature(const String &feature, const String &version)
+{
+    if (!version.isEmpty() && version != "1.0")
+        return false;
+
     static bool initialized = false;
     DEFINE_STATIC_LOCAL(FeatureSet, svgFeatures, ());
@@ -92 +95 @@
         initialized = true;
     }
-    return svgFeatures.contains(feature);
-}
-
-static bool isSVG11Feature(const String &feature)
-{
+    return feature.startsWith("org.w3c.", false)
+        && svgFeatures.contains(feature.right(feature.length() - 8));
+}
+
+static bool isSVG11Feature(const String &feature, const String &version)
+{
+    if (!version.isEmpty() && version != "1.1")
+        return false;
+
     static bool initialized = false;
     DEFINE_STATIC_LOCAL(FeatureSet, svgFeatures, ());
@@ -157 +164 @@
         initialized = true;
     }
-    return svgFeatures.contains(feature);
-}
-#endif
+    return feature.startsWith("http://www.w3.org/tr/svg11/feature#", false)
+        && svgFeatures.contains(feature.right(feature.length() - 35));
+}
+#endif
+
+static bool isEvents2Feature(const String &feature, const String &version)
+{
+    if (!version.isEmpty() && version != "2.0")
+        return false;
+
+    static bool initialized = false;
+    DEFINE_STATIC_LOCAL(FeatureSet, events2Features, ());
+    if (!initialized) {
+        addString(events2Features, "Events");
+        addString(events2Features, "HTMLEvents");
+        addString(events2Features, "MouseEvents");
+        addString(events2Features, "MutationEvents");
+        addString(events2Features, "UIEvents");
+        initialized = true;
+    }
+    return events2Features.contains(feature);
+}
+
+static bool isEvents3Feature(const String &feature, const String &version)
+{
+    if (!version.isEmpty() && version != "3.0")
+        return false;
+
+    static bool initialized = false;
+    DEFINE_STATIC_LOCAL(FeatureSet, events3Features, ());
+    if (!initialized) {
+        // FIXME: We probably support many of these features.
+//        addString(events3Features, "CompositionEvents");
+//        addString(events3Features, "Events");
+//        addString(events3Features, "FocusEvents");
+//        addString(events3Features, "HTMLEvents");
+//        addString(events3Features, "KeyboardEvents");
+//        addString(events3Features, "MouseEvents");
+//        addString(events3Features, "MutationEvents");
+//        addString(events3Features, "MutationNameEvents");
+        addString(events3Features, "TextEvents");
+//        addString(events3Features, "UIEvents");
+//        addString(events3Features, "WheelEvents");
+        initialized = true;
+    }
+    // FIXME: We do not yet support Events 3 "extended feature strings".
+    return events3Features.contains(feature);
+}
 
 DOMImplementation::DOMImplementation(Document* document)
@@ -173 +225 @@
     if (lower == "css"
             || lower == "css2"
-            || lower == "events"
-            || lower == "htmlevents"
-            || lower == "mouseevents"
-            || lower == "mutationevents"
             || lower == "range"
             || lower == "stylesheets"
             || lower == "traversal"
-            || lower == "uievents"
             || lower == "views")
         return version.isEmpty() || version == "2.0";
-    if (lower == "xpath" || lower == "textevents")
+    if (isEvents2Feature(feature, version))
+        return true;
+    if (lower == "xpath")
         return version.isEmpty() || version == "3.0";
+    if (isEvents3Feature(feature, version))
+        return true;
 
 #if ENABLE(SVG)
-    if ((version.isEmpty() || version == "1.1") && feature.startsWith("http://www.w3.org/tr/svg11/feature#", false)) {
-        if (isSVG11Feature(feature.right(feature.length() - 35)))
-            return true;
-    }
-
-    if ((version.isEmpty() || version == "1.0") && feature.startsWith("org.w3c.", false)) {
-        if (isSVG10Feature(feature.right(feature.length() - 8)))
-            return true;
-    }
-#endif
-    
+    if (isSVG11Feature(feature, version))
+        return true;
+    if (isSVG10Feature(feature, version))
+        return true;
+#endif
+
     return false;
 }