commit 6448ec390df58c7da331444fe575c75dc98c012f
author Brian Osman <brianosman@google.com> Wed Jun 16 14:03:46 2021 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jun 16 14:03:58 2021 +0000
tree 238c68179bababf3040437f327b9a1b15d8fee72
parent b9c9829fd6c7905d5ad4c873777c0e7b1820a9fd

Revert "Fix more new Clang warnings"

This reverts commit 3d5483a5474521b52896410c6648fe2513d47a4d.

Reason for revert: Android roll.

Original change's description:
> Fix more new Clang warnings
>
> Change-Id: I82a13744669a6b5c23e23e6a719ec79878114dab
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/418697
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Kevin Lubick <kjlubick@google.com>

TBR=kjlubick@google.com,brianosman@google.com

Change-Id: I2032ee5efdb297b7cfdbe60ff2546305ef96ea57
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/418937
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

modules/skparagraph/src/Run.h

diff --git a/modules/skparagraph/src/Run.h b/modules/skparagraph/src/Run.h
index 2eee6d0..193de70 100644
--- a/modules/skparagraph/src/Run.h
+++ b/modules/skparagraph/src/Run.h
@@ -279,7 +279,6 @@
 
     Cluster(TextRange textRange) : fTextRange(textRange), fGraphemeRange(EMPTY_RANGE) { }
 
-    Cluster(const Cluster&) = default;
     ~Cluster() = default;
 
     SkScalar sizeToChar(TextIndex ch) const;

src/core/SkGlyphRunPainter.h

diff --git a/src/core/SkGlyphRunPainter.h b/src/core/SkGlyphRunPainter.h
index bd29860..e1505f0 100644
--- a/src/core/SkGlyphRunPainter.h
+++ b/src/core/SkGlyphRunPainter.h
@@ -67,8 +67,6 @@
 
     class BitmapDevicePainter {
     public:
-        BitmapDevicePainter() = default;
-        BitmapDevicePainter(const BitmapDevicePainter&) = default;
         virtual ~BitmapDevicePainter() = default;
 
         virtual void paintPaths(

src/utils/win/SkDWrite.cpp

diff --git a/src/utils/win/SkDWrite.cpp b/src/utils/win/SkDWrite.cpp
index 9847c41..26700fa 100644
--- a/src/utils/win/SkDWrite.cpp
+++ b/src/utils/win/SkDWrite.cpp
@@ -14,11 +14,6 @@
 
 #include <dwrite.h>
 
-#if defined(__clang__)
-    #pragma clang diagnostic push
-    #pragma clang diagnostic ignored "-Wcast-function-type"
-#endif
-
 static IDWriteFactory* gDWriteFactory = nullptr;
 
 static void release_dwrite_factory() {
@@ -131,8 +126,4 @@
     return S_OK;
 }
 
-#if defined(__clang__)
-    #pragma clang diagnostic pop
-#endif
-
 #endif//defined(SK_BUILD_FOR_WIN)

src/utils/win/SkWGL_win.cpp

diff --git a/src/utils/win/SkWGL_win.cpp b/src/utils/win/SkWGL_win.cpp
index c42277d..91ad84a 100644
--- a/src/utils/win/SkWGL_win.cpp
+++ b/src/utils/win/SkWGL_win.cpp
@@ -276,11 +276,6 @@
             SkASSERT(dummyGLRC);
             wglMakeCurrent(dummyDC, dummyGLRC);
 
-            #if defined(__clang__)
-                #pragma clang diagnostic push
-                #pragma clang diagnostic ignored "-Wcast-function-type"
-            #endif
-
             GET_PROC(GetExtensionsString, ARB);
             GET_PROC(ChoosePixelFormat, ARB);
             GET_PROC(GetPixelFormatAttribiv, ARB);
@@ -292,10 +287,6 @@
             GET_PROC(ReleasePbufferDC, ARB);
             GET_PROC(DestroyPbuffer, ARB);
 
-            #if defined(__clang__)
-                #pragma clang diagnostic pop
-            #endif
-
             wglMakeCurrent(dummyDC, nullptr);
             wglDeleteContext(dummyGLRC);
             destroy_dummy_window(dummyWND);