Attachment 369563 Details for Bug 197785 – Patch

[patch] Patch

bug-197785-20190510123011.patch (text/plain), 11.06 KB, created by Michael Catanzaro on 2019-05-10 10:30:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-05-10 10:30:12 PDT

Size: 11.06 KB

patch

obsolete

>Subversion Revision: 245176
>diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
>index da940b557f7803bf46da6795d3ba3d3c0172a472..da2388dec7d5a5de2e865d135e098af7af0a032b 100644
>--- a/Source/ThirdParty/ANGLE/ChangeLog
>+++ b/Source/ThirdParty/ANGLE/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-10  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Fix a bunch of compiler warnings
>+        https://bugs.webkit.org/show_bug.cgi?id=197785
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add compiler flags to suppress various warnings triggered by the new version of ANGLE.
>+
>+        * CMakeLists.txt:
>+
> 2019-05-09  Don Olmstead  <don.olmstead@sony.com>
> 
>         [ANGLE] Update ANGLE
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 227dd90f3d2d7b9e43df6a822c56314aae81f7bd..5be753f64ce23ce264af32c5b3230622671664ba 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-05-10  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Fix a bunch of compiler warnings
>+        https://bugs.webkit.org/show_bug.cgi?id=197785
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * CMakeLists.txt: WebCoreTestSupport should accept extra SYSTEM includes.
>+        * PlatformGTK.cmake: GTK includes should be added to SYSTEM headers to avoid warnings.
>+        * inspector/InspectorCanvas.cpp: Add preprocessor guards to fix unused function warning.
>+        * rendering/RenderLayer.cpp: Fix unused variable warning.
>+        (WebCore::RenderLayer::updateClipRects):
>+
> 2019-05-10  Antti Koivisto  <antti@apple.com>
> 
>         Event region generation needs to know about backing-sharing
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 22958a558829279cf5f38d04aa47877748e5d6cd..ee5cf925529f8a52c457275c2efa3c3bc102cf89 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-05-10  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Fix a bunch of compiler warnings
>+        https://bugs.webkit.org/show_bug.cgi?id=197785
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Guard Cocoa-specific format modifier to avoid -Wformat warning.
>+
>+        * NetworkProcess/AdClickAttributionManager.cpp:
>+        (WebKit::AdClickAttributionManager::fireConversionRequest):
>+
> 2019-05-10  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [WPE][GTK] Add webkit_frame_get_id() API
>diff --git a/Source/ThirdParty/ANGLE/CMakeLists.txt b/Source/ThirdParty/ANGLE/CMakeLists.txt
>index 692ae541aecdd07629b4ac5e517557b44d833d4d..4726c8bdae17588b346c1b13822a2b09b6eedfa7 100644
>--- a/Source/ThirdParty/ANGLE/CMakeLists.txt
>+++ b/Source/ThirdParty/ANGLE/CMakeLists.txt
>@@ -149,7 +149,11 @@ else ()
> endif ()
> 
> if (COMPILER_IS_GCC_OR_CLANG)
>-    WEBKIT_ADD_TARGET_CXX_FLAGS(ANGLE -Wno-cast-align -Wno-unused-parameter)
>+    WEBKIT_ADD_TARGET_CXX_FLAGS(ANGLE -Wno-cast-align
>+                                      -Wno-suggest-attribute=format
>+                                      -Wno-type-limits
>+                                      -Wno-undef
>+                                      -Wno-unused-parameter)
> endif ()
> 
> target_link_libraries(ANGLEFramework INTERFACE ANGLE)
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index e65a5e08436f07e37c9048cf096b4959de0af839..fd99e7dbd08f77b6fe8daf3ab0385a06c30b940a 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -1972,7 +1972,7 @@ add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestS
> add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
> target_include_directories(WebCoreTestSupport PUBLIC ${WebCoreTestSupport_INCLUDE_DIRECTORIES} ${WebCore_INCLUDE_DIRECTORIES})
> target_include_directories(WebCoreTestSupport PRIVATE ${WebCoreTestSupport_PRIVATE_INCLUDE_DIRECTORIES} ${WebCore_PRIVATE_INCLUDE_DIRECTORIES})
>-target_include_directories(WebCoreTestSupport SYSTEM PUBLIC ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
>+target_include_directories(WebCoreTestSupport SYSTEM PUBLIC ${WebCoreTestSupport_SYSTEM_INCLUDE_DIRECTORIES} ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
> target_link_libraries(WebCoreTestSupport PRIVATE ${WebCoreTestSupport_LIBRARIES})
> 
> if (WebCoreTestSupport_OUTPUT_NAME)
>diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
>index 856a005226d7d7a19b0cc64a98151eca7cf90056..9f82b4fcc344e3ff10820fce405371759ea94452 100644
>--- a/Source/WebCore/PlatformGTK.cmake
>+++ b/Source/WebCore/PlatformGTK.cmake
>@@ -214,7 +214,7 @@ include_directories(SYSTEM
> )
> 
> list(APPEND WebCoreTestSupport_LIBRARIES PRIVATE ${GTK_LIBRARIES})
>-list(APPEND WebCoreTestSupport_INCLUDE_DIRECTORIES ${GTK_INCLUDE_DIRS})
>+list(APPEND WebCoreTestSupport_SYSTEM_INCLUDE_DIRECTORIES ${GTK_INCLUDE_DIRS})
> 
> add_definitions(-DBUILDING_WEBKIT)
> 
>diff --git a/Source/WebCore/inspector/InspectorCanvas.cpp b/Source/WebCore/inspector/InspectorCanvas.cpp
>index e38f2dc34359c6caf2ed3c2cd46e12fd7ca304cf..87827535551b138642a4c3cbbe592428901f6452 100644
>--- a/Source/WebCore/inspector/InspectorCanvas.cpp
>+++ b/Source/WebCore/inspector/InspectorCanvas.cpp
>@@ -138,13 +138,16 @@ static bool shouldSnapshotBitmapRendererAction(const String& name)
>     return name == "transferFromImageBitmap";
> }
> 
>+#if ENABLE(WEBGL)
> static bool shouldSnapshotWebGLAction(const String& name)
> {
>     return name == "clear"
>         || name == "drawArrays"
>         || name == "drawElements";
> }
>+#endif
> 
>+#if ENABLE(WEBGL2)
> static bool shouldSnapshotWebGL2Action(const String& name)
> {
>     return name == "clear"
>@@ -153,6 +156,7 @@ static bool shouldSnapshotWebGL2Action(const String& name)
>         || name == "drawElements"
>         || name == "drawElementsInstanced";
> }
>+#endif
> 
> void InspectorCanvas::recordAction(const String& name, Vector<RecordCanvasActionVariant>&& parameters)
> {
>diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
>index a25dbd1abb909e84c6fe51b68ed414c7129da324..b062d0b954d741d378b883bd26435d3fcecfed83 100644
>--- a/Source/WebCore/rendering/RenderLayer.cpp
>+++ b/Source/WebCore/rendering/RenderLayer.cpp
>@@ -5500,7 +5500,7 @@ Ref<ClipRects> RenderLayer::updateClipRects(const ClipRectsContext& clipRectsCon
>     RefPtr<ClipRects> parentClipRects;
>     // For transformed layers, the root layer was shifted to be us, so there is no need to
>     // examine the parent. We want to cache clip rects with us as the root.
>-    if (auto* parentLayer = (clipRectsContext.rootLayer != this ? parent() : nullptr))
>+    if (clipRectsContext.rootLayer != this && parent())
>         parentClipRects = this->parentClipRects(clipRectsContext);
> 
>     auto clipRects = ClipRects::create();
>diff --git a/Source/WebKit/NetworkProcess/AdClickAttributionManager.cpp b/Source/WebKit/NetworkProcess/AdClickAttributionManager.cpp
>index 1f081b83172304dc29b18bbc815415055a6cc53c..1d7b133ebab690f035f3ac5b774272f7f5f7bd2c 100644
>--- a/Source/WebKit/NetworkProcess/AdClickAttributionManager.cpp
>+++ b/Source/WebKit/NetworkProcess/AdClickAttributionManager.cpp
>@@ -181,7 +181,11 @@ void AdClickAttributionManager::fireConversionRequest(const AdClickAttribution&
>     RELEASE_LOG_INFO_IF(debugModeEnabled(), AdClickAttribution, "About to fire an attribution request for a conversion.");
> 
>     m_pingLoadFunction(WTFMove(loadParameters), [](const WebCore::ResourceError& error, const WebCore::ResourceResponse& response) {
>+#if PLATFORM(COCOA)
>         RELEASE_LOG_ERROR_IF(!error.isNull(), AdClickAttribution, "Received error: '%{public}s' for ad click attribution request.", error.localizedDescription().utf8().data());
>+#else
>+        RELEASE_LOG_ERROR_IF(!error.isNull(), AdClickAttribution, "Received error: '%s' for ad click attribution request.", error.localizedDescription().utf8().data());
>+#endif
>         UNUSED_PARAM(response);
>         UNUSED_PARAM(error);
>     });
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index cef2eaa16c32fadff0f186fcedfda250eaefc56e..d7b929b96e92f21617b5d239bf40896b8ed5980f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-05-10  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Fix a bunch of compiler warnings
>+        https://bugs.webkit.org/show_bug.cgi?id=197785
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add preprocessor guards to avoid -Wunused-function warnings.
>+
>+        * TestWebKitAPI/Tests/WebCore/FloatRect.cpp:
>+        * TestWebKitAPI/Tests/WebCore/IntRect.cpp:
>+        * TestWebKitAPI/Tests/WebCore/TransformationMatrix.cpp:
>+
> 2019-05-10  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [WPE][GTK] Add webkit_frame_get_id() API
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/FloatRect.cpp b/Tools/TestWebKitAPI/Tests/WebCore/FloatRect.cpp
>index 30e6d7c6a88881cab24ce3f42bd773a593420baf..ef6db01efe6661bb6bd8fb7b2a4143c1de3c681c 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/FloatRect.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/FloatRect.cpp
>@@ -603,6 +603,7 @@ TEST(FloatRect, FitToPoints)
>     EXPECT_FLOAT_EQ(190.0f, rect.maxY());
> }
> 
>+#if USE(CG) || PLATFORM(WIN)
> static void checkCastRect(const WebCore::FloatRect& rect)
> {
>     EXPECT_FLOAT_EQ(10.0f, rect.x());
>@@ -612,6 +613,7 @@ static void checkCastRect(const WebCore::FloatRect& rect)
>     EXPECT_FLOAT_EQ(30.0f, rect.width());
>     EXPECT_FLOAT_EQ(40.0f, rect.height());
> }
>+#endif
> 
> TEST(FloatRect, Casting)
> {
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/IntRect.cpp b/Tools/TestWebKitAPI/Tests/WebCore/IntRect.cpp
>index 7392f06a7dccd0393e07dbf5070edbb5eefc03f0..0793eaa8af9764d3522bf177dd073b2b59b36a40 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/IntRect.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/IntRect.cpp
>@@ -481,6 +481,7 @@ TEST(IntRect, Transpose)
>     EXPECT_EQ(120, transposed.maxY());
> }
> 
>+#if USE(CG) || PLATFORM(WIN)
> static void checkCastRect(const WebCore::IntRect& rect)
> {
>     EXPECT_EQ(10, rect.x());
>@@ -490,6 +491,7 @@ static void checkCastRect(const WebCore::IntRect& rect)
>     EXPECT_EQ(30, rect.width());
>     EXPECT_EQ(40, rect.height());
> }
>+#endif
> 
> TEST(IntRect, Casting)
> {
>@@ -584,6 +586,7 @@ TEST(IntRect, Equality)
>     ASSERT_FALSE(rect == rightSide);
> }
> 
>+#if USE(CG)
> static void checkEnclosingIntRect(const WebCore::IntRect& rect)
> {
>     EXPECT_EQ(10, rect.x());
>@@ -593,6 +596,7 @@ static void checkEnclosingIntRect(const WebCore::IntRect& rect)
>     EXPECT_EQ(31, rect.width());
>     EXPECT_EQ(41, rect.height());
> }
>+#endif
> 
> TEST(IntRect, EnclosingIntRect)
> {
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/TransformationMatrix.cpp b/Tools/TestWebKitAPI/Tests/WebCore/TransformationMatrix.cpp
>index 79feecf654060dcfe85cc60563cb44edc447825d..197d213ee7a27c135a1463b4e958fbe02b52a079 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/TransformationMatrix.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/TransformationMatrix.cpp
>@@ -1187,6 +1187,7 @@ TEST(TransformationMatrix, Equality)
>     ASSERT_TRUE(test3 != test4);
> }
> 
>+#if USE(CA)
> static void testTranslationMatrix(const WebCore::TransformationMatrix& matrix)
> {
>     EXPECT_DOUBLE_EQ(1.0, matrix.m11());
>@@ -1206,6 +1207,7 @@ static void testTranslationMatrix(const WebCore::TransformationMatrix& matrix)
>     EXPECT_DOUBLE_EQ(30.0, matrix.m43());
>     EXPECT_DOUBLE_EQ(1.0, matrix.m44());
> }
>+#endif
> 
> TEST(TransformationMatrix, Casting)
> {

Actions: View | Formatted Diff | Diff

Attachments on bug 197785: 369563