Attachment 349527 Details for Bug 189538 – Patch

[patch] Patch

bug-189538-20180912155819.patch (text/plain), 3.05 KB, created by Fujii Hironori on 2018-09-11 23:58:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-09-11 23:58:20 PDT

Size: 3.05 KB

patch

obsolete

>Subversion Revision: 235929
>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index 5ed18a314e81aaa85e927e57ffde9507a55744bb..27c926422811b960688b0f66d552b3ba3db2315a 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-09-11  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 NOBODY (OOPS!).
>+
>+        * 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-06  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Refactor WebCore::EditAction to be an 8-bit enum class
>diff --git a/Source/WebKitLegacy/win/WebPreferences.cpp b/Source/WebKitLegacy/win/WebPreferences.cpp
>index f1d81d83dccf755ee747dcef34a7a18dda6ad7c4..feed4191e2b7a39fe4ac6777341e98d79e4e8f35 100644
>--- a/Source/WebKitLegacy/win/WebPreferences.cpp
>+++ b/Source/WebKitLegacy/win/WebPreferences.cpp
>@@ -61,10 +61,10 @@ static const String& oldPreferencesPath()
>     return path;
> }
> 
>-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>
> static NumberType numberValueForPreferencesValue(CFPropertyListRef value)
>@@ -515,7 +515,7 @@ void WebPreferences::migrateWebKitPreferencesToCFPreferences()
>     if (!CFReadStreamOpen(stream.get()))
>         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());
> 
>@@ -1352,7 +1352,7 @@ HRESULT WebPreferences::screenFontSubstitutionEnabled(_Out_ BOOL* enabled)
> {
>     if (!enabled)
>         return E_POINTER;
>-    enabled = false;
>+    *enabled = false;
>     return S_OK;
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189538: 349527