cleanup

Author: intergalacticspacehighway

packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp

@@ -112,12 +112,12 @@ void ViewShadowNode::updateStateIfNeeded() {
   const auto& viewProps = static_cast<const ViewProps&>(*props_);
   const auto& backgroundImages = viewProps.backgroundImage;
 
-  std::vector<BackgroundImageRequest> newRequests;
+  std::vector<BackgroundImageURLRequest> newRequests;
   for (const auto& bgImage : backgroundImages) {
     if (std::holds_alternative<URLBackgroundImage>(bgImage)) {
       const auto& urlBgImage = std::get<URLBackgroundImage>(bgImage);
       if (!urlBgImage.uri.empty()) {
-        BackgroundImageRequest request;
+        BackgroundImageURLRequest request;
         request.imageSource.uri = urlBgImage.uri;
         if (urlBgImage.uri.find("__packager_asset") != std::string::npos) {
           request.imageSource.type = ImageSource::Type::Local;

packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.h

@@ -33,31 +33,14 @@ class ViewShadowNodeProps final : public ViewProps {
 /*
  * `ShadowNode` for <View> component.
  */
-class ViewShadowNode final
-    : public ConcreteViewShadowNode<
-          ViewComponentName,
-          ViewShadowNodeProps,
-          ViewEventEmitter,
-          ViewState> {
+class ViewShadowNode final : public ConcreteViewShadowNode<ViewComponentName, ViewShadowNodeProps, ViewEventEmitter, ViewState> {
  public:
-  ViewShadowNode(
-      const ShadowNodeFragment &fragment,
-      const ShadowNodeFamily::Shared &family,
-      ShadowNodeTraits traits);
+  ViewShadowNode(const ShadowNodeFragment &fragment, const ShadowNodeFamily::Shared &family, ShadowNodeTraits traits);
 
-  ViewShadowNode(
-      const ShadowNode &sourceShadowNode,
-      const ShadowNodeFragment &fragment);
+  ViewShadowNode(const ShadowNode &sourceShadowNode, const ShadowNodeFragment &fragment);
 
   void setImageManager(const std::shared_ptr<ImageManager> &imageManager);
 
-  static ViewState initialStateData(
-      const Props::Shared &props,
-      const ShadowNodeFamily::Shared & /*family*/,
-      const ComponentDescriptor &componentDescriptor) {
-    return {};
-  }
-
 #pragma mark - LayoutableShadowNode
 
   void layout(LayoutContext layoutContext) override;

packages/react-native/ReactCommon/react/renderer/components/view/ViewState.cpp

@@ -9,13 +9,9 @@
 
 namespace facebook::react {
 
-const std::vector<BackgroundImageRequest>& ViewState::getBackgroundImageRequests()
+const std::vector<BackgroundImageURLRequest>& ViewState::getBackgroundImageRequests()
     const {
   return backgroundImageRequests_;
 }
 
-bool ViewState::hasBackgroundImageRequests() const {
-  return !backgroundImageRequests_.empty();
-}
-
 } // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/components/view/ViewState.h

@@ -17,7 +17,7 @@
 
 namespace facebook::react {
 
-struct BackgroundImageRequest {
+struct BackgroundImageURLRequest {
   ImageSource imageSource{};
   std::shared_ptr<ImageRequest> imageRequest{};
 };
@@ -26,12 +26,10 @@ class ViewState final {
  public:
   ViewState() = default;
 
-  explicit ViewState(std::vector<BackgroundImageRequest> backgroundImageRequests)
+  explicit ViewState(std::vector<BackgroundImageURLRequest> backgroundImageRequests)
       : backgroundImageRequests_(std::move(backgroundImageRequests)) {}
 
-  const std::vector<BackgroundImageRequest>& getBackgroundImageRequests() const;
-
-  bool hasBackgroundImageRequests() const;
+  const std::vector<BackgroundImageURLRequest>& getBackgroundImageRequests() const;
 
 #ifdef ANDROID
   ViewState(const ViewState& previousState, folly::dynamic data) {}
@@ -42,7 +40,7 @@ class ViewState final {
 #endif
 
  private:
-  std::vector<BackgroundImageRequest> backgroundImageRequests_;
+  std::vector<BackgroundImageURLRequest> backgroundImageRequests_;
 };
 
 } // namespace facebook::react