Changeset 235966 in webkit

Timestamp:

Sep 12, 2018 7:14:05 PM (6 years ago)

Author:

Fujii Hironori

Message:

[Win][Clang][WebKitLegacy] Fix compilation errors and warnings of WebPreferences.cpp
​https://bugs.webkit.org/show_bug.cgi?id=189538

Reviewed by Per Arne Vollan.

• WebPreferences.cpp:

Changed the type of CFNumberTraits::Type from unsigned int to CFNumberType.
(WebPreferences::migrateWebKitPreferencesToCFPreferences):
Apply static_cast to the result of OR-ed CFPropertyListFormat.
(WebPreferences::screenFontSubstitutionEnabled):
Assign false to the content of the out variable 'enabled', not assigning 0 to the variable.

Location:

trunk/Source/WebKitLegacy/win

Files:

• ChangeLog (modified) (1 diff)
• WebPreferences.cpp (modified) (3 diffs)

trunk/Source/WebKitLegacy/win/ChangeLog

@@ +1 @@
+2018-09-12  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win][Clang][WebKitLegacy] Fix compilation errors and warnings of WebPreferences.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=189538
+
+        Reviewed by Per Arne Vollan.
+
+        * WebPreferences.cpp:
+        Changed the type of CFNumberTraits::Type from unsigned int to CFNumberType.
+        (WebPreferences::migrateWebKitPreferencesToCFPreferences):
+        Apply static_cast to the result of OR-ed CFPropertyListFormat.
+        (WebPreferences::screenFontSubstitutionEnabled):
+        Assign false to the content of the out variable 'enabled', not assigning 0 to the variable.
+
 2018-09-12  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebKitLegacy/win/WebPreferences.cpp

@@ -62 +62 @@
 }
 
-template<typename NumberType> struct CFNumberTraits { static const unsigned Type; };
-template<> struct CFNumberTraits<int> { static const unsigned Type = kCFNumberSInt32Type; };
-template<> struct CFNumberTraits<LONGLONG> { static const unsigned Type = kCFNumberLongLongType; };
-template<> struct CFNumberTraits<float> { static const unsigned Type = kCFNumberFloat32Type; };
+template<typename NumberType> struct CFNumberTraits { static const CFNumberType Type; };
+template<> struct CFNumberTraits<int> { static const CFNumberType Type = kCFNumberSInt32Type; };
+template<> struct CFNumberTraits<LONGLONG> { static const CFNumberType Type = kCFNumberLongLongType; };
+template<> struct CFNumberTraits<float> { static const CFNumberType Type = kCFNumberFloat32Type; };
 
 template<typename NumberType>
@@ -516 +516 @@
         return;
 
-    CFPropertyListFormat format = kCFPropertyListBinaryFormat_v1_0 | kCFPropertyListXMLFormat_v1_0;
+    auto format = static_cast<CFPropertyListFormat>(kCFPropertyListBinaryFormat_v1_0 | kCFPropertyListXMLFormat_v1_0);
     RetainPtr<CFPropertyListRef> plist = adoptCF(CFPropertyListCreateFromStream(0, stream.get(), 0, kCFPropertyListMutableContainersAndLeaves, &format, 0));
     CFReadStreamClose(stream.get());
@@ -1353 +1353 @@
     if (!enabled)
         return E_POINTER;
-    enabled = false;
+    *enabled = false;
     return S_OK;
 }