Changeset 228494 in webkit


Ignore:
Timestamp:
Feb 14, 2018 4:13:56 PM (6 years ago)
Author:
commit-queue@webkit.org
Message:

[WinCairo] Fix several build warnings under WebCore/platform
​https://bugs.webkit.org/show_bug.cgi?id=182802

Patch by Basuke Suzuki <Basuke Suzuki> on 2018-02-14
Reviewed by Konstantin Tokarev.

Warning C4101 'fileModificationDate': unreferenced local variable

Source\WebCore\platform\network\curl\CurlCacheEntry.cpp:279

Warning C4239 nonstandard extension used: 'argument': conversion from 'WTF::String'
to 'WTF::String &'

Source\WebCore\platform\text\win\LocaleWin.cpp:75
Source\WebCore\platform\text\win\LocaleWin.cpp:77

Warning C4838 conversion from 'UINT' to 'CLIPFORMAT' requires a narrowing conversion

Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:170
Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:325
Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:332
Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:351
Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:358
Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:366
Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:373
Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:380
Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:387

  • platform/network/curl/CurlCacheEntry.cpp:

(WebCore::CurlCacheEntry::parseResponseHeaders):

  • platform/text/win/LocaleWin.cpp:

(WebCore::LCIDFromLocaleInternal):

  • platform/win/ClipboardUtilitiesWin.cpp:

