Changeset 126967 in webkit
- Timestamp:
- Aug 29, 2012 12:32:31 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r126966 r126967 1 2012-08-28 Adam Barth <abarth@webkit.org> 2 3 Deploy ASCIILiteral and StringBuilder in more places in WebCore 4 https://bugs.webkit.org/show_bug.cgi?id=95291 5 6 Reviewed by Benjamin Poulain. 7 8 I wanted to deploy ASCIILiteral in more places in WebCore, but there's 9 a bunch of code that should be using StringBuilder, which I couldn't 10 resist deploying as well. 11 12 * Modules/mediastream/PeerConnection00.cpp: 13 (WebCore::PeerConnection00::createIceOptions): 14 * bindings/js/JSBlobCustom.cpp: 15 (WebCore::JSBlobConstructor::constructJSBlob): 16 * bindings/v8/V8LazyEventListener.cpp: 17 (WebCore::V8LazyEventListener::prepareListenerObject): 18 * bindings/v8/custom/V8BlobCustom.cpp: 19 (WebCore::V8Blob::constructorCallback): 20 * css/CSSCanvasValue.cpp: 21 (WebCore::CSSCanvasValue::customCssText): 22 * css/CSSCrossfadeValue.cpp: 23 (WebCore::CSSCrossfadeValue::customCssText): 24 * css/CSSPageRule.cpp: 25 (WebCore::CSSPageRule::selectorText): 26 * css/CSSSelector.cpp: 27 (WebCore::CSSSelector::selectorText): 28 * editing/EditorCommand.cpp: 29 (WebCore::executeToggleStyleInList): 30 * editing/SmartReplaceICU.cpp: 31 (WebCore::getSmartSet): 32 * editing/markup.cpp: 33 (WebCore::fillContainerFromString): 34 * html/HTMLTitleElement.cpp: 35 (WebCore::HTMLTitleElement::text): 36 * inspector/InspectorConsoleAgent.cpp: 37 (WebCore::InspectorConsoleAgent::didFailLoading): 38 * page/EventSource.cpp: 39 (WebCore::EventSource::didReceiveResponse): 40 * platform/blackberry/LocalizedStringsBlackBerry.cpp: 41 (WebCore::platformLanguage): 42 * platform/graphics/GraphicsLayer.cpp: 43 (WebCore::GraphicsLayer::animationNameForTransition): 44 * platform/network/blackberry/rss/RSSAtomParser.cpp: 45 (WebCore::RSSAtomParser::parseContent): 46 * platform/sql/SQLiteDatabase.cpp: 47 (WebCore::SQLiteDatabase::open): 48 (WebCore::SQLiteDatabase::setFullsync): 49 (WebCore::SQLiteDatabase::maximumSize): 50 (WebCore::SQLiteDatabase::pageSize): 51 (WebCore::SQLiteDatabase::freeSpaceSize): 52 (WebCore::SQLiteDatabase::totalSize): 53 (WebCore::SQLiteDatabase::tableExists): 54 (WebCore::SQLiteDatabase::clearAllTables): 55 (WebCore::SQLiteDatabase::runVacuumCommand): 56 (WebCore::SQLiteDatabase::runIncrementalVacuumCommand): 57 (WebCore::SQLiteDatabase::turnOnIncrementalAutoVacuum): 58 * platform/win/FileSystemWin.cpp: 59 (WebCore::bundleName): 60 (WebCore::storageDirectory): 61 * plugins/PluginStream.cpp: 62 (WebCore::PluginStream::startStream): 63 * rendering/RenderMenuList.cpp: 64 (WebCore::RenderMenuList::setTextFromOption): 65 1 66 2012-08-29 Yoshifumi Inoue <yosin@chromium.org> 2 67 -
trunk/Source/WebCore/Modules/mediastream/PeerConnection00.cpp
r118586 r126967 230 230 PassRefPtr<IceOptions> PeerConnection00::createIceOptions(const Dictionary& dictionary, ExceptionCode& ec) 231 231 { 232 String useCandidates = "";232 String useCandidates = emptyString(); 233 233 dictionary.get("use_candidates", useCandidates); 234 234 -
trunk/Source/WebCore/bindings/js/JSBlobCustom.cpp
r125386 r126967 77 77 78 78 String type; 79 String endings = "transparent";79 String endings = ASCIILiteral("transparent"); 80 80 81 81 if (exec->argumentCount() > 1) { -
trunk/Source/WebCore/bindings/v8/V8LazyEventListener.cpp
r126399 r126967 146 146 // By calling the function with 4 arguments, we create a setter on arguments object 147 147 // which would shadow property "3" on the prototype. 148 String code = "(function() {" \148 String code = ASCIILiteral("(function() {" \ 149 149 "with (this[2]) {" \ 150 150 "with (this[1]) {" \ 151 "with (this[0]) {" ;151 "with (this[0]) {"); 152 152 code.append("return function("); 153 153 code.append(m_eventParameterName); … … 220 220 toStringFunction = toStringTemplate->GetFunction(); 221 221 if (!toStringFunction.IsEmpty()) { 222 String toStringResult = "function ";222 String toStringResult = ASCIILiteral("function "); 223 223 toStringResult.append(m_functionName); 224 224 toStringResult.append("("); -
trunk/Source/WebCore/bindings/v8/custom/V8BlobCustom.cpp
r126399 r126967 80 80 81 81 String type; 82 String endings = "transparent";82 String endings = ASCIILiteral("transparent"); 83 83 84 84 if (args.Length() > 1) { -
trunk/Source/WebCore/css/CSSCanvasValue.cpp
r126926 r126967 30 30 #include "MemoryInstrumentation.h" 31 31 #include "RenderObject.h" 32 #include <wtf/text/StringBuilder.h> 32 33 33 34 namespace WebCore { … … 41 42 String CSSCanvasValue::customCssText() const 42 43 { 43 String result = "-webkit-canvas("; 44 result += m_name + ")"; 45 return result; 44 StringBuilder result; 45 result.appendLiteral("-webkit-canvas("); 46 result.append(m_name); 47 result.append(')'); 48 return result.toString(); 46 49 } 47 50 -
trunk/Source/WebCore/css/CSSCrossfadeValue.cpp
r126926 r126967 36 36 #include "StyleCachedImage.h" 37 37 #include "StyleGeneratedImage.h" 38 #include <wtf/text/StringBuilder.h> 38 39 39 40 namespace WebCore { … … 86 87 String CSSCrossfadeValue::customCssText() const 87 88 { 88 String result = "-webkit-cross-fade("; 89 result += m_fromValue->cssText() + ", "; 90 result += m_toValue->cssText() + ", "; 91 result += m_percentageValue->cssText(); 92 result += ")"; 93 return result; 89 StringBuilder result; 90 result.appendLiteral("-webkit-cross-fade("); 91 result.append(m_fromValue->cssText()); 92 result.appendLiteral(", "); 93 result.append(m_toValue->cssText()); 94 result.appendLiteral(", "); 95 result.append(m_percentageValue->cssText()); 96 result.append(')'); 97 return result.toString(); 94 98 } 95 99 -
trunk/Source/WebCore/css/CSSPageRule.cpp
r126656 r126967 56 56 String CSSPageRule::selectorText() const 57 57 { 58 String text = "@page"; 58 StringBuilder text; 59 text.appendLiteral("@page"); 59 60 const CSSSelector* selector = m_pageRule->selector(); 60 61 if (selector) { 61 62 String pageSpecification = selector->selectorText(); 62 if (!pageSpecification.isEmpty() && pageSpecification != starAtom) 63 text += " " + pageSpecification; 63 if (!pageSpecification.isEmpty() && pageSpecification != starAtom) { 64 text.append(' '); 65 text.append(pageSpecification); 66 } 64 67 } 65 return text ;68 return text.toString(); 66 69 } 67 70 -
trunk/Source/WebCore/css/CSSSelector.cpp
r126926 r126967 34 34 #include <wtf/StdLibExtras.h> 35 35 #include <wtf/Vector.h> 36 #include <wtf/text/StringBuilder.h> 36 37 37 38 namespace WebCore { … … 516 517 String CSSSelector::selectorText() const 517 518 { 518 String str = "";519 StringBuilder str; 519 520 520 521 const AtomicString& prefix = m_tag.prefix(); … … 522 523 if (m_match == CSSSelector::None || !prefix.isNull() || localName != starAtom) { 523 524 if (prefix.isNull()) 524 str = localName;525 str.append(localName); 525 526 else { 526 str = prefix.string();527 str.append( "|");527 str.append(prefix.string()); 528 str.append('|'); 528 529 str.append(localName); 529 530 } … … 533 534 while (true) { 534 535 if (cs->m_match == CSSSelector::Id) { 535 str += "#";536 str.append('#'); 536 537 serializeIdentifier(cs->value(), str); 537 538 } else if (cs->m_match == CSSSelector::Class) { 538 str += ".";539 str.append('.'); 539 540 serializeIdentifier(cs->value(), str); 540 541 } else if (cs->m_match == CSSSelector::PseudoClass || cs->m_match == CSSSelector::PagePseudoClass) { 541 str += ":";542 str += cs->value();542 str.append(':'); 543 str.append(cs->value()); 543 544 544 545 switch (cs->pseudoType()) { 545 546 case PseudoNot: 546 547 if (CSSSelectorList* selectorList = cs->selectorList()) 547 str += selectorList->first()->selectorText();548 str += ")";548 str.append(selectorList->first()->selectorText()); 549 str.append(')'); 549 550 break; 550 551 case PseudoLang: … … 553 554 case PseudoNthOfType: 554 555 case PseudoNthLastOfType: 555 str += cs->argument();556 str += ")";556 str.append(cs->argument()); 557 str.append(')'); 557 558 break; 558 559 case PseudoAny: { … … 560 561 for (CSSSelector* subSelector = firstSubSelector; subSelector; subSelector = CSSSelectorList::next(subSelector)) { 561 562 if (subSelector != firstSubSelector) 562 str += ",";563 str += subSelector->selectorText();563 str.append(','); 564 str.append(subSelector->selectorText()); 564 565 } 565 str += ")";566 str.append(')'); 566 567 break; 567 568 } … … 570 571 } 571 572 } else if (cs->m_match == CSSSelector::PseudoElement) { 572 str += "::";573 str += cs->value();573 str.appendLiteral("::"); 574 str.append(cs->value()); 574 575 } else if (cs->isAttributeSelector()) { 575 str += "[";576 str.append('['); 576 577 const AtomicString& prefix = cs->attribute().prefix(); 577 578 if (!prefix.isNull()) { … … 579 580 str.append("|"); 580 581 } 581 str += cs->attribute().localName();582 str.append(cs->attribute().localName()); 582 583 switch (cs->m_match) { 583 584 case CSSSelector::Exact: 584 str += "=";585 str.append('='); 585 586 break; 586 587 case CSSSelector::Set: 587 588 // set has no operator or value, just the attrName 588 str += "]";589 str.append(']'); 589 590 break; 590 591 case CSSSelector::List: 591 str += "~=";592 str.appendLiteral("~="); 592 593 break; 593 594 case CSSSelector::Hyphen: 594 str += "|=";595 str.appendLiteral("|="); 595 596 break; 596 597 case CSSSelector::Begin: 597 str += "^=";598 str.appendLiteral("^="); 598 599 break; 599 600 case CSSSelector::End: 600 str += "$=";601 str.appendLiteral("$="); 601 602 break; 602 603 case CSSSelector::Contain: 603 str += "*=";604 str.appendLiteral("*="); 604 605 break; 605 606 default: … … 608 609 if (cs->m_match != CSSSelector::Set) { 609 610 serializeString(cs->value(), str); 610 str += "]";611 str.append(']'); 611 612 } 612 613 } … … 619 620 String tagHistoryText = tagHistory->selectorText(); 620 621 if (cs->relation() == CSSSelector::DirectAdjacent) 621 str = tagHistoryText + " + " + str;622 return tagHistoryText + " + " + str.toString(); 622 623 else if (cs->relation() == CSSSelector::IndirectAdjacent) 623 str = tagHistoryText + " ~ " + str;624 return tagHistoryText + " ~ " + str.toString(); 624 625 else if (cs->relation() == CSSSelector::Child) 625 str = tagHistoryText + " > " + str;626 return tagHistoryText + " > " + str.toString(); 626 627 else if (cs->relation() == CSSSelector::ShadowDescendant) 627 str = tagHistoryText + str;628 else 628 return tagHistoryText + str.toString(); 629 else { 629 630 // Descendant 630 str = tagHistoryText + " " + str; 631 } 632 633 return str; 631 return tagHistoryText + " " + str.toString(); 632 } 633 } 634 635 return str.toString(); 634 636 } 635 637 -
trunk/Source/WebCore/editing/EditorCommand.cpp
r124586 r126967 140 140 141 141 RefPtr<CSSValue> selectedCSSValue = selectionStyle->style()->getPropertyCSSValue(propertyID); 142 String newStyle = "none";142 String newStyle = ASCIILiteral("none"); 143 143 if (selectedCSSValue->isValueList()) { 144 144 RefPtr<CSSValueList> selectedCSSValueList = static_cast<CSSValueList*>(selectedCSSValue.get()); -
trunk/Source/WebCore/editing/SmartReplaceICU.cpp
r95901 r126967 55 55 // Whitespace and newline (kCFCharacterSetWhitespaceAndNewline) 56 56 UErrorCode ec = U_ZERO_ERROR; 57 String whitespaceAndNewline = "[[:WSpace:] [\\u000A\\u000B\\u000C\\u000D\\u0085]]";57 String whitespaceAndNewline = ASCIILiteral("[[:WSpace:] [\\u000A\\u000B\\u000C\\u000D\\u0085]]"); 58 58 smartSet = uset_openPattern(whitespaceAndNewline.characters(), whitespaceAndNewline.length(), &ec); 59 59 ASSERT(U_SUCCESS(ec)); … … 72 72 73 73 if (isPreviousCharacter) { 74 addAllCodePoints(smartSet, "([\"\'#$/-`{");74 addAllCodePoints(smartSet, ASCIILiteral("([\"\'#$/-`{")); 75 75 preSmartSet = smartSet; 76 76 } else { 77 addAllCodePoints(smartSet, ")].,;:?\'!\"%*-/}");77 addAllCodePoints(smartSet, ASCIILiteral(")].,;:?\'!\"%*-/}")); 78 78 79 79 // Punctuation (kCFCharacterSetPunctuation) 80 80 UErrorCode ec = U_ZERO_ERROR; 81 String punctuationClass = "[:P:]";81 String punctuationClass = ASCIILiteral("[:P:]"); 82 82 USet* icuPunct = uset_openPattern(punctuationClass.characters(), punctuationClass.length(), &ec); 83 83 ASSERT(U_SUCCESS(ec)); -
trunk/Source/WebCore/editing/markup.cpp
r123788 r126967 795 795 Vector<String> tabList; 796 796 string.split('\t', true, tabList); 797 String tabText = "";797 String tabText = emptyString(); 798 798 bool first = true; 799 799 size_t numEntries = tabList.size(); … … 806 806 paragraph->appendChild(createTabSpanElement(document, tabText), ec); 807 807 ASSERT(!ec); 808 tabText = "";808 tabText = emptyString(); 809 809 } 810 810 RefPtr<Node> textNode = document->createTextNode(stringWithRebalancedWhitespace(s, first, i + 1 == numEntries)); -
trunk/Source/WebCore/html/HTMLTitleElement.cpp
r126359 r126967 30 30 #include "StyleInheritedData.h" 31 31 #include "Text.h" 32 #include <wtf/text/StringBuilder.h> 32 33 33 34 namespace WebCore { … … 71 72 String HTMLTitleElement::text() const 72 73 { 73 String val = "";74 74 StringBuilder result; 75 75 76 for (Node *n = firstChild(); n; n = n->nextSibling()) { 76 77 if (n->isTextNode()) 77 val += toText(n)->data();78 result.append(toText(n)->data()); 78 79 } 79 80 80 return val;81 return result.toString(); 81 82 } 82 83 -
trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp
r126926 r126967 250 250 if (error.isCancellation()) // Report failures only. 251 251 return; 252 String message = "Failed to load resource";252 String message = ASCIILiteral("Failed to load resource"); 253 253 if (!error.localizedDescription().isEmpty()) 254 254 message += ": " + error.localizedDescription(); -
trunk/Source/WebCore/page/EventSource.cpp
r121195 r126967 52 52 #include "TextResourceDecoder.h" 53 53 #include "ThreadableLoader.h" 54 #include <wtf/text/StringBuilder.h> 54 55 55 56 namespace WebCore { … … 211 212 responseIsValid = charset.isEmpty() || equalIgnoringCase(charset, "UTF-8"); 212 213 if (!responseIsValid) { 213 String message = "EventSource's response has a charset (\""; 214 message += charset; 215 message += "\") that is not UTF-8. Aborting the connection."; 214 StringBuilder message; 215 message.appendLiteral("EventSource's response has a charset (\""); 216 message.append(charset); 217 message.appendLiteral("\") that is not UTF-8. Aborting the connection."); 216 218 // FIXME: We are missing the source line. 217 scriptExecutionContext()->addConsoleMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, message );219 scriptExecutionContext()->addConsoleMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, message.toString()); 218 220 } 219 221 } else { 220 222 // To keep the signal-to-noise ratio low, we only log 200-response with an invalid MIME type. 221 223 if (statusCode == 200 && !mimeTypeIsValid) { 222 String message = "EventSource's response has a MIME type (\""; 223 message += response.mimeType(); 224 message += "\") that is not \"text/event-stream\". Aborting the connection."; 224 StringBuilder message; 225 message.appendLiteral("EventSource's response has a MIME type (\""); 226 message.append(response.mimeType()); 227 message.appendLiteral("\") that is not \"text/event-stream\". Aborting the connection."); 225 228 // FIXME: We are missing the source line. 226 scriptExecutionContext()->addConsoleMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, message );229 scriptExecutionContext()->addConsoleMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, message.toString()); 227 230 } 228 231 } -
trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp
r124636 r126967 67 67 // However, we use '-' instead of '_' in WebCore (e.g. en_us should read en-us) 68 68 size_t underscorePosition = lang.find('_'); 69 String replaceWith = "-";69 String replaceWith = ASCIILiteral("-"); 70 70 if (underscorePosition != notFound) 71 71 return lang.replace(underscorePosition, replaceWith.length(), replaceWith); -
trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp
r126816 r126967 36 36 #include "TextStream.h" 37 37 #include <wtf/text/CString.h> 38 #include <wtf/text/StringBuilder.h> 38 39 #include <wtf/text/WTFString.h> 39 40 … … 324 325 { 325 326 // | is not a valid identifier character in CSS, so this can never conflict with a keyframe identifier. 326 String id = "-|transition"; 327 StringBuilder id; 328 id.appendLiteral("-|transition"); 327 329 id.append(static_cast<char>(property)); 328 330 id.append('-'); 329 return id ;331 return id.toString(); 330 332 } 331 333 -
trunk/Source/WebCore/platform/network/blackberry/rss/RSSAtomParser.cpp
r126230 r126967 231 231 232 232 BLACKBERRY_ASSERT(node); 233 // Why does Blackberry have its own RSS parser? 234 // FIXME: content should be a StringBuilder. 233 235 String content; 234 236 String type = "default"; -
trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp
r125992 r126967 94 94 m_openErrorMessage = "sqlite_open returned null"; 95 95 96 if (!SQLiteStatement(*this, "PRAGMA temp_store = MEMORY;").executeCommand())96 if (!SQLiteStatement(*this, ASCIILiteral("PRAGMA temp_store = MEMORY;")).executeCommand()) 97 97 LOG_ERROR("SQLite database could not set temp_store to memory"); 98 98 … … 141 141 { 142 142 if (fsync) 143 executeCommand( "PRAGMA fullfsync = 1;");143 executeCommand(ASCIILiteral("PRAGMA fullfsync = 1;")); 144 144 else 145 executeCommand( "PRAGMA fullfsync = 0;");145 executeCommand(ASCIILiteral("PRAGMA fullfsync = 0;")); 146 146 } 147 147 … … 153 153 MutexLocker locker(m_authorizerLock); 154 154 enableAuthorizer(false); 155 SQLiteStatement statement(*this, "PRAGMA max_page_count");155 SQLiteStatement statement(*this, ASCIILiteral("PRAGMA max_page_count")); 156 156 maxPageCount = statement.getColumnInt64(0); 157 157 enableAuthorizer(true); … … 195 195 enableAuthorizer(false); 196 196 197 SQLiteStatement statement(*this, "PRAGMA page_size");197 SQLiteStatement statement(*this, ASCIILiteral("PRAGMA page_size")); 198 198 m_pageSize = statement.getColumnInt(0); 199 199 … … 212 212 enableAuthorizer(false); 213 213 // Note: freelist_count was added in SQLite 3.4.1. 214 SQLiteStatement statement(*this, "PRAGMA freelist_count");214 SQLiteStatement statement(*this, ASCIILiteral("PRAGMA freelist_count")); 215 215 freelistCount = statement.getColumnInt64(0); 216 216 enableAuthorizer(true); … … 227 227 MutexLocker locker(m_authorizerLock); 228 228 enableAuthorizer(false); 229 SQLiteStatement statement(*this, "PRAGMA page_count");229 SQLiteStatement statement(*this, ASCIILiteral("PRAGMA page_count")); 230 230 pageCount = statement.getColumnInt64(0); 231 231 enableAuthorizer(true); … … 270 270 if (!isOpen()) 271 271 return false; 272 272 273 273 String statement = "SELECT name FROM sqlite_master WHERE type = 'table' AND name = '" + tablename + "';"; 274 274 275 275 SQLiteStatement sql(*this, statement); 276 276 sql.prepare(); … … 280 280 void SQLiteDatabase::clearAllTables() 281 281 { 282 String query = "SELECT name FROM sqlite_master WHERE type='table';";282 String query = ASCIILiteral("SELECT name FROM sqlite_master WHERE type='table';"); 283 283 Vector<String> tables; 284 284 if (!SQLiteStatement(*this, query).returnTextResults(0, tables)) { … … 297 297 int SQLiteDatabase::runVacuumCommand() 298 298 { 299 if (!executeCommand( "VACUUM;"))299 if (!executeCommand(ASCIILiteral("VACUUM;"))) 300 300 LOG(SQLDatabase, "Unable to vacuum database - %s", lastErrorMsg()); 301 301 return lastError(); … … 307 307 enableAuthorizer(false); 308 308 309 if (!executeCommand( "PRAGMA incremental_vacuum"))309 if (!executeCommand(ASCIILiteral("PRAGMA incremental_vacuum"))) 310 310 LOG(SQLDatabase, "Unable to run incremental vacuum - %s", lastErrorMsg()); 311 311 … … 458 458 bool SQLiteDatabase::turnOnIncrementalAutoVacuum() 459 459 { 460 SQLiteStatement statement(*this, "PRAGMA auto_vacuum");460 SQLiteStatement statement(*this, ASCIILiteral("PRAGMA auto_vacuum")); 461 461 int autoVacuumMode = statement.getColumnInt(0); 462 462 int error = lastError(); … … 475 475 return true; 476 476 case AutoVacuumFull: 477 return executeCommand( "PRAGMA auto_vacuum = 2");477 return executeCommand(ASCIILiteral("PRAGMA auto_vacuum = 2")); 478 478 case AutoVacuumNone: 479 479 default: 480 if (!executeCommand( "PRAGMA auto_vacuum = 2"))480 if (!executeCommand(ASCIILiteral("PRAGMA auto_vacuum = 2"))) 481 481 return false; 482 482 runVacuumCommand(); -
trunk/Source/WebCore/platform/win/FileSystemWin.cpp
r126926 r126967 199 199 static String bundleName() 200 200 { 201 static String name = "WebKit";201 DEFINE_STATIC_LOCAL(String, name, (ASCIILiteral("WebKit"))); 202 202 203 203 #if USE(CF) … … 225 225 String directory = String::adopt(buffer); 226 226 227 static const String companyNameDirectory = "Apple Computer\\";227 DEFINE_STATIC_LOCAL(String, companyNameDirectory, (ASCIILiteral("Apple Computer\\"))); 228 228 directory = pathByAppendingComponent(directory, companyNameDirectory + bundleName()); 229 229 if (!makeAllDirectories(directory)) -
trunk/Source/WebCore/plugins/PluginStream.cpp
r126926 r126967 141 141 if (m_resourceResponse.isHTTP()) { 142 142 StringBuilder stringBuilder; 143 String separator (": ");143 String separator = ASCIILiteral(": "); 144 144 145 145 String statusLine = "HTTP " + String::number(m_resourceResponse.httpStatusCode()) + " OK\n"; -
trunk/Source/WebCore/rendering/RenderMenuList.cpp
r125644 r126967 213 213 214 214 int i = select->optionToListIndex(optionIndex); 215 String text = "";215 String text = emptyString(); 216 216 if (i >= 0 && i < size) { 217 217 Element* element = listItems[i];
Note: See TracChangeset
for help on using the changeset viewer.