Browse Source

fix: misc-use-internal-linkage warnings (#44843)

* refactor: misc-use-internal-linkage warnings in context bridge

move impl functions into anonymous namespace so that they're not visible
to other compilation units:

- ExposeAPIInWorld()
- IsCalledFromMainWorld()
- OverrideGlobalPropertyFromIsolatedWorld()
- OverrideGlobalValueFromIsolatedWorld()
- TraceKeyPath()

* refactor: misc-use-internal-linkage warnings in skia util

move impl details into anonymous namespace so that they're not visible
to other compilation units:

- struct ScaleFactorPair
- kScaleFactorPairs[]
- GetScaleFactorFromPath()
- AddImageSkiaRepFromPath()

* refactor: misc-use-internal-linkage warnings in printing util

move impl details into anonymous namespace so that they're not visible
to other compilation units:

- GetFullPagePlugin()

* refactor: misc-use-internal-linkage warnings in blijnk converter

move impl details into anonymous namespace so that they're not visible
to other compilation units:

- GetKeyLocationCode()
- ModifiersToArray()

* refactor: misc-use-internal-linkage warnings in extrension system

move impl details into anonymous namespace so that they're not visible
to other compilation units:

- ParseManifest()

* refactor: misc-use-internal-linkage warnings in skia util

move impl details into anonymous namespace so that they're not visible
to other compilation units:

- GetFrameTokenMap()
- GetFrameTreeNodeIdMap()

* refactor: misc-use-internal-linkage warnings in electron_api_utility_process.cc

move impl details into anonymous namespace so that they're not visible
to other compilation units:

- GetAllUtilityProcessWrappers()

* refactor: misc-use-internal-linkage warnings in electron_api_menu

move impl details into anonymous namespace so that they're not visible
to other compilation units:

- InvokeBoolMethod()

* refactor: misc-use-internal-linkage warnings in platform util

move impl details into anonymous namespace so that they're not visible
to other compilation units:

- struct TrashItemResult
- TrashItemOnBlockingThread()
Charles Kerr 4 months ago
parent
commit
4a695d07c6

+ 4 - 0
shell/browser/api/electron_api_menu.cc

@@ -70,6 +70,8 @@ Menu::~Menu() {
   }
 }
 
