Attachment 349729 Details for Bug 189612 – Patch

[patch] Patch

bug-189612-20180914123552.patch (text/plain), 2.62 KB, created by Fujii Hironori on 2018-09-13 20:35:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-09-13 20:35:53 PDT

Size: 2.62 KB

patch

obsolete

>Subversion Revision: 235999
>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index 65e2ab0c6f55284c89ab753a50ad3c24a64f2554..a7d2a1cab96a5ac355cda367898b7911b30cdfbb 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-09-13  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Win][Clang][WebKitLegacy] error: cannot pass object of non-trivial type through variadic function
>+        https://bugs.webkit.org/show_bug.cgi?id=189612
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Non-trivial types can't be used as aruguments of LOG_ERROR and
>+        ASSERT_WITH_MESSAGE.
>+
>+        * DefaultPolicyDelegate.cpp:
>+        (DefaultPolicyDelegate::unableToImplementPolicyWithError): Apply
>+        static_cast<BSTR> to convert BString.
>+        * WebLocalizableStrings.cpp:
>+        (copyLocalizedStringFromBundle): Convert 'key' from WTF::String to
>+        char* by using 'key.utf8().data()'.
>+
> 2018-09-13  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r235953.
>diff --git a/Source/WebKitLegacy/win/DefaultPolicyDelegate.cpp b/Source/WebKitLegacy/win/DefaultPolicyDelegate.cpp
>index 3b00fb9d7814dca44491bdfa88b016efea3442fb..e8e5f5c4cc11a12083bbe4b518b2c486ed568c89 100644
>--- a/Source/WebKitLegacy/win/DefaultPolicyDelegate.cpp
>+++ b/Source/WebKitLegacy/win/DefaultPolicyDelegate.cpp
>@@ -179,7 +179,7 @@ HRESULT DefaultPolicyDelegate::unableToImplementPolicyWithError(_In_opt_ IWebVie
>     BString frameName;
>     frame->name(&frameName);
> 
>-    LOG_ERROR("called unableToImplementPolicyWithError:%S inFrame:%S", errorStr ? errorStr : TEXT(""), frameName ? frameName : TEXT(""));
>+    LOG_ERROR("called unableToImplementPolicyWithError:%S inFrame:%S", errorStr ? static_cast<BSTR>(errorStr) : TEXT(""), frameName ? static_cast<BSTR>(frameName) : TEXT(""));
> 
>     return S_OK;
> }
>diff --git a/Source/WebKitLegacy/win/WebLocalizableStrings.cpp b/Source/WebKitLegacy/win/WebLocalizableStrings.cpp
>index c55607f6274b9d56e78129a43802ad0a880cc178..de0221f545f3df4a6ad10c0aa96d36cb8d9163f2 100644
>--- a/Source/WebKitLegacy/win/WebLocalizableStrings.cpp
>+++ b/Source/WebKitLegacy/win/WebLocalizableStrings.cpp
>@@ -161,7 +161,7 @@ static CFStringRef copyLocalizedStringFromBundle(WebLocalizableStringsBundle* st
> 
>     CFStringRef result = CFCopyLocalizedStringWithDefaultValue(key.createCFString().get(), 0, bundle, notFound, 0);
> 
>-    ASSERT_WITH_MESSAGE(result != notFound, "could not find localizable string %s in bundle", key);
>+    ASSERT_WITH_MESSAGE(result != notFound, "could not find localizable string %s in bundle", key.utf8().data());
>     return result;
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189612: 349729