Changeset 239289 in webkit

Timestamp:

Dec 17, 2018 1:47:53 PM (5 years ago)

Author:

dbates@webkit.org

Message:

Make DocumentMarker::allMarkers() constexpr
​https://bugs.webkit.org/show_bug.cgi?id=192634

Reviewed by Simon Fraser.

The result of DocumentMarker::allMarkers() can be computed at compile time. We should annotate
it constexpr to do just that.

• dom/DocumentMarker.h:

(WebCore::DocumentMarker::allMarkers):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/DocumentMarker.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-17  Daniel Bates  <dabates@apple.com>
+
+        Make DocumentMarker::allMarkers() constexpr
+        https://bugs.webkit.org/show_bug.cgi?id=192634
+
+        Reviewed by Simon Fraser.
+
+        The result of DocumentMarker::allMarkers() can be computed at compile time. We should annotate
+        it constexpr to do just that.
+
+        * dom/DocumentMarker.h:
+        (WebCore::DocumentMarker::allMarkers):
+
 2018-12-17  Justin Fan  <justin_fan@apple.com>
 

trunk/Source/WebCore/dom/DocumentMarker.h

@@ -83 +83 @@
     };
 
-    static OptionSet<MarkerType> allMarkers();
+    static constexpr OptionSet<MarkerType> allMarkers();
 
     using IsActiveMatchData = bool;
@@ -142 +142 @@
 };
 
-inline auto DocumentMarker::allMarkers() -> OptionSet<MarkerType>
-{
-    OptionSet<MarkerType> markers {
+constexpr auto DocumentMarker::allMarkers() -> OptionSet<MarkerType>
+{
+    return {
         AcceptedCandidate,
         Autocorrected,
@@ -165 +165 @@
 #endif
     };
-    return markers;
 }