Skip to content
This repository was archived by the owner on Nov 18, 2025. It is now read-only.

Sync some internal changes upstream #453

Open
mtrea wants to merge 2 commits into
base: master
Choose a base branch
from
+369 −0
Open

Sync some internal changes upstream #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96eee93
Add support for tags.
mtrea Apr 6, 2023
d33ff4c
Implement merging of --enable/disable-features and --enable/disable-b…
mtrea Apr 6, 2023
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
159 changes: 159 additions & 0 deletions go/metadata/capabilities/capabilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"fmt"
"reflect"
"regexp"
"sort"
"strings"
)

Expand Down Expand Up @@ -725,6 +726,10 @@ func mergeLists(m1, m2 []interface{}) []interface{} {
// have prefix "--" or "-", then both same arguments in m1 and m2 will remain.
func mergeArgs(m1, m2 []interface{}) []interface{} {
m2Opts := map[string]bool{}
leftFeatures := []string{}
rightFeatures := []string{}
leftBlinkFeatures := []string{}
rightBlinkFeatures := []string{}

m2Copy := make([]interface{}, 0, len(m2))
for _, a := range m2 {
Expand All @@ -735,6 +740,15 @@ func mergeArgs(m1, m2 []interface{}) []interface{} {
}
if strings.HasPrefix(arg, "-") {
tokens := strings.Split(arg, "=")
// If config is "--enable/disable-features", we need to merge them with a specail algorithm, see function mergeFeatures.
if strings.Compare(tokens[0], "--enable-features") == 0 || strings.Compare(tokens[0], "--disable-features") == 0 {
rightFeatures = append(rightFeatures, arg)
continue
// If config is "--enable/disable-blink-features", we need to merge them with a specail algorithm, see function mergeFeatures.
} else if strings.Compare(tokens[0], "--enable-blink-features") == 0 || strings.Compare(tokens[0], "--disable-blink-features") == 0 {
rightBlinkFeatures = append(rightBlinkFeatures, arg)
continue
}
m2Opts[tokens[0]] = true
}
}
Expand All @@ -747,6 +761,13 @@ func mergeArgs(m1, m2 []interface{}) []interface{} {
if arg, ok := a.(string); ok {
if strings.HasPrefix(arg, "-") {
tokens := strings.Split(arg, "=")
if strings.Compare(tokens[0], "--enable-features") == 0 || strings.Compare(tokens[0], "--disable-features") == 0 {
leftFeatures = append(leftFeatures, arg)
continue
} else if strings.Compare(tokens[0], "--enable-blink-features") == 0 || strings.Compare(tokens[0], "--disable-blink-features") == 0 {
leftBlinkFeatures = append(leftBlinkFeatures, arg)
continue
}
// Skip options from m1 that are redefined in m2
if m2Opts[tokens[0]] {
continue
Expand All @@ -755,11 +776,149 @@ func mergeArgs(m1, m2 []interface{}) []interface{} {
}
nl = append(nl, a)
}
for _, v := range mergeFeatures("features", leftFeatures, rightFeatures) {
nl = append(nl, v)
}
for _, v := range mergeFeatures("blink-features", leftBlinkFeatures, rightBlinkFeatures) {
nl = append(nl, v)
}

nl = append(nl, m2Copy...)
return nl
}

// mergeFeatures extract four important sets from input and return merged features of "--enable/disable-features" or "--enable/disable-blink-features".
// An example:
// Left Args: Enable: f1, f2; Disable: f2, f3
// Right Args: Enable: f4; Disable: f1, f3
//
// 1) disable-features is union of left-hand and right-hand disabled features
// f2,f3 U f1,f3 = f1,f2,f3
// 2) enabled-features is union of left-hand and right-hand enabled features
// f1,f2 U f4 = f1,f2,f4
// 3) remove right-hand enabled features from disabled features
// f1,f2,f3 - f4 = f1,f2,f3
// 4) remove right-hand disabled features from enabled features
// f1,f2,f4 - f1,f3 = f2,f4
//
// Final result is: Enable: f1,f2,f3; Disable: f2, f4.
//
// Note: in this example, f2 will be kept in both sides, since chrome allow a feature to be enable and disabled as the same time.
// If this case happens, f2 will be considered disabled by default.
func mergeFeatures(argName string, leftFeatures []string, rightFeatures []string) []string {
result := []string{}
if len(leftFeatures) == 0 && len(rightFeatures) == 0 {
return result
} else if len(leftFeatures) == 0 {
result = append(result, rightFeatures...)
return result
} else if len(rightFeatures) == 0 {
result = append(result, leftFeatures...)
return result
}
enableLeftFeatures := map[string]bool{}
enableRightFeatures := map[string]bool{}
disableLeftFeatures := map[string]bool{}
disableRightFeatures := map[string]bool{}
for _, arg := range leftFeatures {
tokens := strings.Split(arg, "=")
if strings.Compare(tokens[0], "--enable-"+argName) == 0 && tokens[1] != "" {
features := strings.Split(tokens[1], ",")
for _, f := range features {
enableLeftFeatures[f] = true
}
} else if strings.Compare(tokens[0], "--disable-"+argName) == 0 && tokens[1] != "" {
features := strings.Split(tokens[1], ",")
for _, f := range features {
disableLeftFeatures[f] = true
}
}
}
for _, arg := range rightFeatures {
tokens := strings.Split(arg, "=")
if strings.Compare(tokens[0], "--enable-"+argName) == 0 {
// if right enable feature value is empty, then clear all enable features.
if tokens[1] == "" {
enableLeftFeatures = map[string]bool{}
continue
}
features := strings.Split(tokens[1], ",")
for _, f := range features {
enableRightFeatures[f] = true
}
} else if strings.Compare(tokens[0], "--disable-"+argName) == 0 {
// if right disable feature value is empty, then clear all disable features.
if tokens[1] == "" {
disableLeftFeatures = map[string]bool{}
continue
}
features := strings.Split(tokens[1], ",")
for _, f := range features {
disableRightFeatures[f] = true
}
}
}

result = append(result, mergeSingleTypeFeatures(argName, enableLeftFeatures, enableRightFeatures, disableLeftFeatures, disableRightFeatures)...)
return result
}

// mergeSingleTypeFeatures return merged result of one type of features, the input feature could be "--enable/disable-features" or "--enable/disable-blink-features".
func mergeSingleTypeFeatures(argName string, enableLeftFeatures map[string]bool, enableRightFeatures map[string]bool, disableLeftFeatures map[string]bool, disableRightFeatures map[string]bool) []string {
result := []string{}
enableFeatures := map[string]bool{}
disableFeatures := map[string]bool{}
// Step 1: union enable-features and union disable-features.
for f := range enableLeftFeatures {
enableFeatures[f] = true
}
for f := range enableRightFeatures {
enableFeatures[f] = true
}
for f := range disableLeftFeatures {
disableFeatures[f] = true
}
for f := range disableRightFeatures {
disableFeatures[f] = true
}
// Step 2: remove right-hand enabled features from unioned disabled features and remove right-hand disabled features from unioned enabled features.
for f := range enableRightFeatures {
if !disableRightFeatures[f] && disableFeatures[f] {
delete(disableFeatures, f)
}
}
for f := range disableRightFeatures {
if !enableRightFeatures[f] && enableFeatures[f] {
delete(enableFeatures, f)
}
}
// Step 3: generate final result with sorted features from union enable-features and union disable-features.
if len(enableFeatures) > 0 {
sortedEnableFeatures := []string{}
for f := range enableFeatures {
sortedEnableFeatures = append(sortedEnableFeatures, f)
}
sort.Strings(sortedEnableFeatures)
s := "--enable-" + argName + "="
for _, sf := range sortedEnableFeatures {
s = s + sf + ","
}
result = append(result, s[0:len(s)-1])
}
if len(disableFeatures) > 0 {
sortedDisableFeatures := []string{}
for f := range disableFeatures {
sortedDisableFeatures = append(sortedDisableFeatures, f)
}
sort.Strings(sortedDisableFeatures)
s := "--disable-" + argName + "="
for _, sf := range sortedDisableFeatures {
s = s + sf + ","
}
result = append(result, s[0:len(s)-1])
}
return result
}
// CanReuseSession returns true if the "google:canReuseSession" is set.
func CanReuseSession(caps *Capabilities) bool {
reuse, _ := caps.AlwaysMatch["google:canReuseSession"].(bool)
Expand Down
186 changes: 186 additions & 0 deletions go/metadata/capabilities/capabilities_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,192 @@ func TestMerge(t *testing.T) {
}
}

func TestMergeFeatures(t *testing.T) {
testCases := []struct {
name string
input1 map[string]interface{}
input2 map[string]interface{}
result map[string]interface{}
}{
{
name: "merge features that only exist on one side",
input1: map[string]interface{}{
"args": []interface{}{
"--enable-features=f1,f2",
},
},
input2: map[string]interface{}{
"args": []interface{}{
"--disable-blink-features=f3,f5",
},
},
result: map[string]interface{}{
"args": []interface{}{
"--enable-features=f1,f2",
"--disable-blink-features=f3,f5",
},
},
},
{
name: "merge only --enable-feature and disable-blink-feature",
input1: map[string]interface{}{
"args": []interface{}{
"--enable-features=f1,f2",
"--disable-blink-features=f3,f5",
},
},
input2: map[string]interface{}{
"args": []interface{}{
"--enable-features=f4",
"--disable-blink-features=f3,f5",
},
},
result: map[string]interface{}{
"args": []interface{}{
"--enable-features=f1,f2,f4",
"--disable-blink-features=f3,f5",
},
},
},
{
name: "merge --enable/disable-feature with a left hand side feature stated both in enable and disable, result should keep both if none of them is covered by right side args",
input1: map[string]interface{}{
"args": []interface{}{
"--enable-features=f1,f3",
"--disable-features=f3,f4",
},
},
input2: map[string]interface{}{
"args": []interface{}{
"--enable-features=f4",
"--disable-features=f1,f5",
},
},
result: map[string]interface{}{
"args": []interface{}{
"--enable-features=f3,f4",
"--disable-features=f1,f3,f5",
},
},
},
{
name: "merge --enable/disable-feature with a right hand side feature stated both in enable and disable, result should keep both",
input1: map[string]interface{}{
"args": []interface{}{
"--enable-features=f1,f2,f4",
"--disable-features=f3,f4",
},
},
input2: map[string]interface{}{
"args": []interface{}{
"--enable-features=f4",
"--disable-features=f4,f5",
},
},
result: map[string]interface{}{
"args": []interface{}{
"--enable-features=f1,f2,f4",
"--disable-features=f3,f4,f5",
},
},
},
{
name: "merge both --enable/disable-feature and --enable/disable-blink-feature",
input1: map[string]interface{}{
"args": []interface{}{
"--enable-features=f1,f2",
"--disable-features=f3,f4",
"--enable-blink-features=f1",
"--disable-blink-features=f3",
},
},
input2: map[string]interface{}{
"args": []interface{}{
"--enable-features=f4",
"--disable-features=f1,f5",
"--enable-blink-features=f3",
"--disable-blink-features=f1",
},
},
result: map[string]interface{}{
"args": []interface{}{
"--enable-features=f2,f4",
"--disable-features=f1,f3,f5",
"--enable-blink-features=f3",
"--disable-blink-features=f1",
},
},
},
{
name: "merge only --enable/disable-feature with a feature stated twice in one place",
input1: map[string]interface{}{
"args": []interface{}{
"--enable-features=f1,f1,f2",
"--disable-features=f3",
},
},
input2: map[string]interface{}{
"args": []interface{}{
"--enable-features=f4",
"--disable-features=f3",
},
},
result: map[string]interface{}{
"args": []interface{}{
"--enable-features=f1,f2,f4",
"--disable-features=f3",
},
},
},
{
name: "merge only --enable-feature with a feature has empty value",
input1: map[string]interface{}{
"args": []interface{}{
"--enable-features=",
},
},
input2: map[string]interface{}{
"args": []interface{}{
"--enable-features=f4,f1",
},
},
result: map[string]interface{}{
"args": []interface{}{
"--enable-features=f1,f4",
},
},
},
{
name: "merge only --enable-feature with a feature has empty value on the right",
input1: map[string]interface{}{
"args": []interface{}{
"--enable-features=f1,f4",
"--disable-features=f1,f3",
},
},
input2: map[string]interface{}{
"args": []interface{}{
"--enable-features=",
"--disable-features=f2,f5",
},
},
result: map[string]interface{}{
"args": []interface{}{
"--disable-features=f1,f2,f3,f5",
},
},
},
}

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
if result := Merge(tc.input1, tc.input2); !reflect.DeepEqual(tc.result, result) {
t.Errorf("Got Merge(%+v, %+v) == %+v, expected %+v", tc.input1, tc.input2, result, tc.result)
}
})
}
}

func TestFromNewSessionArgs(t *testing.T) {
testCases := []struct {
name string
Expand Down
Loading