External sizes

ci/licenses_golden/licenses_flutter

@@ -1058,7 +1058,6 @@ FILE: ../../../flutter/lib/ui/painting/single_frame_codec.h
 FILE: ../../../flutter/lib/ui/painting/single_frame_codec_unittests.cc
 FILE: ../../../flutter/lib/ui/painting/vertices.cc
 FILE: ../../../flutter/lib/ui/painting/vertices.h
-FILE: ../../../flutter/lib/ui/painting/vertices_unittests.cc
 FILE: ../../../flutter/lib/ui/platform_dispatcher.dart
 FILE: ../../../flutter/lib/ui/plugins.dart
 FILE: ../../../flutter/lib/ui/plugins/callback_cache.cc

lib/ui/BUILD.gn

@@ -228,7 +228,6 @@ if (enable_unittests) {
       "painting/image_generator_registry_unittests.cc",
       "painting/path_unittests.cc",
       "painting/single_frame_codec_unittests.cc",
-      "painting/vertices_unittests.cc",
       "semantics/semantics_update_builder_unittests.cc",
       "window/platform_configuration_unittests.cc",
       "window/platform_message_response_dart_unittests.cc",

lib/ui/painting/image.cc

@@ -39,10 +39,4 @@ void CanvasImage::dispose() {
   ClearDartWrapper();
 }
 
-size_t CanvasImage::GetAllocationSize() const {
-  // We don't actually want Dart's GC to use the size of this object to make GC
-  // decisions, as it is generally both created and disposed in the framework.
-  // This is similar to why we do not report the sizes of engine layers.
-  return sizeof(*this);
-}
 }  // namespace flutter

lib/ui/painting/image.h

