Changeset 160581 in webkit


Ignore:
Timestamp:
Dec 13, 2013 7:14:12 PM (10 years ago)
Author:
Brent Fulgham
Message:

Source/WebCore: [Win] Remove pre-VS2013 support code.
​https://bugs.webkit.org/show_bug.cgi?id=125693

Reviewed by Darin Adler.

  • Modules/webdatabase/DatabaseTracker.cpp:

(WebCore::DatabaseTracker::setQuota): Use C99 format arguments

  • loader/FTPDirectoryParser.cpp:

(WebCore::parseOneFTPLine): Ditto

  • loader/icon/IconDatabase.cpp:

(WebCore::IconDatabase::pruneUnretainedIcons): Ditto

  • platform/sql/SQLiteDatabase.cpp:

(WebCore::SQLiteDatabase::setMaximumSize): Ditto

Source/WTF: [Win] Remove Pre-VS2013 support code.
​https://bugs.webkit.org/show_bug.cgi?id=125693

Reviewed by Darin Adler.

  • wtf/StringPrintStream.cpp:

(WTF::StringPrintStream::vprintf): Use va_copy, like a civilized person.

Tools: [Win] Remove Pre-VS2013 support code.
​https://bugs.webkit.org/show_bug.cgi?id=125693

Reviewed by Darin Adler.

  • DumpRenderTree/cg/ImageDiffCG.cpp: Remove strtof stub now supplied by

the math library.

  • DumpRenderTree/win/ImageDiffCairo.cpp: Ditto.
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r160580 r160581  
     12013-12-13  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Remove Pre-VS2013 support code.
     4        https://bugs.webkit.org/show_bug.cgi?id=125693
     5
     6        Reviewed by Darin Adler.
     7
     8        * wtf/StringPrintStream.cpp:
     9        (WTF::StringPrintStream::vprintf): Use va_copy, like a civilized person.
     10
    1112013-12-12  Darin Adler  <darin@apple.com>
    212

  • trunk/Source/WTF/wtf/StringPrintStream.cpp

    r157341 r160581  
    5555   
    5656    va_list firstPassArgList;
    57 #if OS(WINDOWS)
    58     firstPassArgList = argList;
    59 #else
    6057    va_copy(firstPassArgList, argList);
    61 #endif
    6258   
    6359    int numberOfBytesNotIncludingTerminatorThatWouldHaveBeenWritten =

  • trunk/Source/WebCore/ChangeLog

    r160578 r160581  
     12013-12-13  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Remove pre-VS2013 support code.
     4        https://bugs.webkit.org/show_bug.cgi?id=125693
     5
     6        Reviewed by Darin Adler.
     7
     8        * Modules/webdatabase/DatabaseTracker.cpp:
     9        (WebCore::DatabaseTracker::setQuota): Use C99 format arguments
     10        * loader/FTPDirectoryParser.cpp:
     11        (WebCore::parseOneFTPLine): Ditto
     12        * loader/icon/IconDatabase.cpp:
     13        (WebCore::IconDatabase::pruneUnretainedIcons): Ditto
     14        * platform/sql/SQLiteDatabase.cpp:
     15        (WebCore::SQLiteDatabase::setMaximumSize): Ditto
     16
    1172013-12-13  Brent Fulgham  <bfulgham@apple.com>
    218

  • trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp

    r157971 r160581  
    766766
    767767        if (error)
    768 #if OS(WINDOWS)
    769             LOG_ERROR("Failed to set quota %I64u in tracker database for origin %s", quota, origin->databaseIdentifier().ascii().data());
    770 #else
    771768            LOG_ERROR("Failed to set quota %llu in tracker database for origin %s", quota, origin->databaseIdentifier().ascii().data());
    772 #endif
    773769    }
    774770

  • trunk/Source/WebCore/loader/FTPDirectoryParser.cpp

    r156804 r160581  
    156156              {
    157157                unsigned long long seconds = 0;
    158 #if OS(WINDOWS)
    159                 sscanf(p + 1, "%I64u", &seconds);
    160 #else
    161158                sscanf(p + 1, "%llu", &seconds);
    162 #endif
    163159                time_t t = static_cast<time_t>(seconds);
    164160

  • trunk/Source/WebCore/loader/icon/IconDatabase.cpp

    r158904 r160581  
    17131713        pageDeleteSQL.prepare();
    17141714        for (size_t i = 0; i < numToDelete; ++i) {
    1715 #if OS(WINDOWS)
    1716             LOG(IconDatabase, "Pruning page with rowid %I64i from disk", static_cast<long long>(pageIDsToDelete[i]));
    1717 #else
    17181715            LOG(IconDatabase, "Pruning page with rowid %lli from disk", static_cast<long long>(pageIDsToDelete[i]));
    1719 #endif
    17201716            pageDeleteSQL.bindInt64(1, pageIDsToDelete[i]);
    17211717            int result = pageDeleteSQL.step();
    17221718            if (result != SQLResultDone)
    1723 #if OS(WINDOWS)
    1724                 LOG_ERROR("Unabled to delete page with id %I64i from disk", static_cast<long long>(pageIDsToDelete[i]));
    1725 #else
    17261719                LOG_ERROR("Unabled to delete page with id %lli from disk", static_cast<long long>(pageIDsToDelete[i]));
    1727 #endif
    17281720            pageDeleteSQL.reset();
    17291721           

  • trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp

    r158906 r160581  
    192192    statement.prepare();
    193193    if (statement.step() != SQLResultRow)
    194 #if OS(WINDOWS)
    195         LOG_ERROR("Failed to set maximum size of database to %I64i bytes", static_cast<long long>(size));
    196 #else
    197194        LOG_ERROR("Failed to set maximum size of database to %lli bytes", static_cast<long long>(size));
    198 #endif
    199195
    200196    enableAuthorizer(true);

  • trunk/Tools/ChangeLog

    r160569 r160581  
     12013-12-13  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Remove Pre-VS2013 support code.
     4        https://bugs.webkit.org/show_bug.cgi?id=125693
     5
     6        Reviewed by Darin Adler.
     7
     8        * DumpRenderTree/cg/ImageDiffCG.cpp: Remove strtof stub now supplied by
     9        the math library.
     10        * DumpRenderTree/win/ImageDiffCairo.cpp: Ditto.
     11
    1122013-12-13  Lucas Forschler  <lforschler@apple.com>
    213

  • trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp

    r156302 r160581  
    6161
    6262#if PLATFORM(WIN)
    63 static inline float strtof(const char *nptr, char **endptr)
    64 {
    65     return strtod(nptr, endptr);
    66 }
    6763static const CFStringRef kUTTypePNG = CFSTR("public.png");
    6864#endif

  • trunk/Tools/DumpRenderTree/win/ImageDiffCairo.cpp

    r156302 r160581  
    5050
    5151
    52 #if PLATFORM(WIN)
    53 static inline float strtof(const char* inputString, char** endptr)
    54 {
    55     return strtod(inputString, endptr);
    56 }
    57 #endif
    58 
    5952static cairo_status_t readFromData(void* closure, unsigned char* data, unsigned int length)
    6053{
Note: See TracChangeset for help on using the changeset viewer.