Changeset 127604 in webkit


Ignore:
Timestamp:
Sep 5, 2012 10:05:40 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL] Remove '+=' usage in String
​https://bugs.webkit.org/show_bug.cgi?id=95808

Patch by Kangil Han <​kangil.han@samsung.com> on 2012-09-05
Reviewed by Benjamin Poulain.

Replaced use of String operator '+=' with StringBuilder.append*() in order to adopt efficient String concatenation.

Source/WebKit/efl:

  • ewk/ewk_frame.cpp:

(ewk_frame_source_get): Removed unnecessary strlen usage.

Tools:

  • DumpRenderTree/efl/DumpRenderTreeChrome.cpp:

(descriptionSuitableForTestResult):

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/efl/ChangeLog

    r127577 r127604  
     12012-09-05  Kangil Han  <kangil.han@samsung.com>
     2
     3        [EFL] Remove '+=' usage in String
     4        https://bugs.webkit.org/show_bug.cgi?id=95808
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Replaced use of String operator '+=' with StringBuilder.append*() in order to adopt efficient String concatenation.
     9
     10        * ewk/ewk_frame.cpp:
     11        (ewk_frame_source_get): Removed unnecessary strlen usage.
     12
    1132012-09-05  Kaustubh Atrawalkar  <kaustubh@motorola.com>
    214

  • trunk/Source/WebKit/efl/ewk/ewk_frame.cpp

    r127191 r127604  
    16391639    EINA_SAFETY_ON_NULL_RETURN_VAL(frameSource, -1);
    16401640
    1641     WTF::String source;
     1641    StringBuilder builder;
    16421642    *frameSource = 0; // Saves 0 to pointer until it's not allocated.
    16431643
    … …  
    16551655                WebCore::HTMLElement* element = static_cast<WebCore::HTMLElement*>(node);
    16561656                if (element)
    1657                     source = element->outerHTML();
     1657                    builder.append(element->outerHTML());
    16581658                break;
    16591659            }
    … …  
    16611661
    16621662    // Try to get <head> and <body> tags if <html> tag was not found.
    1663     if (source.isEmpty()) {
     1663    if (builder.isEmpty()) {
    16641664        if (smartData->frame->document()->head())
    1665             source = smartData->frame->document()->head()->outerHTML();
     1665            builder.append(smartData->frame->document()->head()->outerHTML());
    16661666
    16671667        if (smartData->frame->document()->body())
    1668             source += smartData->frame->document()->body()->outerHTML();
    1669     }
    1670 
    1671     size_t sourceLength = strlen(source.utf8().data());
     1668            builder.append(smartData->frame->document()->body()->outerHTML());
     1669    }
     1670
     1671    CString utf8String = builder.toString().utf8();
     1672    size_t sourceLength = utf8String.length();
    16721673    *frameSource = static_cast<char*>(malloc(sourceLength + 1));
    16731674    if (!*frameSource) {
    … …  
    16761677    }
    16771678
    1678     strncpy(*frameSource, source.utf8().data(), sourceLength);
     1679    strncpy(*frameSource, utf8String.data(), sourceLength);
    16791680    (*frameSource)[sourceLength] = '\0';
    16801681

  • trunk/Tools/ChangeLog

    r127602 r127604  
     12012-09-05  Kangil Han  <kangil.han@samsung.com>
     2
     3        [EFL] Remove '+=' usage in String
     4        https://bugs.webkit.org/show_bug.cgi?id=95808
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Replaced use of String operator '+=' with StringBuilder.append*() in order to adopt efficient String concatenation.
     9
     10        * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
     11        (descriptionSuitableForTestResult):
     12
    1132012-09-05  Christophe Dumez  <christophe.dumez@intel.com>
    214

  • trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp

    r127024 r127604  
    4949#include <cstdio>
    5050#include <wtf/NotFound.h>
     51#include <wtf/text/StringBuilder.h>
    5152
    5253using namespace WebCore;
    … …  
    366367static CString descriptionSuitableForTestResult(Ewk_Frame_Resource_Request* request)
    367368{
    368     String ret = "<NSURLRequest URL ";
    369     ret += pathSuitableForTestResult(request->url).data();
    370     ret += ", main document URL ";
    371     ret += urlSuitableForTestResult(request->first_party).data();
    372     ret += ", http method ";
    373     ret += request->http_method ? String(request->http_method) : "(none)";
    374     ret += ">";
    375 
    376     return ret.utf8();
     369    StringBuilder builder;
     370    builder.appendLiteral("<NSURLRequest URL ");
     371    builder.append(pathSuitableForTestResult(request->url).data());
     372    builder.appendLiteral(", main document URL ");
     373    builder.append(urlSuitableForTestResult(request->first_party).data());
     374    builder.appendLiteral(", http method ");
     375
     376    if (request->http_method)
     377        builder.append(String(request->http_method));
     378    else
     379        builder.appendLiteral("(none)");
     380
     381    builder.append('>');
     382    return builder.toString().utf8();
    377383}
    378384
    … …  
    382388        return CString("(null)");
    383389
    384     String ret = "<NSURLResponse ";
    385     ret += pathSuitableForTestResult(response->url).data();
    386     ret += ", http status code ";
    387     ret += String::number(response->status_code);
    388     ret += ">";
    389 
    390     return ret.utf8();
     390    StringBuilder builder;
     391    builder.appendLiteral("<NSURLResponse ");
     392    builder.append(pathSuitableForTestResult(response->url).data());
     393    builder.appendLiteral(", http status code ");
     394    builder.append(String::number(response->status_code));
     395    builder.append('>');
     396    return builder.toString().utf8();
    391397}
    392398
Note: See TracChangeset for help on using the changeset viewer.