Changeset 127540 in webkit
- Timestamp:
- Sep 4, 2012 6:43:42 PM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r127538 r127540 1 2012-09-04 Adam Barth <abarth@chromium.org> 2 3 Make chromium-linux build without WTF_DEPRECATED_STRING_OPERATORS 4 https://bugs.webkit.org/show_bug.cgi?id=95798 5 6 Reviewed by Eric Seidel. 7 8 This patch makes the chromium-linux port build without 9 WTF::String::operator+=. There are a couple places that require some 10 more careful study, and I've whitelisted those uses by defining 11 WTF_DEPRECATED_STRING_OPERATORS at the top of the files. (See 12 https://bugs.webkit.org/show_bug.cgi?id=95797 for an explanation of 13 WTF_DEPRECATED_STRING_OPERATORS.) 14 15 * css/StylePropertySet.cpp: 16 * inspector/InspectorOverlay.cpp: 17 (WebCore::InspectorOverlay::drawNodeHighlight): 18 * platform/graphics/filters/CustomFilterValidatedProgram.cpp: 19 (WebCore::CustomFilterValidatedProgram::rewriteMixVertexShader): 20 1 21 2012-09-04 Tony Chang <tony@chromium.org> 2 22 -
trunk/Source/WebCore/css/StylePropertySet.cpp
r127375 r127540 19 19 * Boston, MA 02110-1301, USA. 20 20 */ 21 22 #define WTF_DEPRECATED_STRING_OPERATORS 21 23 22 24 #include "config.h" -
trunk/Source/WebCore/inspector/InspectorOverlay.cpp
r127240 r127540 51 51 #include "Settings.h" 52 52 #include "StyledElement.h" 53 #include <wtf/text/StringBuilder.h> 53 54 54 55 namespace WebCore { … … 352 353 HashSet<AtomicString> usedClassNames; 353 354 if (element->hasClass() && element->isStyledElement()) { 354 String classNames;355 StringBuilder classNames; 355 356 const SpaceSplitString& classNamesString = static_cast<StyledElement*>(element)->classNames(); 356 357 size_t classNameCount = classNamesString.size(); … … 360 361 continue; 361 362 usedClassNames.add(className); 362 classNames += makeString(".", className); 363 classNames.append('.'); 364 classNames.append(className); 363 365 } 364 elementInfo->setString("className", classNames );366 elementInfo->setString("className", classNames.toString()); 365 367 } 366 368 -
trunk/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.cpp
r127517 r127540 116 116 // We write our own "main" function and call "css_main" from it. 117 117 // This makes rewriting easy and ensures that our code runs after all author code. 118 m_validatedVertexShader +=SHADER(118 m_validatedVertexShader.append(SHADER( 119 119 attribute mediump vec2 css_a_texCoord; 120 120 varying mediump vec2 css_v_texCoord; … … 125 125 css_v_texCoord = css_a_texCoord; 126 126 } 127 ) ;127 )); 128 128 } 129 129 -
trunk/Source/WebKit/chromium/ChangeLog
r127535 r127540 1 2012-09-04 Adam Barth <abarth@chromium.org> 2 3 Make chromium-linux build without WTF_DEPRECATED_STRING_OPERATORS 4 https://bugs.webkit.org/show_bug.cgi?id=95798 5 6 Reviewed by Eric Seidel. 7 8 * src/WebAccessibilityObject.cpp: 9 (WebKit::WebAccessibilityObject::keyboardShortcut): 10 - Remove use of WTF::String::operator+= 11 * src/WebPageSerializerImpl.cpp: 12 - Whitelist use of WTF::String::operator+=. Remove this use will take 13 some more careful thought. 14 1 15 2012-09-04 Alec Flett <alecflett@chromium.org> 2 16 -
trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp
r126932 r127540 51 51 #include "platform/WebString.h" 52 52 #include "platform/WebURL.h" 53 #include <wtf/text/StringBuilder.h> 53 54 54 55 using namespace WebCore; … … 523 524 // Ctrl+Alt+Shift+Meta+key. MSDN states that keyboard shortcut strings 524 525 // should not be localized and defines the separator as "+". 526 StringBuilder modifierStringBuilder; 525 527 if (modifiers & PlatformEvent::CtrlKey) 526 modifierString += "Ctrl+";528 modifierStringBuilder.appendLiteral("Ctrl+"); 527 529 if (modifiers & PlatformEvent::AltKey) 528 modifierString += "Alt+";530 modifierStringBuilder.appendLiteral("Alt+"); 529 531 if (modifiers & PlatformEvent::ShiftKey) 530 modifierString += "Shift+";532 modifierStringBuilder.appendLiteral("Shift+"); 531 533 if (modifiers & PlatformEvent::MetaKey) 532 modifierString += "Win+"; 534 modifierStringBuilder.appendLiteral("Win+"); 535 modifierString = modifierStringBuilder.toString(); 533 536 } 534 537 -
trunk/Source/WebKit/chromium/src/WebPageSerializerImpl.cpp
r122115 r127540 76 76 // saved resource files. 77 77 78 #define WTF_DEPRECATED_STRING_OPERATORS 79 78 80 #include "config.h" 79 81 #include "WebPageSerializerImpl.h"
Note: See TracChangeset
for help on using the changeset viewer.