source: webkit/trunk/Source/WebCore/css/CSSLineBoxContainValue.cpp

Last change on this file was 277967, checked in by Darin Adler, 4 years ago

Remove StringBuilder::appendLiteral
​https://bugs.webkit.org/show_bug.cgi?id=226137

Reviewed by Chris Dumez.

Source/JavaScriptCore:

  • API/tests/PingPongStackOverflowTest.cpp:

(PingPongStackOverflowObject_hasInstance): Use append instead of appendLiteral.

  • bindings/ScriptFunctionCall.cpp:

(Deprecated::ScriptCallArgumentHandler::appendArgument): Remove unnecessary cast
from const char* to String, which defeats optimization and has no benefit.

  • bytecompiler/NodesCodegen.cpp:

(JSC::ArrayPatternNode::toString const): Use append instead of appendLiteral.
(JSC::RestParameterNode::toString const): Ditto.

  • heap/HeapSnapshotBuilder.cpp:

(JSC::HeapSnapshotBuilder::json): Use append instead of appendLiteral.
Removed unnecesary use of appendQuotedJSONString to append the result of
snapshotTypeToString and edgeTypeToString, which return a const char* that
never contains characters that require special quoting consideration, so
can be appended efficiently with the normal append function.

  • inspector/agents/InspectorAuditAgent.cpp:

(Inspector::InspectorAuditAgent::run): Use makeString instead of StringBuilder.

  • inspector/agents/InspectorConsoleAgent.cpp: Use auto for the result of makeString.
  • jsc.cpp: Use appned instead of appendLiteral.
  • parser/ParserArena.cpp:

(JSC::IdentifierArena::makePrivateIdentifier): Use auto for the result of makeString.

  • runtime/ConsoleClient.cpp:

(JSC::ConsoleClient::printConsoleMessage): Use append instead of appendLiteral.
Also use variadic append when practical for better efficiency.
(JSC::ConsoleClient::printConsoleMessageWithArguments): Ditto.

  • runtime/DateConversion.cpp:

(JSC::formatDateTime): Ditto.

  • runtime/ErrorInstance.cpp:

(JSC::ErrorInstance::sanitizedToString): Use makeString instead of StringBuilder.

  • runtime/ExceptionHelpers.cpp:

(JSC::notAFunctionSourceAppender): Use append instead of appendLiteral.

  • runtime/IntlDateTimeFormat.cpp:

(JSC::IntlDateTimeFormat::initializeDateTimeFormat): Ditto.

  • runtime/IntlNumberFormat.cpp:

(JSC::IntlNumberFormat::initializeNumberFormat): Ditto.

  • runtime/JSCustomGetterFunction.cpp:

(JSC::JSCustomGetterFunction::create): Use auto and cut down on reference count
churn by using passing the StringImpl to makeString.

  • runtime/JSCustomSetterFunction.cpp:

(JSC::JSCustomSetterFunction::create): Ditto.

  • runtime/JSGlobalObjectFunctions.cpp: Use more const and use variadic

append for better efficiency.

  • runtime/JSONObject.cpp:

(JSC::Stringifier::appendStringifiedValue): Use append instead of appendLiteral.
(JSC::Stringifier::Holder::appendNextProperty): Ditto.

  • runtime/JSStringJoiner.h: Deleted unused appendLiteral function.

Unrelated to StringBuilder::appendLiteral, but dead code.

  • runtime/Options.cpp:

(JSC::Options::dumpOption): Use append instead of appendLiteral.

  • runtime/RegExpPrototype.cpp:

(JSC::appendLineTerminatorEscape<UChar>): Ditto.

  • runtime/SamplingProfiler.cpp:

(JSC::SamplingProfiler::reportTopFunctions): Use auto for the result of makeString.
(JSC::SamplingProfiler::reportTopBytecodes): Ditto.

  • runtime/TypeProfiler.cpp:

