Merge remote-tracking branch 'origin/main' into dev/lalitm/etm-refactor

LalitMaganti · LalitMaganti · commit 95ee1c3a8c0a · 2026-03-30T13:33:45.000Z
diff --git a/test/data/ui-screenshots/debug_tracks.test.ts/debug-tracks-pivot/debug-track-pivot.png.sha256 b/test/data/ui-screenshots/debug_tracks.test.ts/debug-tracks-pivot/debug-track-pivot.png.sha256
@@ -1 +1 @@
-f789731ed69a7e2ba052af74d7710899a942e5b1888dd5e78c01b92dc146a0b2
+8a0f9b92ca0c9c5602c38f9561006c07481b1dcf97c5fdd61bf1a71c4a201739
diff --git a/test/data/ui-screenshots/debug_tracks.test.ts/debug-tracks/debug-slice-clicked.png.sha256 b/test/data/ui-screenshots/debug_tracks.test.ts/debug-tracks/debug-slice-clicked.png.sha256
@@ -1 +1 @@
-07df30a3209c2c3342f5b078b59055a49942140ba15f325c13ce9bed6007193e
+fc2c5f407de6788a9ace5c5633fb3d1268577c58d25b857f619a1f3d68877602
diff --git a/test/data/ui-screenshots/debug_tracks.test.ts/debug-tracks/debug-track-added.png.sha256 b/test/data/ui-screenshots/debug_tracks.test.ts/debug-tracks/debug-track-added.png.sha256
@@ -1 +1 @@
-da16b1767e9df679a472e9d06040469461f58aed314bee9237c62b8879ddc4f4
+fb083ec8d33029395bc569c63392f1265904013a944f5152b3cbea1d41a73822
diff --git a/test/data/ui-screenshots/debug_tracks.test.ts/debug-tracks/debug-track-removed.png.sha256 b/test/data/ui-screenshots/debug_tracks.test.ts/debug-tracks/debug-track-removed.png.sha256
@@ -1 +1 @@
-a21cdb4ea664ba33b61e661f4a2130563f64ff02236c92713de3730f2c796cb6
+714a9f8e39bb754359eb5f39aef3c5a9cb3ee0b8f30bad5a095ad735dfacfe64
diff --git a/test/data/ui-screenshots/ftrace_tracks_and_tab.test.ts/ftrace-tracks/ftrace-events.png.sha256 b/test/data/ui-screenshots/ftrace_tracks_and_tab.test.ts/ftrace-tracks/ftrace-events.png.sha256
@@ -1 +1 @@
-5096aa59bde6b60d15095494d6afe009c450caae077b62647d4af1aaeeb23d91
+5e37af91690e762b2d6ca358074e7369bcd8d1ac9acde18569a9a5c7d42c5796
diff --git a/test/data/ui-screenshots/independent_features.test.ts/debuggable-chip/track-with-debuggable-chip-expanded.png.sha256 b/test/data/ui-screenshots/independent_features.test.ts/debuggable-chip/track-with-debuggable-chip-expanded.png.sha256
@@ -1 +1 @@
-9d4611f95bdfbdb9b1adcbabb376f5ad45d523e298385b0c2682088e5131e3d9
+8c86f58a1b689943f271b09c34ed1a1ea5a92e957c5d2c8b58d14f687a972b03
diff --git a/test/data/ui-screenshots/independent_features.test.ts/debuggable-chip/track-with-debuggable-chip.png.sha256 b/test/data/ui-screenshots/independent_features.test.ts/debuggable-chip/track-with-debuggable-chip.png.sha256
@@ -1 +1 @@
-5c422d27ce6fb9363c9108801823886171270cbfddba234b1f0e5d51c6a90c4e
+f33a3bcf7b28fdb3ef6c68136533551fc0598abf6e8bb7c15074ebc607580673
diff --git a/test/data/ui-screenshots/kernel_trackevent.test.ts/kernel-trackevent-tracks/ftrace-kernel-trackevent.png.sha256 b/test/data/ui-screenshots/kernel_trackevent.test.ts/kernel-trackevent-tracks/ftrace-kernel-trackevent.png.sha256
@@ -1 +1 @@
-47064f84c562fda6b4dee388e481eb6be66776eb953e4e13c924829d1dcf83c7
+bc6b93a6b0fb47eef2d7f57bfa80261024143b658e30f51f4d7bc5297f626516
diff --git a/test/data/ui-screenshots/load_and_tracks.test.ts/info-and-stats/back-to-timeline.png.sha256 b/test/data/ui-screenshots/load_and_tracks.test.ts/info-and-stats/back-to-timeline.png.sha256
@@ -1 +1 @@
-3b579e5a24ca14b19414e2bacf4c427f5b57a0c4cc3c7942aab8b67167bb0341
+ba10f08921dcc10f84618912e6df8307531f30b0b30b9f3f2bf0baa37e1a62c7
diff --git a/test/data/ui-screenshots/load_and_tracks.test.ts/load-trace/loaded.png.sha256 b/test/data/ui-screenshots/load_and_tracks.test.ts/load-trace/loaded.png.sha256
@@ -1 +1 @@
-3b579e5a24ca14b19414e2bacf4c427f5b57a0c4cc3c7942aab8b67167bb0341
+ba10f08921dcc10f84618912e6df8307531f30b0b30b9f3f2bf0baa37e1a62c7
diff --git a/test/data/ui-screenshots/load_and_tracks.test.ts/pin-tracks/one-track-pinned.png.sha256 b/test/data/ui-screenshots/load_and_tracks.test.ts/pin-tracks/one-track-pinned.png.sha256
@@ -1 +1 @@
-06e4150cdc9cbbc8e2549571c159be0dcab5972ff06b0d2a55c9c63e9cf4adad
+a327383f1e8a74d3b15d0dd0980e7c18d95d91f14ac408a8922eefa574d9c787
diff --git a/test/data/ui-screenshots/load_and_tracks.test.ts/pin-tracks/two-tracks-pinned.png.sha256 b/test/data/ui-screenshots/load_and_tracks.test.ts/pin-tracks/two-tracks-pinned.png.sha256
@@ -1 +1 @@
-b4b3c427244b08a78cfd6ee230fe3d6cd458bdc025a343ffb9fb5f34f93099d1
+c446ed55eae82a60b1ba07c412111aab1e07f7a42cf85718e7289d84a375ba0a
diff --git a/test/data/ui-screenshots/load_and_tracks.test.ts/track-expand-and-collapse/traced-probes-compressed.png.sha256 b/test/data/ui-screenshots/load_and_tracks.test.ts/track-expand-and-collapse/traced-probes-compressed.png.sha256
@@ -1 +1 @@
-720c1f894ef786c9a76f076d24db886b6eff8ab8886d4cdee364288db997e9e1
+cdd69115847a290f0cc066c05b7793c049c77e8bdd2079d7d5b809a858d60d58
diff --git a/test/data/ui-screenshots/load_and_tracks.test.ts/track-expand-and-collapse/traced-probes-expanded.png.sha256 b/test/data/ui-screenshots/load_and_tracks.test.ts/track-expand-and-collapse/traced-probes-expanded.png.sha256
@@ -1 +1 @@
-7485abc4b951faac7932a439523f7e6a8f86e11d5fd70695deb9d7203d3aab08
+5b0a5cfec76f1aea5bb06bb18f8606e5e3265c74b86f0c78cf6de4a460964a78
diff --git a/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-AddDebugCounterTrack-command-test/after.png.sha256 b/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-AddDebugCounterTrack-command-test/after.png.sha256
@@ -1 +1 @@
-db4280b48049bbdec1150d69f9fc12f883f4ada8af8fb8bc553c012c7a36841b
+1d0407c59d2100bc9e5ce635473496239335054e0a7432ba76d49484be9c790d
diff --git a/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-AddDebugCounterTrackWithPivot-command-test/after.png.sha256 b/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-AddDebugCounterTrackWithPivot-command-test/after.png.sha256
@@ -1 +1 @@
-52915fa641f831f929fb5d654f23f25a8f1550db5e699266a330b44ea60892eb
+974f93ba88d08f71c30a6f5eabffc3b41166b5cf42cb0f5c5370ccd085c23e8f
diff --git a/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-AddDebugSliceTrack-command-test/after.png.sha256 b/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-AddDebugSliceTrack-command-test/after.png.sha256
@@ -1 +1 @@
-114fc66ad3bb008697e5666e258025cb27068d71f968d3210cc1506612851272
+a9768cb65e08cdd5d3e771cb193dfd0c9810dddf9a2dfd49bd085e42633a4ca3
diff --git a/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-AddDebugSliceTrackWithPivot-command-test/after.png.sha256 b/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-AddDebugSliceTrackWithPivot-command-test/after.png.sha256
@@ -1 +1 @@
-e7580cb0ad3faa3cba2cff9efc3913395fde4ce98df151346cb4df1c79b00810
+26aa8fd4707222a0310e1d885cb418b3aa79f733a856aee67d1eddf4db3ebb13
diff --git a/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-CollapseTracksByRegex-command-test/after.png.sha256 b/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-CollapseTracksByRegex-command-test/after.png.sha256
@@ -1 +1 @@
-2066ecf7afc1618d626ac0d4ba1feb08d720cf5f54750aa27a3d9528e0220b02
+8d7b4e4225630364accc54eea91877fcb336a6d807e26c1846c359d12a8d720d
diff --git a/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-CollapseTracksByRegex-with-explicit-name-filtering/after.png.sha256 b/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-CollapseTracksByRegex-with-explicit-name-filtering/after.png.sha256
@@ -1 +1 @@
-2066ecf7afc1618d626ac0d4ba1feb08d720cf5f54750aa27a3d9528e0220b02
+8d7b4e4225630364accc54eea91877fcb336a6d807e26c1846c359d12a8d720d
diff --git a/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-ExpandTracksByRegex-command-test/after.png.sha256 b/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-ExpandTracksByRegex-command-test/after.png.sha256
@@ -1 +1 @@
-b4ca570261ffd5c9da6ad7120af3b203b5c428948b417b7a5704236d4187e606
+fcaf10ee5230190847ccc9f12e3677b0821da93b53f846d901294088f9a2f658
diff --git a/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-ExpandTracksByRegex-with-explicit-name-filtering/after.png.sha256 b/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-ExpandTracksByRegex-with-explicit-name-filtering/after.png.sha256
@@ -1 +1 @@
-b4ca570261ffd5c9da6ad7120af3b203b5c428948b417b7a5704236d4187e606
+fcaf10ee5230190847ccc9f12e3677b0821da93b53f846d901294088f9a2f658
diff --git a/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-ExpandTracksByRegex-with-path-filtering/after.png.sha256 b/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-ExpandTracksByRegex-with-path-filtering/after.png.sha256
@@ -1 +1 @@
-b4ca570261ffd5c9da6ad7120af3b203b5c428948b417b7a5704236d4187e606
+fcaf10ee5230190847ccc9f12e3677b0821da93b53f846d901294088f9a2f658
diff --git a/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-PinTracksByRegex-command-test/after.png.sha256 b/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-PinTracksByRegex-command-test/after.png.sha256
@@ -1 +1 @@
-aece6e1de4c3e6be72b628a14e9c0d26d553a59ba70f304ba08b5e3c888236bd
+db0d871ab9360d4a0ce11d36e362700e0bfbf7f5f95baa4bdb78fc7905ed9b55
diff --git a/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-PinTracksByRegex-with-explicit-name-filtering/after.png.sha256 b/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-PinTracksByRegex-with-explicit-name-filtering/after.png.sha256
@@ -1 +1 @@
-aece6e1de4c3e6be72b628a14e9c0d26d553a59ba70f304ba08b5e3c888236bd
+db0d871ab9360d4a0ce11d36e362700e0bfbf7f5f95baa4bdb78fc7905ed9b55
diff --git a/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-PinTracksByRegex-with-path-filtering/after.png.sha256 b/test/data/ui-screenshots/startup_commands_allowlist.test.ts/dev-perfetto-PinTracksByRegex-with-path-filtering/after.png.sha256
@@ -1 +1 @@
-15f83cb299af7298ba79b8cf3c7427a34af3d605dba7fdef7fabd7f37bac316d
+c3cc6d26facf29428d22fc3f38bb022e70e15e652d5e143604d7618024931bb6
diff --git a/test/data/ui-screenshots/table_viewer.test.ts/Go-to-sched/go-to.png.sha256 b/test/data/ui-screenshots/table_viewer.test.ts/Go-to-sched/go-to.png.sha256
@@ -1 +1 @@
-5d2636ed4915fd81bee2fa8cb35659da8893f88f45b660ef6e70756c6df5f327
+0db0e6950d218aedf724ab508cf7597551c6ad0ff385d19f60cc109a149e1268
diff --git a/test/data/ui-screenshots/track_event_description.test.ts/Cpu-thread-scheduling-description/cpu-scheduling-description.png.sha256 b/test/data/ui-screenshots/track_event_description.test.ts/Cpu-thread-scheduling-description/cpu-scheduling-description.png.sha256
@@ -1 +1 @@
-fa410ed1a62e40cb7e3d3aaa2b3e3dd056d43ba811c63c80d6b4ccd438b73afa
+a1e9f20d6d3579384b01665b36dbaa64ef3d23a4287ef665dbb4fd08ae52ab45
diff --git a/test/data/ui-screenshots/track_event_description.test.ts/Ftrace-track-description/ftrace-description.png.sha256 b/test/data/ui-screenshots/track_event_description.test.ts/Ftrace-track-description/ftrace-description.png.sha256
@@ -1 +1 @@
-200a6d1460e99a8a078875202599e12b3c3386cf7cd3eb4274c184b5634d9a12
+4f76869dca82d7808f3e07f0c367cbe041452b0eb03e4640e64f1ea57b938fd7
diff --git a/test/data/ui-screenshots/wattson.test.ts/sched-aggregations/sched-aggr-process.png.sha256 b/test/data/ui-screenshots/wattson.test.ts/sched-aggregations/sched-aggr-process.png.sha256
@@ -1 +1 @@
-650fa6025074319da12868505192d29f24c6c0e387906edd2c822a3d647fbd6e
+781260383ef6aa0ad4cae8ce8ca907d646754ec089179d070cf2a56fe9eb6e56
diff --git a/test/data/ui-screenshots/wattson.test.ts/sched-aggregations/sched-aggr-thread.png.sha256 b/test/data/ui-screenshots/wattson.test.ts/sched-aggregations/sched-aggr-thread.png.sha256
@@ -1 +1 @@
-42c5e91b2d8ed8461ae140e95b36798bba47a9ae1533bf1868ccfa7fa54629b5
+ece71df358ddb25eb85217fa4f858ca173fe29b5692d0955708fe8fe8f50cb89
diff --git a/test/data/ui-screenshots/wattson.test.ts/wattson-aggregations/wattson-estimate-aggr.png.sha256 b/test/data/ui-screenshots/wattson.test.ts/wattson-aggregations/wattson-estimate-aggr.png.sha256
@@ -1 +1 @@
-5329b06846f771234f9e7a82facf774b250c6af2f1b6b7d641c03b35cd3b40d5
+a745036eed034401099891459afe81f08aa7b4891acdb5805349ac5ba5c0625a
diff --git a/test/data/ui-screenshots/zoom.test.ts/zoom-in/zoomed-in.png.sha256 b/test/data/ui-screenshots/zoom.test.ts/zoom-in/zoomed-in.png.sha256
@@ -1 +1 @@
-2ed5e9f19cfca707cd0a609117a32dfa70c88fcd6aabb86e46c96db6b94140d6
+3763523205f4944b799e06e1810551c8eb76caba68e3fcfbb2094b1830e41203
diff --git a/test/data/ui-screenshots/zoom.test.ts/zoom-out/zoomed-out.png.sha256 b/test/data/ui-screenshots/zoom.test.ts/zoom-out/zoomed-out.png.sha256
@@ -1 +1 @@
-a9e41cfad3ef4c2dc9c63f012d0f8d8b4da4643da86cb78820ecfb718ea87f82
+cebbc399d4ea0135a27583bc7b557a6b13499c864cf67b5c2ebdb9251fc77712
diff --git a/ui/src/base/gl/step_area.ts b/ui/src/base/gl/step_area.ts
@@ -266,6 +266,10 @@ export class StepAreaBatch {
 
     gl.useProgram(prog.program);
     gl.enable(gl.BLEND);
+    // Use MAX blending to prevent double-blend artifacts where overlapping
+    // quads (from min-width enforcement) would otherwise darken the fill.
+    // MAX is idempotent for identical fragments: max(0.6, 0.6) = 0.6.
+    gl.blendEquation(gl.MAX);
     gl.blendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
 
     // Set uniforms
@@ -306,6 +310,9 @@ export class StepAreaBatch {
     gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.quadIndexBuffer);
     gl.drawElementsInstanced(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_SHORT, 0, count);
 
+    // Restore default additive blend equation
+    gl.blendEquation(gl.FUNC_ADD);
+
     // Reset divisors
     gl.vertexAttribDivisor(prog.xLoc, 0);
     gl.vertexAttribDivisor(prog.nextXLoc, 0);
diff --git a/ui/src/core/analytics_impl.ts b/ui/src/core/analytics_impl.ts
@@ -61,7 +61,10 @@ function getReferrer(): string {
 
 // Interface exposed only to core (for the initialize method).
 export interface AnalyticsInternal extends Analytics {
-  initialize(isInternalUser: boolean): void;
+  addDimension(
+    arg: {key: string; value: string} | Promise<{key: string; value: string}>,
+  ): void;
+  initialize(): Promise<void>;
 }
 
 export function initAnalytics(
@@ -88,7 +91,10 @@ const gtagGlobals = window as {} as {
 };
 
 class NullAnalytics implements AnalyticsInternal {
-  initialize(_: boolean) {}
+  addDimension(
+    _arg: {key: string; value: string} | Promise<{key: string; value: string}>,
+  ) {}
+  async initialize() {}
   logEvent(_category: TraceCategories | null, _event: string) {}
   logError(_err: ErrorDetails) {}
   isEnabled(): boolean {
@@ -99,6 +105,8 @@ class NullAnalytics implements AnalyticsInternal {
 class AnalyticsImpl implements AnalyticsInternal {
   private initialized_ = false;
   private readonly analyticsId: string;
+  private readonly dimensions: Array<Promise<{key: string; value: string}>> =
+    [];
 
   constructor(analyticsId: string) {
     this.analyticsId = analyticsId;
@@ -121,10 +129,18 @@ class AnalyticsImpl implements AnalyticsInternal {
     gtagGlobals.gtag('js', new Date());
   }
 
-  // This is callled only after the script that sets isInternalUser loads.
+  addDimension(
+    arg: {key: string; value: string} | Promise<{key: string; value: string}>,
+  ) {
+    if (this.initialized_) {
+      throw new Error('Cannot add analytics dimensions after initialization');
+    }
+    this.dimensions.push(Promise.resolve(arg));
+  }
+
   // It is fine to call updatePath() and log*() functions before initialize().
   // The gtag() function internally enqueues all requests into |dataLayer|.
-  initialize(isInternalUser: boolean) {
+  async initialize() {
     if (this.initialized_) return;
     this.initialized_ = true;
     const script = document.createElement('script');
@@ -133,10 +149,15 @@ class AnalyticsImpl implements AnalyticsInternal {
     script.defer = true;
     document.head.appendChild(script);
     const route = window.location.href;
-    console.log(
-      `GA initialized. route=${route}`,
-      `isInternalUser=${isInternalUser}`,
-    );
+
+    // Await all dimension promises and build a map of extra dimensions.
+    const resolvedDimensions = await Promise.all(this.dimensions);
+    const extraDimensions: Record<string, string> = {};
+    for (const {key, value} of resolvedDimensions) {
+      extraDimensions[key] = value;
+    }
+
+    console.log(`GA initialized. route=${route}`);
     // GA's recommendation for SPAs is to disable automatic page views and
     // manually send page_view events. See:
     // https://developers.google.com/analytics/devguides/collection/gtagjs/pages#manual_pageviews
@@ -148,12 +169,12 @@ class AnalyticsImpl implements AnalyticsInternal {
       page_referrer: getReferrer(),
       send_page_view: false,
       page_title: PAGE_TITLE,
-      perfetto_is_internal_user: isInternalUser ? '1' : '0',
       perfetto_version: VERSION,
       // Release channel (canary, stable, autopush)
       perfetto_channel: getCurrentChannel(),
       // Referrer *if overridden* via the query string else empty string.
       perfetto_referrer_override: getReferrerOverride() ?? '',
+      ...extraDimensions,
     });
 
     gtagGlobals.gtag('event', 'page_view', {
diff --git a/ui/src/core/app_impl.ts b/ui/src/core/app_impl.ts
@@ -185,10 +185,12 @@ export class AppImpl implements App {
     return this._isInternalUser;
   }
 
-  set isInternalUser(value: boolean) {
-    localStorage.setItem('isInternalUser', value ? '1' : '0');
-    this._isInternalUser = value;
-    raf.scheduleFullRedraw();
+  setIsInternalUser(promise: Promise<boolean>) {
+    promise.then((value) => {
+      this._isInternalUser = value;
+      localStorage.setItem('isInternalUser', value ? '1' : '0');
+      raf.scheduleFullRedraw();
+    });
   }
 
   get trace(): TraceImpl | undefined {
diff --git a/ui/src/core_plugins/dev.perfetto.ExtensionServers/add_extension_server_modal.ts b/ui/src/core_plugins/dev.perfetto.ExtensionServers/add_extension_server_modal.ts
diff --git a/ui/src/core_plugins/dev.perfetto.ExtensionServers/extension_server_unittest.ts b/ui/src/core_plugins/dev.perfetto.ExtensionServers/extension_server_unittest.ts
diff --git a/ui/src/core_plugins/dev.perfetto.ExtensionServers/index.ts b/ui/src/core_plugins/dev.perfetto.ExtensionServers/index.ts
diff --git a/ui/src/core_plugins/dev.perfetto.ExtensionServers/types.ts b/ui/src/core_plugins/dev.perfetto.ExtensionServers/types.ts
diff --git a/ui/src/frontend/index.ts b/ui/src/frontend/index.ts
diff --git a/ui/src/frontend/is_internal_user_script_loader.ts b/ui/src/frontend/is_internal_user_script_loader.ts

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-f789731ed69a7e2ba052af74d7710899a942e5b1888dd5e78c01b92dc146a0b2`
	`1`	`+8a0f9b92ca0c9c5602c38f9561006c07481b1dcf97c5fdd61bf1a71c4a201739`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-07df30a3209c2c3342f5b078b59055a49942140ba15f325c13ce9bed6007193e`
	`1`	`+fc2c5f407de6788a9ace5c5633fb3d1268577c58d25b857f619a1f3d68877602`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-da16b1767e9df679a472e9d06040469461f58aed314bee9237c62b8879ddc4f4`
	`1`	`+fb083ec8d33029395bc569c63392f1265904013a944f5152b3cbea1d41a73822`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-a21cdb4ea664ba33b61e661f4a2130563f64ff02236c92713de3730f2c796cb6`
	`1`	`+714a9f8e39bb754359eb5f39aef3c5a9cb3ee0b8f30bad5a095ad735dfacfe64`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-5096aa59bde6b60d15095494d6afe009c450caae077b62647d4af1aaeeb23d91`
	`1`	`+5e37af91690e762b2d6ca358074e7369bcd8d1ac9acde18569a9a5c7d42c5796`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-9d4611f95bdfbdb9b1adcbabb376f5ad45d523e298385b0c2682088e5131e3d9`
	`1`	`+8c86f58a1b689943f271b09c34ed1a1ea5a92e957c5d2c8b58d14f687a972b03`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-5c422d27ce6fb9363c9108801823886171270cbfddba234b1f0e5d51c6a90c4e`
	`1`	`+f33a3bcf7b28fdb3ef6c68136533551fc0598abf6e8bb7c15074ebc607580673`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-47064f84c562fda6b4dee388e481eb6be66776eb953e4e13c924829d1dcf83c7`
	`1`	`+bc6b93a6b0fb47eef2d7f57bfa80261024143b658e30f51f4d7bc5297f626516`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-3b579e5a24ca14b19414e2bacf4c427f5b57a0c4cc3c7942aab8b67167bb0341`
	`1`	`+ba10f08921dcc10f84618912e6df8307531f30b0b30b9f3f2bf0baa37e1a62c7`