Changeset 278185 in webkit for trunk/Source/WebCore/rendering/RenderButton.cpp

Timestamp:

May 27, 2021, 6:26:23 PM (4 years ago)

Author:

Darin Adler

Message:

Next step toward using std::optional directly instead of through WTF::Optional typedef
​https://bugs.webkit.org/show_bug.cgi?id=226280

Reviewed by Chris Dumez.

Source/JavaScriptCore:

• <many files>: Accept the renaming done by do-webcore-rename.

• yarr/YarrSyntaxChecker.cpp: Since the style checker complained about this file,

tweaked style to make it happy after the renaming done by do-webcore-rename, and
also hand-updated Optional to std::optional as long as we were touching it.

Source/WebCore:

• <many files>: Accept the renaming done by do-webcore-rename.

• Modules/webauthn/fido/DeviceRequestConverter.h: Since style checker complained

about the names of some arguments, fixed them, and also hand-updated Optional to
std::optional as long as we were touching it.

• loader/EmptyClients.cpp: Since style checker complained about the mix of

WEBCORE_EXPORT and inlined functions, moved them out of line, and
also hand-updated Optional to std::optional as long as we were touching it.
Also removed is<EmptyFrameLoaderClient>().

• loader/EmptyFrameLoaderClient.h: Ditto.

Source/WebCore/PAL:

• <many files>: Accept the renaming done by do-webcore-rename.

Source/WebDriver:

• <many files>: Accept the renaming done by do-webcore-rename.

Source/WebKit:

• <many files>: Accept the renaming done by do-webcore-rename.

Source/WebKitLegacy:

• Storage/StorageTracker.cpp:

(WebKit::StorageTracker::diskUsageForOrigin): Accept the renaming done by do-webcore-rename.

Source/WebKitLegacy/mac:

• <many files>: Accept the renaming done by do-webcore-rename.

Source/WebKitLegacy/win:

• <many files>: Accept the renaming done by do-webcore-rename.

Source/WTF:

• <many files>: Accept the renaming done by do-webcore-rename.

• wtf/Optional.h: Remove WTF::nullopt_t and WTF::makeOptional.

• wtf/URLHelpers.cpp:

(WTF::URLHelpers::mapHostName): Convert from nullopt to std::nullopt.

Tools:

• Scripts/do-webcore-rename: Use script to rename valueOr, WTF::nullopt, WTF::nullopt_t,

WTF::Optional, WTF::makeOptional, and makeOptional. Other renamings can't necessarily
be done by the script and so will be done in later passes.

• <many files>: Accept the renaming done by do-webcore-rename.

File:

• trunk/Source/WebCore/rendering/RenderButton.cpp (modified) (1 diff)

trunk/Source/WebCore/rendering/RenderButton.cpp

@@ -155 +155 @@
     // We cannot rely on RenderFlexibleBox::baselinePosition() because of flexboxes have some special behavior
     // regarding baselines that shouldn't apply to buttons.
-    LayoutUnit baseline = firstLineBaseline().valueOr(synthesizedBaselineFromContentBox(*this, direction));
+    LayoutUnit baseline = firstLineBaseline().value_or(synthesizedBaselineFromContentBox(*this, direction));
     LayoutUnit marginAscent = direction == HorizontalLine ? marginTop() : marginRight();
     return baseline + marginAscent;