(JSC::TypeProfiler::typeInformationForExpressionAtOffset): Use append instead of
appendLiteral.

  • runtime/TypeSet.cpp:

(JSC::TypeSet::dumpTypes const): Use append instead of appendLiteral.
(JSC::TypeSet::toJSONString const): Ditto.
(JSC::StructureShape::propertyHash): Ditto.
(JSC::StructureShape::toJSONString const): Ditto.

Source/WebCore:

  • Modules/fetch/FetchBodyConsumer.cpp:

(WebCore::packageFormData): Use auto for the result of makeString.

  • Modules/indexeddb/IDBKeyData.cpp:

(WebCore::IDBKeyData::loggingString const): Use append instead
of appendLiteral.

  • Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:

(WebCore::IDBServer::SQLiteIDBBackingStore::addRecord): Use auto
for the result of makeString.

  • Modules/indexeddb/server/SQLiteIDBCursor.cpp:

(WebCore::IDBServer::buildPreIndexStatement): Use makeString
instead of StringBuilder.
(WebCore::IDBServer::buildIndexStatement): Ditto.
(WebCore::IDBServer::buildObjectStoreStatement): Ditto.

  • Modules/websockets/WebSocket.cpp:

(WebCore::encodeProtocolString): Use append instead of appendLiteral.

  • Modules/websockets/WebSocketExtensionDispatcher.cpp:

(WebCore::WebSocketExtensionDispatcher::appendAcceptedExtension): Ditto.

  • Modules/websockets/WebSocketHandshake.cpp:

(WebCore::WebSocketHandshake::clientHandshakeMessage const): Use
makeString instead of StringBuilder.
(WebCore::WebSocketHandshake::clientHandshakeRequest const): Tweak
to match the function above more closely, and use ASCIILiteral.

  • accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(formatForDebugger): Use makeString instead of StringBuilder.

  • contentextensions/CombinedURLFilters.cpp:

(WebCore::ContentExtensions::prefixTreeVertexToString): Use
append instead of appendLiteral.

  • css/CSSBasicShapes.cpp:

(WebCore::buildCircleString): Ditto.
(WebCore::buildEllipseString): Ditto.
(WebCore::buildPathString): Ditto.
(WebCore::buildPolygonString): Ditto.
(WebCore::buildInsetString): Ditto.

  • css/CSSGradientValue.cpp:

(WebCore::CSSLinearGradientValue::customCSSText const): Ditto.
(WebCore::CSSRadialGradientValue::customCSSText const): Ditto.
(WebCore::CSSConicGradientValue::customCSSText const): Ditto.

  • css/CSSGridIntegerRepeatValue.cpp:

(WebCore::CSSGridIntegerRepeatValue::customCSSText const):
Use makeString instead of StringBuilder.

  • css/CSSImageSetValue.cpp:

(WebCore::CSSImageSetValue::customCSSText const): Use append
instead of appendLiteral.

  • css/CSSImportRule.cpp:

(WebCore::CSSImportRule::cssText const): Use makeString instead
of StringBuilder.

  • css/CSSKeyframeRule.cpp:

(WebCore::StyleRuleKeyframe::cssText const): Ditto.

  • css/CSSKeyframesRule.cpp:

(WebCore::CSSKeyframesRule::cssText const): Use variadic append.

  • css/CSSLineBoxContainValue.cpp:

(WebCore::CSSLineBoxContainValue::customCSSText const): Use
append instead of appendLiteral.

  • css/CSSNamespaceRule.cpp:

(WebCore::CSSNamespaceRule::cssText const): Ditto.

  • css/CSSPageRule.cpp:

(WebCore::CSSPageRule::cssText const): Use makeString instead of
StringBuilder.

  • css/CSSPaintImageValue.cpp:

(WebCore::CSSPaintImageValue::customCSSText const): Ditto.

  • css/CSSPrimitiveValue.cpp:

