Log Message
[WinCairo] Fix several build warnings under WebCore/platform https://bugs.webkit.org/show_bug.cgi?id=182802
Patch by Basuke Suzuki <basuke.suz...@sony.com> 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (228493 => 228494)
--- trunk/Source/WebCore/ChangeLog 2018-02-14 23:50:04 UTC (rev 228493)
+++ trunk/Source/WebCore/ChangeLog 2018-02-15 00:13:56 UTC (rev 228494)
@@ -1,3 +1,45 @@
+2018-02-14 Basuke Suzuki <basuke.suz...@sony.com>
+
+ [WinCairo] Fix several build warnings under WebCore/platform
+ https://bugs.webkit.org/show_bug.cgi?id=182802
+
+ 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):
+
2018-02-14 Zalan Bujtas <za...@apple.com>
[RenderTreeBuilder] Move RenderSVG*::addChild() to RenderTreeBuilder
Modified: trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp (228493 => 228494)
--- trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp 2018-02-14 23:50:04 UTC (rev 228493)
+++ trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp 2018-02-15 00:13:56 UTC (rev 228494)
@@ -276,7 +276,6 @@
return false;
WallTime fileTime;
- time_t fileModificationDate;
if (auto fileTimeFromFile = FileSystem::getFileModificationTime(m_headerFilename))
fileTime = fileTimeFromFile.value();
Modified: trunk/Source/WebCore/platform/text/win/LocaleWin.cpp (228493 => 228494)
--- trunk/Source/WebCore/platform/text/win/LocaleWin.cpp 2018-02-14 23:50:04 UTC (rev 228493)
+++ trunk/Source/WebCore/platform/text/win/LocaleWin.cpp 2018-02-15 00:13:56 UTC (rev 228494)
@@ -57,7 +57,7 @@
return locale.left(dashPosition);
}
-static LCID LCIDFromLocaleInternal(LCID userDefaultLCID, const String& userDefaultLanguageCode, String& locale)
+static LCID LCIDFromLocaleInternal(LCID userDefaultLCID, const String& userDefaultLanguageCode, const String& locale)
{
if (equalIgnoringASCIICase(extractLanguageCode(locale), userDefaultLanguageCode))
return userDefaultLCID;
Modified: trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp (228493 => 228494)
--- trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp 2018-02-14 23:50:04 UTC (rev 228493)
+++ trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp 2018-02-15 00:13:56 UTC (rev 228494)
@@ -163,10 +163,15 @@
return url;
}
+static CLIPFORMAT registerClipboardFormat(LPCWSTR format)
+{
+ return static_cast<CLIPFORMAT>(RegisterClipboardFormat(format));
+}
+
// Firefox text/html
static FORMATETC* texthtmlFormat()
{
- static UINT cf = RegisterClipboardFormat(L"text/html");
+ static CLIPFORMAT cf = registerClipboardFormat(L"text/html");
static FORMATETC texthtmlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
return &texthtmlFormat;
}
@@ -321,7 +326,7 @@
FORMATETC* urlWFormat()
{
- static UINT cf = RegisterClipboardFormat(L"UniformResourceLocatorW");
+ static CLIPFORMAT cf = registerClipboardFormat(L"UniformResourceLocatorW");
static FORMATETC urlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
return &urlFormat;
}
@@ -328,7 +333,7 @@
FORMATETC* urlFormat()
{
- static UINT cf = RegisterClipboardFormat(L"UniformResourceLocator");
+ static CLIPFORMAT cf = registerClipboardFormat(L"UniformResourceLocator");
static FORMATETC urlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
return &urlFormat;
}
@@ -347,7 +352,7 @@
FORMATETC* filenameWFormat()
{
- static UINT cf = RegisterClipboardFormat(L"FileNameW");
+ static CLIPFORMAT cf = registerClipboardFormat(L"FileNameW");
static FORMATETC urlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
return &urlFormat;
}
@@ -354,7 +359,7 @@
FORMATETC* filenameFormat()
{
- static UINT cf = RegisterClipboardFormat(L"FileName");
+ static CLIPFORMAT cf = registerClipboardFormat(L"FileName");
static FORMATETC urlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
return &urlFormat;
}
@@ -362,7 +367,7 @@
// MSIE HTML Format
FORMATETC* htmlFormat()
{
- static UINT cf = RegisterClipboardFormat(L"HTML Format");
+ static CLIPFORMAT cf = registerClipboardFormat(L"HTML Format");
static FORMATETC htmlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
return &htmlFormat;
}
@@ -369,7 +374,7 @@
FORMATETC* smartPasteFormat()
{
- static UINT cf = RegisterClipboardFormat(L"WebKit Smart Paste Format");
+ static CLIPFORMAT cf = registerClipboardFormat(L"WebKit Smart Paste Format");
static FORMATETC htmlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
return &htmlFormat;
}
@@ -376,7 +381,7 @@
FORMATETC* fileDescriptorFormat()
{
- static UINT cf = RegisterClipboardFormat(CFSTR_FILEDESCRIPTOR);
+ static CLIPFORMAT cf = registerClipboardFormat(CFSTR_FILEDESCRIPTOR);
static FORMATETC fileDescriptorFormat = { cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
return &fileDescriptorFormat;
}
@@ -383,7 +388,7 @@
FORMATETC* fileContentFormatZero()
{
- static UINT cf = RegisterClipboardFormat(CFSTR_FILECONTENTS);
+ static CLIPFORMAT cf = registerClipboardFormat(CFSTR_FILECONTENTS);
static FORMATETC fileContentFormat = { cf, 0, DVASPECT_CONTENT, 0, TYMED_HGLOBAL };
return &fileContentFormat;
}
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