@@ -37,8 +37,6 @@ class CanvasImage final : public RefCountedDartWrappable<CanvasImage> {
 
   void set_image(sk_sp<DlImage> image) { image_ = image; }
 
-  size_t GetAllocationSize() const override;
-
  private:
   CanvasImage();
 

lib/ui/painting/image_descriptor.h

@@ -114,10 +114,6 @@ class ImageDescriptor : public RefCountedDartWrappable<ImageDescriptor> {
     ClearDartWrapper();
   }
 
-  size_t GetAllocationSize() const override {
-    return sizeof(ImageDescriptor) + sizeof(SkImageInfo) + buffer_->size();
-  }
-
  private:
   ImageDescriptor(sk_sp<SkData> buffer,
                   const SkImageInfo& image_info,

lib/ui/painting/image_encoding_unittests.cc

@@ -125,7 +125,6 @@ TEST_F(ShellTest, EncodeImageAccessesSyncSwitch) {
         image_handle, tonic::DartWrappable::kPeerIndex, &peer);
     ASSERT_FALSE(Dart_IsError(result));
     CanvasImage* canvas_image = reinterpret_cast<CanvasImage*>(peer);
-    ASSERT_EQ(canvas_image->GetAllocationSize(), sizeof(*canvas_image));
 
     int64_t format = -1;
     result = Dart_IntegerToInt64(format_handle, &format);

lib/ui/painting/immutable_buffer.cc

@@ -77,10 +77,6 @@ Dart_Handle ImmutableBuffer::initFromAsset(Dart_Handle buffer_handle,
   return Dart_Null();
 }
 
-size_t ImmutableBuffer::GetAllocationSize() const {
-  return sizeof(ImmutableBuffer) + data_->size();
-}
-
 #if FML_OS_ANDROID
 
 // Compressed image buffers are allocated on the UI thread but are deleted on a

lib/ui/painting/immutable_buffer.h

@@ -75,8 +75,6 @@ class ImmutableBuffer : public RefCountedDartWrappable<ImmutableBuffer> {
     ClearDartWrapper();
   }
 
-  size_t GetAllocationSize() const override;
-
  private:
   explicit ImmutableBuffer(sk_sp<SkData> data) : data_(std::move(data)) {}
 

lib/ui/painting/path.cc

@@ -308,11 +308,4 @@ void CanvasPath::clone(Dart_Handle path_handle) {
   path->mutable_path() = this->path();
 }
 
-// This is doomed to be called too early, since Paths are mutable.
-// However, it can help for some of the clone/shift/transform type methods
-// where the resultant path will initially have a meaningful size.
-size_t CanvasPath::GetAllocationSize() const {
-  return sizeof(CanvasPath) + path().approximateBytesUsed();
-}
-
 }  // namespace flutter

lib/ui/painting/path.h

@@ -111,8 +111,6 @@ class CanvasPath : public RefCountedDartWrappable<CanvasPath> {
 
   const SkPath& path() const { return tracked_path_->path; }
 
-  size_t GetAllocationSize() const override;
-
  private:
   CanvasPath();
 

lib/ui/painting/picture.cc

@@ -81,14 +81,6 @@ void Picture::dispose() {
   ClearDartWrapper();
 }
 
-size_t Picture::GetAllocationSize() const {
-  if (auto display_list = display_list_.skia_object()) {
-    return display_list->bytes() + sizeof(Picture);
-  } else {
-    return sizeof(Picture);
-  }
-}
-
 Dart_Handle Picture::RasterizeToImage(sk_sp<DisplayList> display_list,
                                       uint32_t width,
                                       uint32_t height,

lib/ui/painting/picture.h

@@ -40,8 +40,6 @@ class Picture : public RefCountedDartWrappable<Picture> {
 
   void dispose();
 
-  size_t GetAllocationSize() const override;
-
   static void RasterizeToImageSync(sk_sp<DisplayList> display_list,
                                    uint32_t width,
                                    uint32_t height,

lib/ui/painting/single_frame_codec.cc

@@ -113,8 +113,4 @@ Dart_Handle SingleFrameCodec::getNextFrame(Dart_Handle callback_handle) {
   return Dart_Null();
 }
 
-size_t SingleFrameCodec::GetAllocationSize() const {
-  return sizeof(*this);
-}
-
 }  // namespace flutter

lib/ui/painting/single_frame_codec.h

@@ -32,9 +32,6 @@ class SingleFrameCodec : public Codec {
   // |Codec|
   Dart_Handle getNextFrame(Dart_Handle args) override;
 
-  // |DartWrappable|
-  size_t GetAllocationSize() const override;
-
  private:
   enum class Status { kNew, kInProgress, kComplete };
   Status status_;

lib/ui/painting/single_frame_codec_unittests.cc

@@ -26,7 +26,6 @@ TEST_F(ShellTest, SingleFrameCodecAccuratelyReportsSize) {
         handle, tonic::DartWrappable::kPeerIndex, &peer);
     ASSERT_FALSE(Dart_IsError(result));
     SingleFrameCodec* codec = reinterpret_cast<SingleFrameCodec*>(peer);
-    ASSERT_EQ(codec->GetAllocationSize(), sizeof(SingleFrameCodec));
   };
   auto finish = [message_latch](Dart_NativeArguments args) {
     message_latch->Signal();

lib/ui/painting/vertices.cc

@@ -80,13 +80,6 @@ bool Vertices::init(Dart_Handle vertices_handle,
   return true;
 }
 
-size_t Vertices::GetAllocationSize() const {
-  if (!vertices_) {
-    return sizeof(*this);
-  }
-  return vertices_->size();
-}
-
 void Vertices::dispose() {
   vertices_.reset();
   ClearDartWrapper();

lib/ui/painting/vertices.h

@@ -28,8 +28,6 @@ class Vertices : public RefCountedDartWrappable<Vertices> {
 
   const DlVertices* vertices() const { return vertices_.get(); }
 
-  size_t GetAllocationSize() const override;
-
   void dispose();
 
  private:

lib/ui/text/paragraph.cc

@@ -22,13 +22,6 @@ Paragraph::Paragraph(std::unique_ptr<txt::Paragraph> paragraph)
 
 Paragraph::~Paragraph() = default;
 
-size_t Paragraph::GetAllocationSize() const {
-  // We don't have an accurate accounting of the paragraph's memory consumption,
-  // so return a fixed size to indicate that its impact is more than the size
-  // of the Paragraph class.
-  return 2000;
-}
-
 double Paragraph::width() {
   return m_paragraph->GetMaxWidth();
 }

lib/ui/text/paragraph.h

@@ -49,8 +49,6 @@ class Paragraph : public RefCountedDartWrappable<Paragraph> {
   Dart_Handle getLineBoundary(unsigned offset);
   tonic::Float64List computeLineMetrics();
 
-  size_t GetAllocationSize() const override;
-
   void dispose();
 
  private:

third_party/tonic/dart_wrappable.cc

@@ -38,7 +38,7 @@ Dart_Handle DartWrappable::CreateDartWrapper(DartState* dart_state) {
   TONIC_DCHECK(!CheckAndHandleError(res));
 
   this->RetainDartWrappableReference();  // Balanced in FinalizeDartWrapper.
-  dart_wrapper_.Set(dart_state, wrapper, this, GetAllocationSize(),
+  dart_wrapper_.Set(dart_state, wrapper, this, sizeof(*this),
                     &FinalizeDartWrapper);
 
   return wrapper;
@@ -59,7 +59,7 @@ void DartWrappable::AssociateWithDartWrapper(Dart_Handle wrapper) {
   this->RetainDartWrappableReference();  // Balanced in FinalizeDartWrapper.
 
   DartState* dart_state = DartState::Current();
-  dart_wrapper_.Set(dart_state, wrapper, this, GetAllocationSize(),
+  dart_wrapper_.Set(dart_state, wrapper, this, sizeof(*this),
                     &FinalizeDartWrapper);
 }
 
@@ -78,10 +78,6 @@ void DartWrappable::FinalizeDartWrapper(void* isolate_callback_data,
   wrappable->ReleaseDartWrappableReference();  // Balanced in CreateDartWrapper.
 }
 
-size_t DartWrappable::GetAllocationSize() const {
-  return GetDartWrapperInfo().size_in_bytes;
-}
-
 Dart_PersistentHandle DartWrappable::GetTypeForWrapper(
     tonic::DartState* dart_state,
     const tonic::DartWrapperInfo& wrapper_info) {

third_party/tonic/dart_wrappable.h

@@ -34,11 +34,6 @@ class DartWrappable {
   // Implement using IMPLEMENT_WRAPPERTYPEINFO macro
   virtual const DartWrapperInfo& GetDartWrapperInfo() const = 0;
 
-  // Override this to customize the object size reported to the Dart garbage
-  // collector.
-  // Implement using IMPLEMENT_WRAPPERTYPEINFO macro
-  virtual size_t GetAllocationSize() const;
-
   virtual void RetainDartWrappableReference() const = 0;
 
   virtual void ReleaseDartWrappableReference() const = 0;
@@ -85,7 +80,6 @@ class DartWrappable {
       kDartWrapperInfo_##LibraryName_##ClassName = {            \
           #LibraryName,                                         \
           #ClassName,                                           \
-          sizeof(ClassName),                                    \
   };                                                            \
   const tonic::DartWrapperInfo& ClassName::dart_wrapper_info_ = \
       kDartWrapperInfo_##LibraryName_##ClassName;

third_party/tonic/dart_wrapper_info.h

@@ -15,7 +15,6 @@ typedef void (*DartWrappableAccepter)(DartWrappable*);
 struct DartWrapperInfo {
   const char* library_name;
   const char* interface_name;
-  const size_t size_in_bytes;
 
  private:
   DartWrapperInfo(const DartWrapperInfo&) = delete;