(WebCore::CSSPrimitiveValue::formatNumberForCustomCSSText const):
Use append instead of appendLiteral.

  • css/CSSSelector.cpp:

(WebCore::appendLangArgumentList): Use variadic append.
(WebCore::CSSSelector::selectorText const): Ditto. Also use
append instead of appendLiteral and make some improvements to
cut down on allocations a little.

  • css/CSSSelectorList.cpp:

(WebCore::CSSSelectorList::buildSelectorsText const): Use
append instead of appendLiteral.

  • css/CSSStyleSheet.cpp:

(WebCore::CSSStyleSheet::CSSStyleSheet): Moved more of the
data member initialization to the class definition.
(WebCore::CSSStyleSheet::addRule): Use makeString instead of
StringBuilder.

  • css/CSSStyleSheet.h: Moved initialization here.
  • css/CSSTimingFunctionValue.cpp:

(WebCore::CSSStepsTimingFunctionValue::customCSSText const):
Use makeString instead of StringBuilder.
(WebCore::CSSSpringTimingFunctionValue::customCSSText const):
Ditto.

  • css/MediaList.cpp:

(WebCore::MediaQuerySet::mediaText const): Use append instead
of appendLiteral.

  • css/MediaQuery.cpp:

(WebCore::MediaQuery::serialize const): Ditto.

  • css/MediaQueryExpression.cpp:

(WebCore::MediaQueryExpression::serialize const): Use makeString
instead of StringBuilder.

  • css/StyleProperties.cpp:

(WebCore::StyleProperties::getLayeredShorthandValue const):
Use append instead of appendLiteral.

  • css/parser/CSSParserToken.cpp:

(WebCore::CSSParserToken::serialize const): Removed a lot of
unnecessary braces. Use variadic append and append instead of appendLiteral.

  • dom/Document.cpp:

(WebCore::Document::initSecurityContext): Use auto for the result
of makeString.

  • dom/Element.cpp:

(WebCore::appendAttributes): Use variadic append and append
instead of appendLiteral.

  • dom/SecurityContext.cpp:

(WebCore::SecurityContext::parseSandboxPolicy): Ditto.

  • editing/HTMLInterchange.cpp:

(WebCore::convertHTMLTextToInterchangeFormat): Ditto.

  • editing/TextIterator.cpp:

(WebCore::createSearcher): Use auto for the result of makeString.

  • editing/markup.cpp:

(WebCore::StyledMarkupAccumulator::appendStyleNodeOpenTag):
Use append instead of appendLiteral.
(WebCore::StyledMarkupAccumulator::appendStartTag): Ditto.
(WebCore::urlToMarkup): Ditto.

  • html/FormController.cpp:

(WebCore::recordFormStructure): Ditto.

  • html/HTMLFormControlElement.cpp:

(WebCore::HTMLFormControlElement::reportValidity): Use auto for
the result of makeString.

  • html/HTMLFormElement.cpp:

(WebCore::HTMLFormElement::validateInteractively): Ditto.

  • html/HTMLImageElement.cpp:

(WebCore::HTMLImageElement::completeURLsInAttributeValue const):
Use append insteaed of appendLiteral.

  • html/MediaElementSession.cpp:

(WebCore::restrictionNames): Use auto for the result of makeString.

  • html/canvas/WebGLRenderingContextBase.cpp:

(WebCore::WebGLRenderingContextBase::getUniformLocation): Ditto.

  • html/parser/HTMLTreeBuilder.cpp:

(WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::takeRemaining): Ditto.

  • html/parser/XSSAuditorDelegate.cpp:

(WebCore::buildConsoleError): Use makeString instead of StringBuilder.

  • html/track/TextTrackCue.cpp:

(WebCore::TextTrackCue::rebuildDisplayTree): Ditto.

  • inspector/InspectorFrontendAPIDispatcher.cpp:

(WebCore::expressionForEvaluatingCommand): Use append instead of appendLiteral.

  • inspector/InspectorOverlay.cpp:

(WebCore::InspectorOverlay::drawElementTitle): Use auto for the result of makeString.

  • inspector/InspectorStyleSheet.cpp:

(WebCore::InspectorStyleSheet::addRule): Use append instead of appendLiteral.

  • inspector/agents/InspectorApplicationCacheAgent.cpp:

(WebCore::InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource):
Use makeString instead of StringBuilder.

  • inspector/agents/WebConsoleAgent.cpp:

(WebCore::WebConsoleAgent::didReceiveResponse): Use auto for the result of makeString.
(WebCore::WebConsoleAgent::didFailLoading): Ditto.

  • loader/MixedContentChecker.cpp:

(WebCore::logWarning): Ditto
(WebCore::MixedContentChecker::checkFormForMixedContent): Ditto

  • loader/PrivateClickMeasurement.cpp:

(WebCore::makeValidURL): Added. Used for various cases below that all construct
URLs in the same way with the same kinds of checks. Use makeString here instead
of StringBuilder.
(WebCore::attributionReportURL): Call makeValidURL.
(WebCore::PrivateClickMeasurement::tokenSignatureURL const): Ditto.
(WebCore::PrivateClickMeasurement::tokenPublicKeyURL const): Ditto.

  • loader/ResourceLoadStatistics.cpp:

(WebCore::appendBoolean): Use append instead of appendLiteral.
(WebCore::appendHashSet): Ditto.
(WebCore::appendNavigatorAPIOptionSet): Ditto.
(WebCore::appendScreenAPIOptionSet): Ditto.
(WebCore::ResourceLoadStatistics::toString const): Ditto.

  • loader/WorkerThreadableLoader.cpp:

(WebCore::WorkerThreadableLoader::loadResourceSynchronously): Use auto for
the result of makeString.

  • page/DOMWindow.cpp:

(WebCore::DOMWindow::postMessage): Ditto.

  • page/Frame.cpp:

(WebCore::createRegExpForLabels): Use append instead of appendLiteral.
Also tweak coding style a bit.

  • page/FrameView.cpp:

(WebCore::FrameView::logMockScrollAnimatorMessage const): Use makeString
instead of StringBuilder.

  • page/PageSerializer.cpp:

(WebCore::PageSerializer::SerializerMarkupAccumulator::appendStartTag):
Use append instead of appendLiteral.
(WebCore::PageSerializer::serializeCSSStyleSheet): Ditto.
(WebCore::PageSerializer::urlForBlankFrame): Use auto for the result of
makeString.

  • page/PerformanceLoggingClient.cpp:

(WebCore::PerformanceLoggingClient::synchronousScrollingReasonsAsString):
Use makeString instead of StringBuilder.

  • page/cocoa/ResourceUsageOverlayCocoa.mm:

(WebCore::ResourceUsageOverlay::platformDraw): Use auto for the result of
makeString.

  • page/csp/ContentSecurityPolicy.cpp:

(WebCore::consoleMessageForViolation): Use makeString instsead of StringBuilder.
(WebCore::ContentSecurityPolicy::allowRunningOrDisplayingInsecureContent): Ditto.
(WebCore::ContentSecurityPolicy::reportInvalidDirectiveValueCharacter const):
Get rid of local variable for result of makeString.
(WebCore::ContentSecurityPolicy::reportInvalidPathCharacter const): Ditto.
(WebCore::ContentSecurityPolicy::reportInvalidSourceExpression const): Ditto.

  • page/csp/ContentSecurityPolicyDirectiveList.cpp:

(WebCore::ContentSecurityPolicyDirectiveList::create): Get rid of local
variable for result of makeString.

  • page/scrolling/ScrollingCoordinator.cpp:

(WebCore::ScrollingCoordinator::synchronousScrollingReasonsAsText):
Use makeString instead of StringBulder.

  • platform/Decimal.cpp:

(WebCore::Decimal::toString const): Use append instead of appendLiteral.

  • platform/animation/TimingFunction.cpp:

(WebCore::TimingFunction::createFromCSSText): Use makeString instead
of StringBuilder.

  • platform/audio/HRTFElevation.cpp:

(WebCore::HRTFElevation::calculateKernelsForAzimuthElevation): Use auto
for the result of makeString.

  • platform/glib/UserAgentGLib.cpp:

(WebCore::buildUserAgentString): Use append instead of appendLiteral.

  • platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:

(WebCore::InbandTextTrackPrivateAVF::processCueAttributes): Use
append instead of appendLiteral.

  • platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::recursiveCommitChanges): Got rid of local
variable for result of makeString.
(WebCore::GraphicsLayerCA::appendToUncommittedAnimations): Use auto
for result of makeString.

  • platform/graphics/ca/TileController.cpp:

(WebCore::TileController::tileRevalidationTimerFired): Update to
use OptionSet.

  • platform/graphics/ca/TileGrid.cpp:

(WebCore::validationPolicyAsString): Use OptionSet.
(WebCore::TileGrid::setNeedsDisplayInRect): Use auto for iterator
and range-based for loop.
(WebCore::TileGrid::updateTileLayerProperties): Ditto.
(WebCore::TileGrid::blankPixelCount const): Ditto.
(WebCore::TileGrid::removeTiles): Use HashCountedSet.
(WebCore::TileGrid::revalidateTiles): Use OptionSet.
(WebCore::TileGrid::retainedTileBackingStoreMemory const): Use
ranged-based for loop.
(WebCore::TileGrid::drawTileMapContents const): Use range-based
for loop and use writeIntegerToBuffer instead of String::number.
(WebCore::TileGrid::platformCALayerRepaintCount const): Use
HashCountedSet.
(WebCore::TileGrid::platformCALayerIncrementRepaintCount): Ditto.
This cuts us down from 3 hash table lookups to 1.
(WebCore::TileGrid::removeUnparentedTilesNow): Removed local
variable to make code a little tighter.

  • platform/graphics/ca/TileGrid.h: Use OptionSet and HashCountedSet.

Removed some type names.

  • platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm:

(WebCore::PlatformCAFilters::setFiltersOnLayer): Use auto for
reuslt of makeString.

  • platform/mock/MockRealtimeVideoSource.cpp:

(WebCore::MockRealtimeVideoSource::drawText): Ditto.

  • platform/mock/ScrollAnimatorMock.cpp:

(WebCore::ScrollAnimatorMock::scrollbarPrefix const): Added
helper function for use below.
(WebCore::ScrollAnimatorMock::mouseEnteredScrollbar const): Use
makeString instead of StringBuilder.
(WebCore::ScrollAnimatorMock::mouseExitedScrollbar const): Ditto.
(WebCore::ScrollAnimatorMock::mouseIsDownInScrollbar const): Ditto.

  • platform/mock/ScrollAnimatorMock.h: Ditto.
  • platform/network/ProxyServer.cpp:

(WebCore::appendProxyServerString): Use append instead of appendLiteral.
(WebCore::toString): Ditto.

  • platform/network/ResourceResponseBase.cpp:

(WebCore::ResourceResponseBase::sanitizeSuggestedFilename): Get rid
of local variable with result of maekString in it.

  • platform/playstation/UserAgentPlayStation.cpp:

(WebCore::platformForUAString): Deleted. No need for a global variable
to hold the result of something called only once.
(WebCore::platformVersionForUAString): Ditto.
(WebCore::buildUserAgentString): Deleted.
(WebCore::standardUserAgentStatic): Moved the logic from buildUserAgentString
here, using makeString instead of StringBuilder.

  • platform/sql/SQLiteDatabase.cpp:

(WebCore::SQLiteDatabase::open): Use auto for result of makeString.

  • platform/sql/SQLiteFileSystem.cpp:

