Skip to content
Merged
Show file tree
Hide file tree
Changes from 122 commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
6bc640a
Localizable.xcstrings update
miasma13 Oct 30, 2025
9059a7c
Add newTabPageAutoconsentStats feature flag
miasma13 Oct 30, 2025
3d83895
Add AutoconsentTabExtension
miasma13 Oct 30, 2025
a84fddf
Initial implementation of the AutoconsentStats
miasma13 Oct 30, 2025
58a8585
Add publisher for AutoconsentManagedEvent
miasma13 Oct 31, 2025
4911cf2
Merge branch 'main' into michal/cpm-on-ntp-1-stats-collection
miasma13 Oct 31, 2025
e3b3aff
Don't introduce new type but rather reuse one
miasma13 Oct 31, 2025
1a90c43
Remove comment
miasma13 Oct 31, 2025
ba78000
Pass autoconsentStats into AutoconsentTabExtension
miasma13 Oct 31, 2025
a307e78
Record autoconsent action
miasma13 Nov 3, 2025
891d75d
Add new pixel
miasma13 Nov 3, 2025
aa4fe17
Add AutoconsentStatsTests
miasma13 Nov 4, 2025
7368272
Add missing implementation
miasma13 Nov 4, 2025
93a16fa
Merge branch 'main' into michal/cpm-on-ntp-1-stats-collection
miasma13 Nov 4, 2025
494bb02
Fix
miasma13 Nov 4, 2025
78ed612
Fire daily pixel
miasma13 Nov 4, 2025
240d218
Fix naming and tests
miasma13 Nov 4, 2025
a4b6cc8
Clear autoconsent stats on fire button
miasma13 Nov 4, 2025
b6e3383
Fix formatting
miasma13 Nov 4, 2025
06f7783
Update SharedPackages/BrowserServicesKit/Sources/AutoconsentStats/Aut…
miasma13 Nov 4, 2025
38ef0e2
Add feature flag gating logic
miasma13 Nov 4, 2025
48e3c86
Update pixel definitions
miasma13 Nov 4, 2025
46eec3c
Remove whitespace
ayoy Nov 4, 2025
4eecec2
Adjust range bucketing to avoid gaps
miasma13 Nov 5, 2025
c2b48e7
Update pixel definitions
miasma13 Nov 5, 2025
8c82149
Clean up
miasma13 Nov 5, 2025
347fc3b
Merge branch 'main' into michal/cpm-on-ntp-1-stats-collection
miasma13 Nov 5, 2025
168d406
Fix pixel definition
miasma13 Nov 5, 2025
d339086
Fix tests and lint errors
miasma13 Nov 5, 2025
f4c4926
Fix tests
miasma13 Nov 5, 2025
db56e70
Fix lint
miasma13 Nov 5, 2025
e9f23d2
Add missing framework
miasma13 Nov 5, 2025
ba9bf1a
Update pixel trigger
miasma13 Nov 5, 2025
fd71dba
Merge branch 'main' into michal/cpm-on-ntp-1-stats-collection
miasma13 Nov 5, 2025
2b221ef
Remove unused code
miasma13 Nov 6, 2025
b976ab7
Update public API and tests
miasma13 Nov 6, 2025
a03cecf
Add proper error handling
miasma13 Nov 6, 2025
952c9d8
Fix lint errors
miasma13 Nov 6, 2025
87cf995
Add cookiePopupBlocked property to HistoryEntry
miasma13 Nov 5, 2025
648acbe
BrowsingHistory changes to support new cookiePopupBlocked atribute in…
miasma13 Nov 5, 2025
cc104c0
macOS History changes to support new cookiePopupBlocked atribute in C…
miasma13 Nov 5, 2025
8fd72a3
Add cookiePopupBlocked API to HistoryCoordinator
miasma13 Nov 5, 2025
656c368
Update cookiePopupBlocked when blocked by CPM
miasma13 Nov 5, 2025
1c9d11e
Reset flag on fire button use
miasma13 Nov 5, 2025
77b5c9f
Add tests
miasma13 Nov 6, 2025
5726382
Fix missing protocol func
miasma13 Nov 6, 2025
25599da
Fix post-rebase issues
miasma13 Nov 6, 2025
7969743
Pass along the autoconsentStats
miasma13 Nov 17, 2025
d17f792
Pass the autoconsent stats value when feature is enabled
miasma13 Nov 18, 2025
40e67f7
Add publisher for stats changes
miasma13 Nov 18, 2025
9b3d3f7
Refresh NTP stats widget on autoconsent changes
miasma13 Nov 18, 2025
0ee091c
Pass cookiePopUpBlocked state for the domain
miasma13 Nov 18, 2025
03e4549
Clear autoconsent states only on full burn
miasma13 Nov 18, 2025
412557b
To Be Reverted: Temporary cusom CSS build
miasma13 Nov 18, 2025
f895048
Pass nil when CPM is disabled
miasma13 Nov 19, 2025
55b36be
Expand tests
miasma13 Nov 19, 2025
1a90c08
Fix tests
miasma13 Nov 19, 2025
7bd1f64
Revert "To Be Reverted: Temporary cusom CSS build"
miasma13 Nov 19, 2025
cbc09af
Merge branch 'main' into michal/cpm-on-ntp-2-cookie-popup-blocked
miasma13 Nov 19, 2025
7d5e72e
Undo changes
miasma13 Nov 19, 2025
8a0bd84
Merge branch 'main' into michal/cpm-on-ntp-2-cookie-popup-blocked
miasma13 Nov 19, 2025
7b9d773
Remove double extension registration
miasma13 Nov 19, 2025
7378cbf
Lint fixes
miasma13 Nov 19, 2025
39f8580
Fix isolation
miasma13 Nov 19, 2025
a4a7005
Fix tests
miasma13 Nov 19, 2025
30bf68b
Remove tmporary pixel and AutoconsentDailyStats
miasma13 Nov 20, 2025
2bef7ce
Revert string change
miasma13 Nov 20, 2025
355b0b7
Add debug menu entries
miasma13 Nov 21, 2025
50a0fab
Add AutoconsentStatsPopoverCoordinator
miasma13 Nov 21, 2025
8ac0bdf
Update to how the popover is presented
miasma13 Nov 21, 2025
758eedf
Add check for not being on NTP
miasma13 Nov 21, 2025
04e6117
Add check for CPM being enabled
miasma13 Nov 21, 2025
40972de
Add check for feature flag
miasma13 Nov 21, 2025
26c4f60
Add check for privacy report being enabled
miasma13 Nov 21, 2025
87b7f3e
Merge branch 'main' into michal/cpm-on-ntp-4-dialog
miasma13 Nov 21, 2025
bbb4281
Enhance debug menu
miasma13 Nov 24, 2025
f6a6f60
Merge branch 'main' into michal/cpm-on-ntp-4-dialog
miasma13 Nov 24, 2025
d5bd8a9
Update popover icon
miasma13 Nov 24, 2025
346bb27
Dismiss the popover on a new tab
miasma13 Nov 24, 2025
6cdf60e
Temp C-S-S bump from a PR branch
miasma13 Nov 24, 2025
0eb7587
Fix serializing ProtectionsData
miasma13 Nov 25, 2025
fbde91c
Don't do click in ClickableView just propagate the click further
miasma13 Nov 26, 2025
483109a
Make PopoverMessageViewController generic
miasma13 Nov 26, 2025
50e8c87
Temp refactoring of popover
miasma13 Nov 27, 2025
254f779
Revert "Temp refactoring of popover"
miasma13 Nov 27, 2025
7e26452
Revert "Make PopoverMessageViewController generic"
miasma13 Nov 27, 2025
440ae68
Add featureDiscovery style for the popover
miasma13 Nov 27, 2025
41a8077
Resolve issues with handling click action on the popover view
miasma13 Nov 27, 2025
d21365e
Move actions to view model
miasma13 Nov 28, 2025
b49da7b
Renaming
miasma13 Nov 28, 2025
da4360b
Further reordering
miasma13 Nov 28, 2025
2b322e9
Add AutoconsentStatsPopoverPresenter
miasma13 Nov 28, 2025
8e29d47
Clean up
miasma13 Nov 28, 2025
82a6bb4
Fit the popover
miasma13 Nov 28, 2025
8e46f8b
Add new strings into UserText
miasma13 Nov 28, 2025
3dc0c8e
Add popover pixels
miasma13 Nov 28, 2025
756c77a
Revert "Temp C-S-S bump from a PR branch"
miasma13 Nov 28, 2025
7ff2b60
Temp C-S-S bump from draft branch
miasma13 Nov 28, 2025
6fa2623
Fix confusion with onClose and onDismiss callbacks
miasma13 Nov 28, 2025
5c819b7
Don't clear autoconsent stats on entity burn
miasma13 Nov 28, 2025
027c850
Merge branch 'main' into michal/cpm-on-ntp-4-dialog
miasma13 Dec 2, 2025
eb29623
Translations import
miasma13 Dec 2, 2025
638d02b
Merge branch 'main' into michal/cpm-on-ntp-4-dialog
miasma13 Dec 2, 2025
d2df467
Upate C-S-S
miasma13 Dec 2, 2025
e655e74
Reset C-S-S
miasma13 Dec 2, 2025
ea13289
Fix pixel definition triggers
miasma13 Dec 2, 2025
8cd3c78
Swift lint fixes
miasma13 Dec 2, 2025
e70a066
Add missing criteria for the popover
miasma13 Dec 2, 2025
33ddd09
String
miasma13 Dec 2, 2025
f9ab61f
Set popover seen flag when dissmissed via new tab
miasma13 Dec 2, 2025
b6db454
Fix onDismiss not being called
miasma13 Dec 2, 2025
736a3b3
Swift lint fixes
miasma13 Dec 2, 2025
3056948
Reset strings translation
miasma13 Dec 2, 2025
e587ada
Add translated strings
miasma13 Dec 2, 2025
4b23003
Reset unwanted changes
miasma13 Dec 2, 2025
705e586
Fix test to updated logic
miasma13 Dec 2, 2025
8dc61cf
Temp animation branch of C-S-S
miasma13 Dec 2, 2025
7534734
Add new message for requesting widget scrolling
miasma13 Dec 2, 2025
64e7efd
Expose scroller via app delegate
miasma13 Dec 2, 2025
616113e
Update tests
miasma13 Dec 2, 2025
7dbe493
Merge branch 'main' into michal/cpm-on-ntp-4-dialog
miasma13 Dec 2, 2025
4da4e00
Temp C-S-S bump
miasma13 Dec 3, 2025
37ed7c9
Merge branch 'main' into michal/cpm-on-ntp-4-dialog
miasma13 Dec 3, 2025
c342521
Add protocols
miasma13 Dec 3, 2025
60fd650
Temp C-S-S bump
miasma13 Dec 3, 2025
1abacdd
Add tests
miasma13 Dec 3, 2025
57214be
Fix swiftlint
miasma13 Dec 4, 2025
efef76c
Merge branch 'main' into michal/cpm-on-ntp-4-dialog
miasma13 Dec 4, 2025
692c911
Fix pixel params
miasma13 Dec 4, 2025
6fe2700
Adjust the timing
miasma13 Dec 4, 2025
dcaf63e
Update C-S-S to 12.4.0
miasma13 Dec 5, 2025
1b9b0fc
Fix view modifiers order
miasma13 Dec 5, 2025
199e863
Add weak capture
miasma13 Dec 5, 2025
75c9179
Add check for the onboarding being completed
miasma13 Dec 5, 2025
681e6ed
Add error logging
miasma13 Dec 5, 2025
0252c85
Update tests
miasma13 Dec 5, 2025
c8f49d8
Merge branch 'main' into michal/cpm-on-ntp-4-dialog
miasma13 Dec 5, 2025
e5c1dad
Merge branch 'main' into michal/cpm-on-ntp-4-dialog
miasma13 Dec 5, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -12314,7 +12314,7 @@ ul.messages {
}
});
}
async function getExpandedPerformanceMetrics() {
async function getExpandedPerformanceMetrics(timeoutMs = 500) {
try {
if (document.readyState !== "complete") {
return returnError("Document not ready");
Expand All @@ -12331,7 +12331,7 @@ ul.messages {
const fcp = paint.find((p) => p.name === "first-contentful-paint");
let largestContentfulPaint = null;
if (PerformanceObserver.supportedEntryTypes.includes("largest-contentful-paint")) {
largestContentfulPaint = await waitForLCP();
largestContentfulPaint = await waitForLCP(timeoutMs);
}
const totalResourceSize = resources.reduce((sum, r) => sum + (r.transferSize || 0), 0);
if (navigation) {
Expand Down Expand Up @@ -12552,7 +12552,8 @@ ul.messages {
}
}
async triggerExpandedPerformanceMetrics() {
const expandedPerformanceMetrics = await getExpandedPerformanceMetrics();
const permissableDelayMs = this.getFeatureSetting("expandedTimeoutMs") ?? 5e3;
const expandedPerformanceMetrics = await getExpandedPerformanceMetrics(permissableDelayMs);
this.messaging.notify("expandedPerformanceMetricsResult", expandedPerformanceMetrics);
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1995,7 +1995,7 @@ body:not([data-background-kind=default]) .TabSwitcher_tabSwitcher {
--background: rgba(255, 255, 255, 0.09);
}
.Protections_block {
margin-top: 32px;
margin-top: 16px;
}
.Protections_blockLegacy {
margin-top: 24px;
Expand Down Expand Up @@ -2090,6 +2090,7 @@ body:not([data-background-kind=default]) .TabSwitcher_tabSwitcher {
height: 16px;
display: inline-block;
vertical-align: middle;
margin-top: 2px;
}
.PrivacyStats_widgetExpander {
position: relative;
Expand Down Expand Up @@ -2958,7 +2959,7 @@ body:not([data-background-kind=default]) .TabSwitcher_tabSwitcher {
align-items: center;
gap: 6px;
padding: 8px 10px;
border-radius: 100px;
border-radius: 1000px;
background-color: var(--color-white-at-3);
border: 1px solid var(--color-white-at-12);
height: 20px;
Expand All @@ -2982,8 +2983,8 @@ body:not([data-background-kind=default]) .TabSwitcher_tabSwitcher {
white-space: nowrap;
}
[data-theme=light] .TickPill_tickPill {
background-color: var(--color-black-at-4);
border: 1px solid var(--color-black-at-12);
background-color: var(--color-black-at-1);
border: 1px solid var(--color-black-at-9);
}
[data-theme=light] .TickPill_text {
color: var(--color-black-at-84);
Expand Down
Loading
Loading