Attachment 349627 Details for Bug 171618 – WIP patch

[patch] WIP patch

wip.patch (text/plain), 5.84 KB, created by Fujii Hironori on 2018-09-12 22:13:47 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-09-12 22:13:47 PDT

Size: 5.84 KB

patch

obsolete

>diff --git a/Source/JavaScriptCore/jit/JITMathIC.h b/Source/JavaScriptCore/jit/JITMathIC.h
>index 4e00958d19f..68167926fba 100644
>--- a/Source/JavaScriptCore/jit/JITMathIC.h
>+++ b/Source/JavaScriptCore/jit/JITMathIC.h
>@@ -144,7 +144,7 @@ public:
>         };
> 
>         auto replaceCall = [&] () {
>-#if COMPILER(MSVC)
>+#if COMPILER(MSVC) && !COMPILER(CLANG)
>             ftlThunkAwareRepatchCall(codeBlock, slowPathCallLocation().retagged<JSInternalPtrTag>(), callReplacement);
> #else
>             ftlThunkAwareRepatchCall(codeBlock, slowPathCallLocation().template retagged<JSInternalPtrTag>(), callReplacement);
>diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
>index 71e6b8e6a08..5a921d32120 100644
>--- a/Source/WTF/wtf/Compiler.h
>+++ b/Source/WTF/wtf/Compiler.h
>@@ -363,7 +363,7 @@
> 
> /* UNUSED_PARAM */
> 
>-#if !defined(UNUSED_PARAM) && COMPILER(MSVC)
>+#if !defined(UNUSED_PARAM) && COMPILER(MSVC) && !COMPILER(CLANG)
> #define UNUSED_PARAM(variable) (void)&variable
> #endif
> 
>@@ -430,7 +430,7 @@
> #define IGNORE_GCC_WARNINGS_END
> #endif
> 
>-#if COMPILER(CLANG)
>+#if COMPILER(CLANG) && !COMPILER(MSVC)
> #define IGNORE_CLANG_WARNINGS_BEGIN(warning) IGNORE_WARNINGS_BEGIN_IMPL(clang, warning)
> #define IGNORE_CLANG_WARNINGS_END IGNORE_WARNINGS_END_IMPL(clang)
> #else
>diff --git a/Source/WebCore/inspector/InspectorStyleSheet.cpp b/Source/WebCore/inspector/InspectorStyleSheet.cpp
>index 9d985819cb3..4af708d2d31 100644
>--- a/Source/WebCore/inspector/InspectorStyleSheet.cpp
>+++ b/Source/WebCore/inspector/InspectorStyleSheet.cpp
>@@ -635,7 +635,7 @@ Ref<Inspector::Protocol::CSS::CSSStyle> InspectorStyle::styleWithProperties() co
>         const String& name = propertyEntry.name;
> 
>         // Visual Studio disagrees with other compilers as to whether 'class' is needed here.
>-#if COMPILER(MSVC)
>+#if COMPILER(MSVC) && !COMPILER(CLANG)
>         enum class Protocol::CSS::CSSPropertyStatus status;
> #else
>         enum Inspector::Protocol::CSS::CSSPropertyStatus status;
>diff --git a/Source/WebCore/platform/win/WheelEventWin.cpp b/Source/WebCore/platform/win/WheelEventWin.cpp
>index c24aed18e54..3d9046fa4dd 100644
>--- a/Source/WebCore/platform/win/WheelEventWin.cpp
>+++ b/Source/WebCore/platform/win/WheelEventWin.cpp
>@@ -83,12 +83,12 @@ PlatformWheelEvent::PlatformWheelEvent(HWND hWnd, const FloatSize& delta, const
>     m_wheelTicksY = m_deltaY;
> 
>     // Global Position is just x, y location of event
>-    POINT point = {location.x(), location.y()};
>     float inverseScaleFactor = 1.0f / deviceScaleFactorForWindow(hWnd);
>-    m_globalPosition = point;
>+    m_globalPosition = flooredIntPoint(location);
>     m_globalPosition.scale(inverseScaleFactor, inverseScaleFactor);
> 
>     // Position needs to be translated to our client
>+    POINT point;
>     ScreenToClient(hWnd, &point);
>     m_position = point;
>     m_position.scale(inverseScaleFactor, inverseScaleFactor);
>diff --git a/Source/WebKitLegacy/win/DefaultPolicyDelegate.cpp b/Source/WebKitLegacy/win/DefaultPolicyDelegate.cpp
>index 3b00fb9d781..e8e5f5c4cc1 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 c55607f6274..de0221f545f 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;
> }
> 
>diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
>index 72dc5c96779..6bd1ff7fa69 100644
>--- a/Source/cmake/WebKitCompilerFlags.cmake
>+++ b/Source/cmake/WebKitCompilerFlags.cmake
>@@ -116,18 +116,17 @@ if (COMPILER_IS_GCC_OR_CLANG)
>             WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-unknown-pragmas)
>             add_definitions(-D__USE_MINGW_ANSI_STDIO=1)
>         endif ()
>+        # Warnings to be enabled
>+        WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wall
>+                                             -Wextra
>+                                             -Wcast-align
>+                                             -Wformat-security
>+                                             -Wmissing-format-attribute
>+                                             -Wpointer-arith
>+                                             -Wundef
>+                                             -Wwrite-strings)
>     endif ()
> 
>-    # Warnings to be enabled
>-    WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wall
>-                                         -Wextra
>-                                         -Wcast-align
>-                                         -Wformat-security
>-                                         -Wmissing-format-attribute
>-                                         -Wpointer-arith
>-                                         -Wundef
>-                                         -Wwrite-strings)
>-
>     # Warnings to be disabled
>     # FIXME: We should probably not be disabling -Wno-maybe-uninitialized?
>     WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Qunused-arguments

Actions: View | Formatted Diff | Diff

Attachments on bug 171618: 349006 | 349010 | 349627 | 350006 | 350007 | 467870