Skip to content

Move ImageSource debug helpers out of primitives.h (#58791) #58791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
j-piasecki wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move ImageSource debug helpers out of primitives.h (#58791) #58791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 80 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#include <react/renderer/imagemanager/primitives.h>

#if RN_DEBUG_STRING_CONVERTIBLE
#include <react/debug/react_native_assert.h>
#include <react/renderer/debug/debugStringConvertibleUtils.h>
#endif

namespace facebook::react {

#if RN_DEBUG_STRING_CONVERTIBLE
SharedDebugStringConvertibleList ImageSource::getDebugProps(
const std::string& prefix) const {
ImageSource imageSource{};

SharedDebugStringConvertibleList headersList;
for (const auto& header : headers) {
headersList.push_back(debugStringConvertibleItem(
prefix + "-header-" + header.first, header.second));
}

return headersList +
SharedDebugStringConvertibleList{
debugStringConvertibleItem(
prefix + "-type", toString(type), toString(imageSource.type)),
debugStringConvertibleItem(prefix + "-uri", uri, imageSource.uri),
debugStringConvertibleItem(
prefix + "-bundle", bundle, imageSource.bundle),
debugStringConvertibleItem(
prefix + "-scale", scale, imageSource.scale),
debugStringConvertibleItem(
prefix + "-size",
react::toString(size),
react::toString(imageSource.size)),
debugStringConvertibleItem(prefix + "-body", body, imageSource.body),
debugStringConvertibleItem(
prefix + "-method", method, imageSource.method),
debugStringConvertibleItem(
prefix + "-cache", toString(cache), toString(imageSource.cache)),
};
}

std::string ImageSource::toString(const Type& typeValue) const {
switch (typeValue) {
case ImageSource::Type::Invalid:
return "invalid";
case ImageSource::Type::Remote:
return "remote";
case ImageSource::Type::Local:
return "local";
default:
react_native_assert(false && "Invalid ImageSource::Type");
return "";
}
}

std::string ImageSource::toString(const CacheStategy& cacheValue) const {
switch (cacheValue) {
case ImageSource::CacheStategy::Default:
return "default";
case ImageSource::CacheStategy::Reload:
return "reload";
case ImageSource::CacheStategy::ForceCache:
return "force-cache";
case ImageSource::CacheStategy::OnlyIfCached:
return "only-if-cached";
default:
react_native_assert(false && "Invalid ImageSource::CacheStategy");
return "";
}
}
#endif

} // namespace facebook::react
57 changes: 3 additions & 54 deletions packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <React/Graphics.h>
#include <React/RendererCore.h>
#include <React/RendererDebug.h>
#include <react/renderer/debug/debugStringConvertibleUtils.h>

namespace facebook::react {

Expand Down Expand Up @@ -96,59 +95,9 @@ class ImageSource {
#endif

#if RN_DEBUG_STRING_CONVERTIBLE
SharedDebugStringConvertibleList getDebugProps(const std::string &prefix) const
{
ImageSource imageSource{};

SharedDebugStringConvertibleList headersList;
for (const auto &header : headers) {
headersList.push_back(debugStringConvertibleItem(prefix + "-header-" + header.first, header.second));
}

return headersList +
SharedDebugStringConvertibleList{
debugStringConvertibleItem(prefix + "-type", toString(type), toString(imageSource.type)),
debugStringConvertibleItem(prefix + "-uri", uri, imageSource.uri),
debugStringConvertibleItem(prefix + "-bundle", bundle, imageSource.bundle),
debugStringConvertibleItem(prefix + "-scale", scale, imageSource.scale),
debugStringConvertibleItem(prefix + "-size", react::toString(size), react::toString(imageSource.size)),
debugStringConvertibleItem(prefix + "-body", body, imageSource.body),
debugStringConvertibleItem(prefix + "-method", method, imageSource.method),
debugStringConvertibleItem(prefix + "-cache", toString(cache), toString(imageSource.cache)),
};
}

std::string toString(const Type &typeValue) const
{
switch (typeValue) {
case ImageSource::Type::Invalid:
return "invalid";
case ImageSource::Type::Remote:
return "remote";
case ImageSource::Type::Local:
return "local";
default:
react_native_assert(false && "Invalid ImageSource::Type");
return "";
}
}

std::string toString(const CacheStategy &cacheValue) const
{
switch (cacheValue) {
case ImageSource::CacheStategy::Default:
return "default";
case ImageSource::CacheStategy::Reload:
return "reload";
case ImageSource::CacheStategy::ForceCache:
return "force-cache";
case ImageSource::CacheStategy::OnlyIfCached:
return "only-if-cached";
default:
react_native_assert(false && "Invalid ImageSource::CacheStategy");
return "";
}
}
SharedDebugStringConvertibleList getDebugProps(const std::string &prefix) const;
std::string toString(const Type &typeValue) const;
std::string toString(const CacheStategy &cacheValue) const;
#endif
};

Expand Down
Loading