(WebCore::registerClipboardFormat):
(WebCore::texthtmlFormat):
(WebCore::urlWFormat):
(WebCore::urlFormat):
(WebCore::filenameWFormat):
(WebCore::filenameFormat):
(WebCore::htmlFormat):
(WebCore::smartPasteFormat):
(WebCore::fileDescriptorFormat):
(WebCore::fileContentFormatZero):

Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r228492 r228494  
     12018-02-14  Basuke Suzuki  <Basuke.Suzuki@sony.com>
     2
     3        [WinCairo] Fix several build warnings under WebCore/platform
     4        https://bugs.webkit.org/show_bug.cgi?id=182802
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        Warning C4101 'fileModificationDate': unreferenced local variable
     9                Source\WebCore\platform\network\curl\CurlCacheEntry.cpp:279
     10
     11        Warning C4239 nonstandard extension used: 'argument': conversion from 'WTF::String'
     12        to 'WTF::String &'
     13                Source\WebCore\platform\text\win\LocaleWin.cpp:75
     14                Source\WebCore\platform\text\win\LocaleWin.cpp:77
     15
     16        Warning C4838 conversion from 'UINT' to 'CLIPFORMAT' requires a narrowing conversion
     17                Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:170
     18                Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:325
     19                Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:332
     20                Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:351
     21                Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:358
     22                Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:366
     23                Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:373
     24                Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:380
     25                Source\WebCore\platform\win\ClipboardUtilitiesWin.cpp:387
     26
     27        * platform/network/curl/CurlCacheEntry.cpp:
     28        (WebCore::CurlCacheEntry::parseResponseHeaders):
     29        * platform/text/win/LocaleWin.cpp:
     30        (WebCore::LCIDFromLocaleInternal):
     31        * platform/win/ClipboardUtilitiesWin.cpp:
     32        (WebCore::registerClipboardFormat):
     33        (WebCore::texthtmlFormat):
     34        (WebCore::urlWFormat):
     35        (WebCore::urlFormat):
     36        (WebCore::filenameWFormat):
     37        (WebCore::filenameFormat):
     38        (WebCore::htmlFormat):
     39        (WebCore::smartPasteFormat):
     40        (WebCore::fileDescriptorFormat):
     41        (WebCore::fileContentFormatZero):
     42
    1432018-02-14  Zalan Bujtas  <zalan@apple.com>
    244

  • trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp

    r226349 r228494  
    277277
    278278    WallTime fileTime;
    279     time_t fileModificationDate;
    280279
    281280    if (auto fileTimeFromFile = FileSystem::getFileModificationTime(m_headerFilename))

  • trunk/Source/WebCore/platform/text/win/LocaleWin.cpp

    r226205 r228494  
    5858}
    5959
    60 static LCID LCIDFromLocaleInternal(LCID userDefaultLCID, const String& userDefaultLanguageCode, String& locale)
     60static LCID LCIDFromLocaleInternal(LCID userDefaultLCID, const String& userDefaultLanguageCode, const String& locale)
    6161{
    6262    if (equalIgnoringASCIICase(extractLanguageCode(locale), userDefaultLanguageCode))

  • trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp

    r226205 r228494  
    164164}
    165165
     166static CLIPFORMAT registerClipboardFormat(LPCWSTR format)
     167{
     168    return static_cast<CLIPFORMAT>(RegisterClipboardFormat(format));
     169}
     170
    166171// Firefox text/html
    167172static FORMATETC* texthtmlFormat()
    168173{
    169     static UINT cf = RegisterClipboardFormat(L"text/html");
     174    static CLIPFORMAT cf = registerClipboardFormat(L"text/html");
    170175    static FORMATETC texthtmlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
    171176    return &texthtmlFormat;
    … …  
    322327FORMATETC* urlWFormat()
    323328{
    324     static UINT cf = RegisterClipboardFormat(L"UniformResourceLocatorW");
     329    static CLIPFORMAT cf = registerClipboardFormat(L"UniformResourceLocatorW");
    325330    static FORMATETC urlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
    326331    return &urlFormat;
    … …  
    329334FORMATETC* urlFormat()
    330335{
    331     static UINT cf = RegisterClipboardFormat(L"UniformResourceLocator");
     336    static CLIPFORMAT cf = registerClipboardFormat(L"UniformResourceLocator");
    332337    static FORMATETC urlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
    333338    return &urlFormat;
    … …  
    348353FORMATETC* filenameWFormat()
    349354{
    350     static UINT cf = RegisterClipboardFormat(L"FileNameW");
     355    static CLIPFORMAT cf = registerClipboardFormat(L"FileNameW");
    351356    static FORMATETC urlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
    352357    return &urlFormat;
    … …  
    355360FORMATETC* filenameFormat()
    356361{
    357     static UINT cf = RegisterClipboardFormat(L"FileName");
     362    static CLIPFORMAT cf = registerClipboardFormat(L"FileName");
    358363    static FORMATETC urlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
    359364    return &urlFormat;
    … …  
    363368FORMATETC* htmlFormat()
    364369{
    365     static UINT cf = RegisterClipboardFormat(L"HTML Format");
     370    static CLIPFORMAT cf = registerClipboardFormat(L"HTML Format");
    366371    static FORMATETC htmlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
    367372    return &htmlFormat;
    … …  
    370375FORMATETC* smartPasteFormat()
    371376{
    372     static UINT cf = RegisterClipboardFormat(L"WebKit Smart Paste Format");
     377    static CLIPFORMAT cf = registerClipboardFormat(L"WebKit Smart Paste Format");
    373378    static FORMATETC htmlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
    374379    return &htmlFormat;
    … …  
    377382FORMATETC* fileDescriptorFormat()
    378383{
    379     static UINT cf = RegisterClipboardFormat(CFSTR_FILEDESCRIPTOR);
     384    static CLIPFORMAT cf = registerClipboardFormat(CFSTR_FILEDESCRIPTOR);
    380385    static FORMATETC fileDescriptorFormat = { cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
    381386    return &fileDescriptorFormat;
    … …  
    384389FORMATETC* fileContentFormatZero()
    385390{
    386     static UINT cf = RegisterClipboardFormat(CFSTR_FILECONTENTS);
     391    static CLIPFORMAT cf = registerClipboardFormat(CFSTR_FILECONTENTS);
    387392    static FORMATETC fileContentFormat = { cf, 0, DVASPECT_CONTENT, 0, TYMED_HGLOBAL };
    388393    return &fileContentFormat;
Note: See TracChangeset for help on using the changeset viewer.