(WebCore::SQLiteFileSystem::deleteDatabaseFile): Ditto.

  • platform/text/DateTimeFormat.cpp:

(WebCore::DateTimeFormat::quoteAndAppendLiteral): Use append instead
of appendLiteral and StringView::substring instead of String::substring.

  • platform/win/ClipboardUtilitiesWin.cpp:

(WebCore::replaceNewlinesWithWindowsStyleNewlines): Use append
instead of appendLiteral.

  • platform/win/UserAgentWin.cpp:

(WebCore::standardUserAgent): Use makeString instead of StringBuildeer.

  • rendering/RenderLayer.cpp:

(WebCore::RenderLayer::name const): Ditto.
(WebCore::RenderLayer::debugDescription const): Ditto.

  • rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::logLayerInfo): Use append instead of
appendLiteral.

  • rendering/RenderTreeAsText.cpp:

(WebCore::quoteAndEscapeNonPrintables): Ditto.
(WebCore::nodePosition): Ditto.

  • svg/SVGPathStringBuilder.cpp:

(WebCore::SVGPathStringBuilder::moveTo): Ditto.
(WebCore::SVGPathStringBuilder::lineTo): Ditto.
(WebCore::SVGPathStringBuilder::lineToHorizontal): Ditto.
(WebCore::SVGPathStringBuilder::lineToVertical): Ditto.
(WebCore::SVGPathStringBuilder::curveToCubic): Ditto.
(WebCore::SVGPathStringBuilder::curveToCubicSmooth): Ditto.
(WebCore::SVGPathStringBuilder::curveToQuadratic): Ditto.
(WebCore::SVGPathStringBuilder::curveToQuadraticSmooth): Ditto.
(WebCore::SVGPathStringBuilder::arcTo): Ditto.
(WebCore::SVGPathStringBuilder::closePath): Ditto.

  • testing/Internals.cpp:

(WebCore::Internals::dumpMarkerRects): Ditto.
(WebCore::appendOffsets):
(WebCore::Internals::scrollSnapOffsets): Ditto.

  • workers/WorkerScriptLoader.cpp:

(WebCore::WorkerScriptLoader::validateWorkerResponse): Use auto
for reuslt of makeString.

Source/WebKit:

  • NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:

(WebKit::ResourceLoadStatisticsDatabaseStore::ensureAndMakeDomainList): Use append
instead of appendLiteral.
(WebKit::domainsToString): Ditto.
(WebKit::buildList): Ditto.
(WebKit::ResourceLoadStatisticsDatabaseStore::findNotVeryPrevalentResources): Ditto.
(WebKit::ResourceLoadStatisticsDatabaseStore::dumpResourceLoadStatistics): Ditto.
(WebKit::appendBoolean): Ditto.
(WebKit::appendNextEntry): Ditto.
(WebKit::ResourceLoadStatisticsDatabaseStore::appendSubStatisticList const): Ditto.
(WebKit::ResourceLoadStatisticsDatabaseStore::resourceToString const): Ditto.
(WebKit::ResourceLoadStatisticsDatabaseStore::attributionToString): Ditto.
(WebKit::ResourceLoadStatisticsDatabaseStore::privateClickMeasurementToString): Ditto.

  • NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:

(WebKit::ResourceLoadStatisticsMemoryStore::dumpResourceLoadStatistics): Ditto.

  • NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp: Ditto.

(WebKit::domainsToString): Ditto.

  • NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:

(WebKit::WebResourceLoadStatisticsStore::create): Moved this here from the header.
(WebKit::WebResourceLoadStatisticsStore::ThirdPartyDataForSpecificFirstParty::toString const): Ditto.
(WebKit::WebResourceLoadStatisticsStore::ThirdPartyDataForSpecificFirstParty::encode const): Ditto.
(WebKit::WebResourceLoadStatisticsStore::ThirdPartyDataForSpecificFirstParty::decode): Ditto.
(WebKit::WebResourceLoadStatisticsStore::ThirdPartyDataForSpecificFirstParty::operator== const): Ditto.
(WebKit::WebResourceLoadStatisticsStore::ThirdPartyData::toString const): Ditto.
(WebKit::WebResourceLoadStatisticsStore::ThirdPartyData::encode const): Ditto.
(WebKit::WebResourceLoadStatisticsStore::ThirdPartyData::decode): Ditto.
(WebKit::WebResourceLoadStatisticsStore::ThirdPartyData::operator< const): Ditto.

  • NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h: Moved member

functions of the nested structures into the implementation file and fixed
the indentation of the structures to indicate the nesting.

  • NetworkProcess/NetworkLoadChecker.cpp:

(WebKit::NetworkLoadChecker::continueCheckingRequest): Do not use a local
variable for the reuslt of makeString.

  • NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::newTestingSession): Ditto.

  • NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::Cache::dumpContentsToFile): Use append instead of appendLiteral

  • NetworkProcess/cache/NetworkCacheEntry.cpp:

(WebKit::NetworkCache::Entry::asJSON const): Ditto.

  • NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::makeVersionedDirectoryPath): Do not use a local variable for
the result of makeString.

  • NetworkProcess/soup/NetworkProcessSoup.cpp:

(WebKit::buildAcceptLanguages): Use append instead of appendLiteral.

  • NetworkProcess/soup/WebSocketTaskSoup.cpp:

(WebKit::WebSocketTask::acceptedExtensions const): Ditto.

  • NetworkProcess/webrtc/NetworkMDNSRegister.cpp:

(WebKit::NetworkMDNSRegister::registerMDNSName): Use auto for the result of makeString.

  • Shared/WebMemorySampler.cpp:

(WebKit::WebMemorySampler::writeHeaders): Ditto.

  • Shared/mac/AuxiliaryProcessMac.mm:

(WebKit::initializeSandboxParameters): Do not use a local variable for the result of
makeString. Also, take advantage of the support for concatenating an NSString instead
of converting it to a WTF::String.

  • Shared/mac/WebMemorySampler.mac.mm:

(WebKit::WebMemorySampler::sampleWebKit const): Use ASCIILiteral and remove explicit
conversion to String.

  • UIProcess/API/glib/WebKitWebView.cpp:

(webkitWebViewRunJavaScriptCallback): Use append instead of appendLiteral.

  • UIProcess/Automation/WebAutomationSession.cpp:

(WebKit::fileCanBeAcceptedForUpload): Use auto for result of makeString.

  • WebProcess/InjectedBundle/API/glib/WebKitWebPage.cpp: Use makeString instead of

StringBuilder.

  • UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::requestStorageSpace): Use auto for result of makeString.

  • UIProcess/WebBackForwardList.cpp:

(WebKit::WebBackForwardList::loggingString): Use append instead of appendLiteral.

  • UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::processDidFinishLaunching): Use auto for result of makeString.
(WebKit::WebProcessPool::startMemorySampler): Ditto.

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::dumpHistoryItem): Use append instead of appendLiteral.
(WebKit::WebPage::getContentsAsString): Ditto.

Source/WebKitLegacy:

  • WebCoreSupport/NetworkStorageSessionMap.cpp:

(NetworkStorageSessionMap::switchToNewTestingSession): Do not use local
for return value of makeString.

Source/WebKitLegacy/mac:

  • WebView/WebHTMLRepresentation.mm:

(regExpForLabels): Use append instead of appendLiteral.
Also imrpove local variable names a bit.

Source/WebKitLegacy/win:

  • AccessibleBase.cpp:

(AccessibleBase::get_accKeyboardShortcut): Use append instead of appnedLiteral.

  • WebView.cpp: Ditto.

Source/WTF:

