diff --git a/engine/src/flutter/flow/layers/layer.h b/engine/src/flutter/flow/layers/layer.h index 8e549e0c5c9..8b551b694de 100644 --- a/engine/src/flutter/flow/layers/layer.h +++ b/engine/src/flutter/flow/layers/layer.h @@ -13,7 +13,6 @@ #include "glue/trace_event.h" #include "lib/ftl/logging.h" #include "lib/ftl/macros.h" -#include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkColorFilter.h" diff --git a/engine/src/flutter/flow/raster_cache.h b/engine/src/flutter/flow/raster_cache.h index f1263ebd412..a76d7264b9b 100644 --- a/engine/src/flutter/flow/raster_cache.h +++ b/engine/src/flutter/flow/raster_cache.h @@ -10,7 +10,6 @@ #include "flow/instrumentation.h" #include "lib/ftl/macros.h" -#include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkSize.h" diff --git a/engine/src/flutter/skia/BUILD.gn b/engine/src/flutter/skia/BUILD.gn index 81e2f1db0ca..b99cb18a522 100644 --- a/engine/src/flutter/skia/BUILD.gn +++ b/engine/src/flutter/skia/BUILD.gn @@ -133,7 +133,6 @@ config("skia_config") { "SK_HAS_JPEG_LIBRARY", "SK_HAS_PNG_LIBRARY", ] - } # Internal-facing config for Skia library code. @@ -270,7 +269,6 @@ component("skia") { "ext/google_logging.cc", "ext/image_operations.cc", "ext/image_operations.h", - "ext/refptr.h", ] # The skia gypi values are relative to the skia_dir, so we need to rebase. @@ -280,7 +278,7 @@ component("skia") { sources += [ "//third_party/skia/src/ports/SkImageGenerator_skia.cpp", - + "//third_party/skia/src/codec/SkAndroidCodec.cpp", "//third_party/skia/src/codec/SkBmpCodec.cpp", "//third_party/skia/src/codec/SkBmpMaskCodec.cpp", diff --git a/engine/src/flutter/skia/config/SkUserConfig.h b/engine/src/flutter/skia/config/SkUserConfig.h index 8072755b708..2f61a7dc9fb 100644 --- a/engine/src/flutter/skia/config/SkUserConfig.h +++ b/engine/src/flutter/skia/config/SkUserConfig.h @@ -166,12 +166,6 @@ // ===== Begin Chrome-specific definitions ===== -#ifdef SK_DEBUG -#define SK_REF_CNT_MIXIN_INCLUDE "sk_ref_cnt_ext_debug.h" -#else -#define SK_REF_CNT_MIXIN_INCLUDE "sk_ref_cnt_ext_release.h" -#endif - #define SK_SCALAR_IS_FLOAT #undef SK_SCALAR_IS_FIXED diff --git a/engine/src/flutter/skia/config/sk_ref_cnt_ext_debug.h b/engine/src/flutter/skia/config/sk_ref_cnt_ext_debug.h deleted file mode 100644 index b2b66adba72..00000000000 --- a/engine/src/flutter/skia/config/sk_ref_cnt_ext_debug.h +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef SK_REF_CNT_EXT_DEBUG_H_ -#define SK_REF_CNT_EXT_DEBUG_H_ - -#ifdef SK_REF_CNT_EXT_RELEASE_H_ -#error Only one SkRefCnt should be used. -#endif - -// Alternate implementation of SkRefCnt for Chromium debug builds -class SK_API SkRefCnt : public SkRefCntBase { -public: - SkRefCnt() : flags_(0) {} - void ref() const { SkASSERT(flags_ != AdoptionRequired_Flag); SkRefCntBase::ref(); } - void adopted() const { flags_ |= Adopted_Flag; } - void requireAdoption() const { flags_ |= AdoptionRequired_Flag; } - void deref() const { SkRefCntBase::unref(); } -private: - enum { - Adopted_Flag = 0x1, - AdoptionRequired_Flag = 0x2, - }; - - mutable int flags_; -}; - -// Bootstrap for Blink's WTF::RefPtr - -namespace WTF { - inline void adopted(const SkRefCnt* object) { - if (!object) - return; - object->adopted(); - } - inline void requireAdoption(const SkRefCnt* object) { - if (!object) - return; - object->requireAdoption(); - } -}; - -using WTF::adopted; -using WTF::requireAdoption; - -#endif - diff --git a/engine/src/flutter/skia/config/sk_ref_cnt_ext_release.h b/engine/src/flutter/skia/config/sk_ref_cnt_ext_release.h deleted file mode 100644 index 7736c84cf7e..00000000000 --- a/engine/src/flutter/skia/config/sk_ref_cnt_ext_release.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef SK_REF_CNT_EXT_RELEASE_H_ -#define SK_REF_CNT_EXT_RELEASE_H_ - -#ifdef SK_REF_CNT_EXT_DEBUG_H_ -#error Only one SkRefCnt should be used. -#endif - -// Alternate implementation of SkRefCnt for Chromium release builds -class SK_API SkRefCnt : public SkRefCntBase { -public: - void deref() const { SkRefCntBase::unref(); } -}; - -#endif -