+namespace {
+
 bool InvokeBoolMethod(const Menu* menu,
                       const char* method,
                       int command_id,
@@ -84,6 +86,8 @@ bool InvokeBoolMethod(const Menu* menu,
   return gin::ConvertFromV8(isolate, val, &ret) ? ret : default_value;
 }
 
+}  // namespace
+
 bool Menu::IsCommandIdChecked(int command_id) const {
   return InvokeBoolMethod(this, "_isCommandIdChecked", command_id);
 }

+ 4 - 0
shell/browser/api/electron_api_utility_process.cc

@@ -44,6 +44,8 @@
 
 namespace electron {
 
+namespace {
+
 base::IDMap<api::UtilityProcessWrapper*, base::ProcessId>&
 GetAllUtilityProcessWrappers() {
   static base::NoDestructor<
@@ -52,6 +54,8 @@ GetAllUtilityProcessWrappers() {
   return *s_all_utility_process_wrappers;
 }
 
+}  // namespace
+
 namespace api {
 
 gin::WrapperInfo UtilityProcessWrapper::kWrapperInfo = {

+ 4 - 0
shell/browser/api/electron_api_web_frame_main.cc

@@ -100,6 +100,8 @@ using FrameTreeNodeIdMap = std::unordered_map<content::FrameTreeNodeId,
 using FrameTokenMap =
     std::map<content::GlobalRenderFrameHostToken, WebFrameMain*>;
 
+namespace {
+
 FrameTreeNodeIdMap& GetFrameTreeNodeIdMap() {
   static base::NoDestructor<FrameTreeNodeIdMap> instance;
   return *instance;
@@ -109,6 +111,8 @@ FrameTokenMap& GetFrameTokenMap() {
   return *instance;
 }
 
+}  // namespace
+
 // static
 WebFrameMain* WebFrameMain::FromFrameTreeNodeId(
     content::FrameTreeNodeId frame_tree_node_id) {

+ 4 - 0
shell/browser/extensions/electron_extension_system.cc

@@ -87,6 +87,8 @@ void ElectronExtensionSystem::InitForRegularProfile(bool extensions_enabled) {
   management_policy_ = std::make_unique<ManagementPolicy>();
 }
 
+namespace {
+
 std::unique_ptr<base::Value::Dict> ParseManifest(
     const std::string_view manifest_contents) {
   JSONStringValueDeserializer deserializer(manifest_contents);
@@ -100,6 +102,8 @@ std::unique_ptr<base::Value::Dict> ParseManifest(
   return std::make_unique<base::Value::Dict>(std::move(*manifest).TakeDict());
 }
 
+}  // namespace
+
 void ElectronExtensionSystem::LoadComponentExtensions() {
   std::string utf8_error;
 #if BUILDFLAG(ENABLE_PDF_VIEWER)

+ 4 - 0
shell/browser/printing/printing_utils.cc

@@ -79,6 +79,8 @@ bool IsDeviceNameValid(const std::u16string& device_name) {
 #endif
 }
 
+namespace {
+
 // Duplicated from chrome/browser/printing/print_view_manager_common.cc
 content::RenderFrameHost* GetFullPagePlugin(content::WebContents* contents) {
   content::RenderFrameHost* full_page_plugin = nullptr;
@@ -98,6 +100,8 @@ content::RenderFrameHost* GetFullPagePlugin(content::WebContents* contents) {
   return full_page_plugin;
 }
 
+}  // namespace
+
 // Pick the right RenderFrameHost based on the WebContents.
 // Modified from chrome/browser/printing/print_view_manager_common.cc
 content::RenderFrameHost* GetRenderFrameHostToUse(

+ 8 - 0
shell/common/gin_converters/blink_converter.cc

@@ -201,6 +201,8 @@ struct Converter<blink::WebInputEvent::Modifiers> {
   }
 };
 
+namespace {
+
 std::vector<std::string_view> ModifiersToArray(int modifiers) {
   std::vector<std::string_view> modifier_strings;
 
@@ -211,6 +213,8 @@ std::vector<std::string_view> ModifiersToArray(int modifiers) {
   return modifier_strings;
 }
 
+}  // namespace
+
 blink::WebInputEvent::Type GetWebInputEventType(v8::Isolate* isolate,
                                                 v8::Local<v8::Value> val) {
   blink::WebInputEvent::Type type = blink::WebInputEvent::Type::kUndefined;
@@ -301,6 +305,8 @@ bool Converter<blink::WebKeyboardEvent>::FromV8(v8::Isolate* isolate,
   return true;
 }
 
+namespace {
+
 int GetKeyLocationCode(const blink::WebInputEvent& key) {
   // https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/core/events/keyboard_event.h;l=46;drc=1ff6437e65b183e673b7b4f25060b74dc2ba5c37
   enum KeyLocationCode {
@@ -319,6 +325,8 @@ int GetKeyLocationCode(const blink::WebInputEvent& key) {
   return kDomKeyLocationStandard;
 }
 
+}  // namespace
+
 v8::Local<v8::Value> Converter<blink::WebKeyboardEvent>::ToV8(
     v8::Isolate* isolate,
     const blink::WebKeyboardEvent& in) {

+ 4 - 0
shell/common/platform_util.cc

@@ -13,6 +13,8 @@
 
 namespace platform_util {
 
+namespace {
+
 struct TrashItemResult {
   bool success;
   std::string error;
@@ -24,6 +26,8 @@ TrashItemResult TrashItemOnBlockingThread(const base::FilePath& full_path) {
   return {success, error};
 }
 
+}  // namespace
+
 void TrashItem(const base::FilePath& full_path,
                base::OnceCallback<void(bool, const std::string&)> callback) {
   // XXX: is continue_on_shutdown right?

+ 18 - 14
shell/common/skia_util.cc

@@ -29,6 +29,8 @@
 
 namespace electron::util {
 
+namespace {
+
 struct ScaleFactorPair {
   const char* name;
   float scale;
@@ -55,6 +57,22 @@ float GetScaleFactorFromPath(const base::FilePath& path) {
   return 1.0f;
 }
 
+bool AddImageSkiaRepFromPath(gfx::ImageSkia* image,
+                             const base::FilePath& path,
+                             double scale_factor) {
+  std::string file_contents;
+  {
+    electron::ScopedAllowBlockingForElectron allow_blocking;
+    if (!asar::ReadFileToString(path, &file_contents))
+      return false;
+  }
+
+  return AddImageSkiaRepFromBuffer(image, base::as_byte_span(file_contents), 0,
+                                   0, scale_factor);
+}
+
+}  // namespace
+
 bool AddImageSkiaRepFromPNG(gfx::ImageSkia* image,
                             const base::span<const uint8_t> data,
                             double scale_factor) {
@@ -114,20 +132,6 @@ bool AddImageSkiaRepFromBuffer(gfx::ImageSkia* image,
   return true;
 }
 
-bool AddImageSkiaRepFromPath(gfx::ImageSkia* image,
-                             const base::FilePath& path,
-                             double scale_factor) {
-  std::string file_contents;
-  {
-    electron::ScopedAllowBlockingForElectron allow_blocking;
-    if (!asar::ReadFileToString(path, &file_contents))
-      return false;
-  }
-
-  return AddImageSkiaRepFromBuffer(image, base::as_byte_span(file_contents), 0,
-                                   0, scale_factor);
-}
-
 bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
                                    const base::FilePath& path) {
   bool succeed = false;

+ 4 - 0
shell/renderer/api/electron_api_context_bridge.cc

@@ -659,6 +659,8 @@ v8::MaybeLocal<v8::Object> CreateProxyForAPI(
   }
 }
 
+namespace {
+
 void ExposeAPIInWorld(v8::Isolate* isolate,
                       const int world_id,
                       const std::string& key,
@@ -819,6 +821,8 @@ bool IsCalledFromMainWorld(v8::Isolate* isolate) {
   return isolate->GetCurrentContext() == main_context;
 }
 
+}  // namespace
+
 }  // namespace api
 
 }  // namespace electron