The optimization done by appendLiteral has minimal value and is something we
can do without. It does not cut down the number of allocations, which is the
main cost of the StringBuilder class. Getting rid of the differently named
appendLiteral improves the design of the StringBuilder class for callers.
Our goal is to get as close as possible to a single append function.

If we decide we need an optimization for literals, we can come up with a
different way that is compatible with append. For example, we could assume
that any char array is a literal and check that at compile time in
StringConcatenate; that optimization would work for both makeString and
StringBuilder. Or we could use a strategy like ASCIILiteral.

  • wtf/FileSystem.cpp:

(WTF::FileSystemImpl::encodeForFileName): Streamline logic,
and use variadic append to make this more efficient.

  • wtf/JSONValues.cpp:

(WTF::JSONImpl::Value::escapeString): Use append instead
of appendLiteral.
(WTF::JSONImpl::Value::writeJSON const): Ditto.

  • wtf/Logger.h:

(WTF::Logger::log): Use auto for result of makeString.
(WTF::Logger::logVerbose): Ditto.

  • wtf/MediaTime.cpp:

(WTF::MediaTime::toString const): Use makeString instead of StringBuilder.

  • wtf/text/IntegerToStringConversion.h:

Made lengthOfIntegerAsString a constexpr function so we can use it to
compute the required size of arrays for conversion. Added using for both
lengthOfIntegerAsString and writeIntegerToBuffer so we can use them without
the WTF prefix as is customary for functions in WTF.

  • wtf/text/StringBuilder.h:

(WTF::StringBuilder::appendLiteral): Deleted.

  • wtf/text/StringConcatenate.h: Added support for appending StringImpl&,

StringImpl*, AtomStringImpl&, and AtomStringImpl*.

Tools:

  • TestWebKitAPI/Tests/WTF/StringBuilder.cpp:

Use append instead of appendLiteral.

  • TestWebKitAPI/Tests/WebCore/FileMonitor.cpp:

(TestWebKitAPI::createCommand): Use makeString instead of StringBuilder.

  • TestWebKitAPI/Tests/WebCore/Logging.cpp:

(TestWebKitAPI::TEST_F): Made lots of fixes to code inside #if TEST_OUTPUT,
which hasn't compiled in a long time. Still not 100% there, but closer.

  • TestWebKitAPI/Tests/WebCore/TextCodec.cpp:

(TestWebKitAPI::testDecode): Use append instead of appendLiteral.

  • WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:

(WTR::AccessibilityUIElement::helpText const): Ditto.
  • Property svn:eol-style set to native
File size: 2.4 KB
Line 
1/*
2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include "config.h"
27#include "CSSLineBoxContainValue.h"
28
29#include <wtf/text/StringBuilder.h>
30
31namespace WebCore {
32
33CSSLineBoxContainValue::CSSLineBoxContainValue(OptionSet<LineBoxContain> value)
34 : CSSValue(LineBoxContainClass)
35 , m_value(value)
36{
37}
38
39String CSSLineBoxContainValue::customCSSText() const
40{
41 StringBuilder text;
42 if (m_value.contains(LineBoxContain::Block))
43 text.append("block");
44 if (m_value.contains(LineBoxContain::Inline))
45 text.append(text.isEmpty() ? "" : " ", "inline");
46 if (m_value.contains(LineBoxContain::Font))
47 text.append(text.isEmpty() ? "" : " ", "font");
48 if (m_value.contains(LineBoxContain::Glyphs))
49 text.append(text.isEmpty() ? "" : " ", "glyphs");
50 if (m_value.contains(LineBoxContain::Replaced))
51 text.append(text.isEmpty() ? "" : " ", "replaced");
52 if (m_value.contains(LineBoxContain::InlineBox))
53 text.append(text.isEmpty() ? "" : " ", "inline-box");
54 if (m_value.contains(LineBoxContain::InitialLetter))
55 text.append(text.isEmpty() ? "" : " ", "initial-letter");
56 return text.toString();
57}
58
59}
Note: See TracBrowser for help on using the repository browser.