Changeset 278253 in webkit for trunk/Source/JavaScriptCore/debugger/Debugger.cpp

Timestamp:

May 30, 2021, 9:11:40 AM (4 years ago)

Author:

Darin Adler

Message:

Remove WTF::Optional synonym for std::optional, using that class template directly instead
​https://bugs.webkit.org/show_bug.cgi?id=226433

Reviewed by Chris Dumez.

Source/JavaScriptCore:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

• inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:

(ObjCProtocolTypesImplementationGenerator._generate_init_method_for_payload): Use auto instead
of Optional<>. Also use * instead of value() and nest the definition of the local inside an if
statement in the case where it's an optional.

• inspector/scripts/tests/expected/*: Regenerated these results.

Source/WebCore:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

Source/WebCore/PAL:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

Source/WebDriver:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

Source/WebKit:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

• Scripts/webkit/tests: Regenerated expected results, by running the command "python

Scripts/webkit/messages_unittest.py -r". (How am I supposed to know to do that?)

Source/WebKitLegacy/ios:

• WebCoreSupport/WebChromeClientIOS.h: Let the do-webcore-rename script rename

Optional<> to std::optional<>.

Source/WebKitLegacy/mac:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

Source/WebKitLegacy/win:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

Source/WTF:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

• wtf/Optional.h: Remove WTF::Optional.

Tools:

• <many files>: Let the do-webcore-rename script rename Optional<> to std::optional<>.

File:

• trunk/Source/JavaScriptCore/debugger/Debugger.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/debugger/Debugger.cpp

@@ -363 +363 @@
     // and CodeBlock line and column values are one-based.
     unsigned line = breakpoint.lineNumber() + 1;
-    Optional<unsigned> column;
+    std::optional<unsigned> column;
     if (breakpoint.columnNumber())
         column = breakpoint.columnNumber() + 1;
@@ -458 +458 @@
 
     DebuggerParseData& parseData = debuggerParseData(breakpoint.sourceID(), sourceProvider);
-    Optional<JSTextPosition> resolvedPosition = parseData.pausePositions.breakpointLocationForLineColumn(line, column);
+    std::optional<JSTextPosition> resolvedPosition = parseData.pausePositions.breakpointLocationForLineColumn(line, column);
     if (!resolvedPosition)
         return false;
@@ -1204 +1204 @@
 }
 
-void Debugger::setBlackboxType(SourceID sourceID, Optional<BlackboxType> type)
+void Debugger::setBlackboxType(SourceID sourceID, std::optional<BlackboxType> type)
 {
     if (type)