mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: pass base::Value by value in JS API implementations (#20809)

Browse source 
* refactor: move the arg instead of const reference it

* refactor: avoid unnecessary copies of base::Value in arg

* refactor: pass-by-value in dict_util

* refactor: avoid unnecessary reference
This commit is contained in:
Cheng Zhao 2019-10-30 14:30:59 +09:00 • committed by GitHub
parent c03ed6d3a1
commit 0ab9cc30d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 108 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shell/browser/mac/atom_application.mm
View file

@ -117,12 +117,14 @@ inline void dispatch_sync_main(dispatch_block_t block) {
dispatch_sync_main(^{
std::string activity_type(
base::SysNSStringToUTF8(userActivity.activityType));
std::unique_ptr<base::DictionaryValue> user_info =
base::DictionaryValue user_info =
electron::NSDictionaryToDictionaryValue(userActivity.userInfo);
electron::Browser* browser = electron::Browser::Get();
shouldWait =
browser->UpdateUserActivityState(activity_type, *user_info) ? YES : NO;
browser->UpdateUserActivityState(activity_type, std::move(user_info))
? YES
: NO;
});
if (shouldWait) {
@ -144,11 +146,11 @@ inline void dispatch_sync_main(dispatch_block_t block) {
dispatch_async(dispatch_get_main_queue(), ^{
std::string activity_type(
base::SysNSStringToUTF8(userActivity.activityType));
std::unique_ptr<base::DictionaryValue> user_info =
base::DictionaryValue user_info =
electron::NSDictionaryToDictionaryValue(userActivity.userInfo);
electron::Browser* browser = electron::Browser::Get();
browser->UserActivityWasContinued(activity_type, *user_info);
browser->UserActivityWasContinued(activity_type, std::move(user_info));
});
[userActivity setNeedsSave:YES];
}

17
shell/browser/mac/atom_application_delegate.mm
View file

@ -60,10 +60,9 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
NSUserNotification* user_notification =
[notify userInfo][(id) @"NSApplicationLaunchUserNotificationKey"];
if (user_notification.userInfo != nil) {
std::unique_ptr<base::DictionaryValue> launch_info =
electron::NSDictionaryToDictionaryValue(user_notification.userInfo);
electron::Browser::Get()->DidFinishLaunching(*launch_info);
if (user_notification.userInfo) {
electron::Browser::Get()->DidFinishLaunching(
electron::NSDictionaryToDictionaryValue(user_notification.userInfo));
} else {
electron::Browser::Get()->DidFinishLaunching(base::DictionaryValue());
}
@ -108,13 +107,15 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
#endif
restorationHandler {
std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
std::unique_ptr<base::DictionaryValue> user_info =
electron::NSDictionaryToDictionaryValue(userActivity.userInfo);
if (!user_info)
if (!userActivity.userInfo)
return NO;
electron::Browser* browser = electron::Browser::Get();
return browser->ContinueUserActivity(activity_type, *user_info) ? YES : NO;
return browser->ContinueUserActivity(
activity_type,
electron::NSDictionaryToDictionaryValue(userActivity.userInfo))
? YES
: NO;
}
- (BOOL)application:(NSApplication*)application

10
shell/browser/mac/dict_util.h
View file

@ -5,8 +5,6 @@
#ifndef SHELL_BROWSER_MAC_DICT_UTIL_H_
#define SHELL_BROWSER_MAC_DICT_UTIL_H_
#include <memory>
#import <Foundation/Foundation.h>
namespace base {
@ -17,13 +15,9 @@ class DictionaryValue;
namespace electron {
NSArray* ListValueToNSArray(const base::ListValue& value);
std::unique_ptr<base::ListValue> NSArrayToListValue(NSArray* arr);
base::ListValue NSArrayToListValue(NSArray* arr);
NSDictionary* DictionaryValueToNSDictionary(const base::DictionaryValue& value);
std::unique_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
NSDictionary* dict);
base::DictionaryValue NSDictionaryToDictionaryValue(NSDictionary* dict);
} // namespace electron

65
shell/browser/mac/dict_util.mm
View file

@ -4,9 +4,7 @@
#include "shell/browser/mac/dict_util.h"
#include <memory>
#include <string>
#include <utility>
#include "base/json/json_writer.h"
#include "base/strings/sys_string_conversions.h"
@ -27,39 +25,30 @@ NSArray* ListValueToNSArray(const base::ListValue& value) {
return obj;
}
std::unique_ptr<base::ListValue> NSArrayToListValue(NSArray* arr) {
base::ListValue NSArrayToListValue(NSArray* arr) {
base::ListValue result;
if (!arr)
return nullptr;
return result;
auto result = std::make_unique<base::ListValue>();
for (id value in arr) {
if ([value isKindOfClass:[NSString class]]) {
result->AppendString(base::SysNSStringToUTF8(value));
result.AppendString(base::SysNSStringToUTF8(value));
} else if ([value isKindOfClass:[NSNumber class]]) {
const char* objc_type = [value objCType];
if (strcmp(objc_type, @encode(BOOL)) == 0 ||
strcmp(objc_type, @encode(char)) == 0)
result->AppendBoolean([value boolValue]);
result.AppendBoolean([value boolValue]);
else if (strcmp(objc_type, @encode(double)) == 0 ||
strcmp(objc_type, @encode(float)) == 0)
result->AppendDouble([value doubleValue]);
result.AppendDouble([value doubleValue]);
else
result->AppendInteger([value intValue]);
result.AppendInteger([value intValue]);
} else if ([value isKindOfClass:[NSArray class]]) {
std::unique_ptr<base::ListValue> sub_arr = NSArrayToListValue(value);
if (sub_arr)
result->Append(std::move(sub_arr));
else
result->Append(std::make_unique<base::Value>());
result.Append(NSArrayToListValue(value));
} else if ([value isKindOfClass:[NSDictionary class]]) {
std::unique_ptr<base::DictionaryValue> sub_dict =
NSDictionaryToDictionaryValue(value);
if (sub_dict)
result->Append(std::move(sub_dict));
else
result->Append(std::make_unique<base::Value>());
result.Append(NSDictionaryToDictionaryValue(value));
} else {
result->AppendString(base::SysNSStringToUTF8([value description]));
result.AppendString(base::SysNSStringToUTF8([value description]));
}
}
@ -80,47 +69,35 @@ NSDictionary* DictionaryValueToNSDictionary(
return obj;
}
std::unique_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
NSDictionary* dict) {
base::DictionaryValue NSDictionaryToDictionaryValue(NSDictionary* dict) {
base::DictionaryValue result;
if (!dict)
return nullptr;
return result;
auto result = std::make_unique<base::DictionaryValue>();
for (id key in dict) {
std::string str_key = base::SysNSStringToUTF8(
[key isKindOfClass:[NSString class]] ? key : [key description]);
id value = [dict objectForKey:key];
if ([value isKindOfClass:[NSString class]]) {
result->SetKey(str_key, base::Value(base::SysNSStringToUTF8(value)));
result.SetKey(str_key, base::Value(base::SysNSStringToUTF8(value)));
} else if ([value isKindOfClass:[NSNumber class]]) {
const char* objc_type = [value objCType];
if (strcmp(objc_type, @encode(BOOL)) == 0 ||
strcmp(objc_type, @encode(char)) == 0)
result->SetKey(str_key, base::Value([value boolValue]));
result.SetKey(str_key, base::Value([value boolValue]));
else if (strcmp(objc_type, @encode(double)) == 0 ||
strcmp(objc_type, @encode(float)) == 0)
result->SetKey(str_key, base::Value([value doubleValue]));
result.SetKey(str_key, base::Value([value doubleValue]));
else
result->SetKey(str_key, base::Value([value intValue]));
result.SetKey(str_key, base::Value([value intValue]));
} else if ([value isKindOfClass:[NSArray class]]) {
std::unique_ptr<base::ListValue> sub_arr = NSArrayToListValue(value);
if (sub_arr)
result->SetWithoutPathExpansion(str_key, std::move(sub_arr));
else
result->SetWithoutPathExpansion(str_key,
std::make_unique<base::Value>());
result.SetKey(str_key, NSArrayToListValue(value));
} else if ([value isKindOfClass:[NSDictionary class]]) {
std::unique_ptr<base::DictionaryValue> sub_dict =
NSDictionaryToDictionaryValue(value);
if (sub_dict)
result->SetWithoutPathExpansion(str_key, std::move(sub_dict));
else
result->SetWithoutPathExpansion(str_key,
std::make_unique<base::Value>());
result.SetKey(str_key, NSDictionaryToDictionaryValue(value));
} else {
result->SetKey(str_key,
base::Value(base::SysNSStringToUTF8([value description])));
result.SetKey(str_key,
base::Value(base::SysNSStringToUTF8([value description])));
}
}