Unverified Commit a9183f69 authored by Zachary Anderson's avatar Zachary Anderson Committed by GitHub

Revert "Resolve breaking change of adding a method to ChangeNotifier." (#134978)

Reverts flutter/flutter#134953

Several failures on CI
parent 5c6ef59b
......@@ -207,7 +207,7 @@ mixin class ChangeNotifier implements Listenable {
@protected
bool get hasListeners => _count > 0;
/// Dispatches event of the [object] creation to [MemoryAllocations.instance].
/// Dispatches event of object creation to [MemoryAllocations.instance].
///
/// If the event was already dispatched or [kFlutterMemoryAllocationsEnabled]
/// is false, the method is noop.
......@@ -227,16 +227,16 @@ mixin class ChangeNotifier implements Listenable {
/// Make sure to invoke it with condition `if (kFlutterMemoryAllocationsEnabled) ...`
/// so that the method is tree-shaken away when the flag is false.
@protected
static void maybeDispatchObjectCreation(ChangeNotifier object) {
void maybeDispatchObjectCreation() {
// Tree shaker does not include this method and the class MemoryAllocations
// if kFlutterMemoryAllocationsEnabled is false.
if (kFlutterMemoryAllocationsEnabled && !object._creationDispatched) {
if (kFlutterMemoryAllocationsEnabled && !_creationDispatched) {
MemoryAllocations.instance.dispatchObjectCreated(
library: _flutterFoundationLibrary,
className: '$ChangeNotifier',
object: object,
object: this,
);
object._creationDispatched = true;
_creationDispatched = true;
}
}
......@@ -271,7 +271,7 @@ mixin class ChangeNotifier implements Listenable {
assert(ChangeNotifier.debugAssertNotDisposed(this));
if (kFlutterMemoryAllocationsEnabled) {
maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
if (_count == _listeners.length) {
......@@ -535,7 +535,7 @@ class ValueNotifier<T> extends ChangeNotifier implements ValueListenable<T> {
/// Creates a [ChangeNotifier] that wraps this value.
ValueNotifier(this._value) {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
......@@ -1321,7 +1321,7 @@ class _SelectableFragment with Selectable, ChangeNotifier implements TextLayoutM
required this.range,
}) : assert(range.isValid && !range.isCollapsed && range.isNormalized) {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
_selectionGeometry = _getSelectionGeometry();
}
......
......@@ -155,7 +155,7 @@ class RestorationManager extends ChangeNotifier {
/// with the engine to get restoration messages (by calling [initChannels]).
RestorationManager() {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
initChannels();
}
......
......@@ -1074,7 +1074,7 @@ class _DraggableScrollableActuatorState extends State<DraggableScrollableActuato
class _ResetNotifier extends ChangeNotifier {
_ResetNotifier() {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
/// Whether someone called [sendReset] or not.
......
......@@ -439,7 +439,7 @@ class FocusNode with DiagnosticableTreeMixin, ChangeNotifier {
this.debugLabel = debugLabel;
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......@@ -1468,7 +1468,7 @@ class FocusManager with DiagnosticableTreeMixin, ChangeNotifier {
/// documentation in that method for caveats to watch out for.
FocusManager() {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
rootScope._manager = this;
}
......
......@@ -1788,7 +1788,7 @@ class _FocusTraversalGroupNode extends FocusNode {
required this.policy,
}) {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
......@@ -3390,7 +3390,7 @@ class _History extends Iterable<_RouteEntry> with ChangeNotifier {
/// Creates an instance of [_History].
_History() {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
......@@ -457,7 +457,7 @@ abstract class RestorableProperty<T> extends ChangeNotifier {
/// Creates a [RestorableProperty].
RestorableProperty(){
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
......@@ -1467,7 +1467,7 @@ class PlatformRouteInformationProvider extends RouteInformationProvider with Wid
required RouteInformation initialRouteInformation,
}) : _value = initialRouteInformation {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
......@@ -65,7 +65,7 @@ class ScrollController extends ChangeNotifier {
this.onDetach,
}) : _initialScrollOffset = initialScrollOffset {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
......@@ -1580,7 +1580,7 @@ abstract class MultiSelectableSelectionContainerDelegate extends SelectionContai
/// Creates an instance of [MultiSelectableSelectionContainerDelegate].
MultiSelectableSelectionContainerDelegate() {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
......@@ -749,7 +749,7 @@ class ShortcutManager with Diagnosticable, ChangeNotifier {
this.modal = false,
}) : _shortcuts = shortcuts {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......@@ -1203,7 +1203,7 @@ class ShortcutRegistry with ChangeNotifier {
/// Creates an instance of [ShortcutRegistry].
ShortcutRegistry() {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
......@@ -482,4 +482,8 @@ class _DefaultSnapshotPainter implements SnapshotPainter {
@override
bool shouldRepaint(covariant _DefaultSnapshotPainter oldPainter) => false;
@override
@protected
void maybeDispatchObjectCreation() { }
}
......@@ -2898,7 +2898,7 @@ class InspectorSelection with ChangeNotifier {
/// Creates an instance of [InspectorSelection].
InspectorSelection() {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
......@@ -29,7 +29,7 @@ class A {
class B extends A with ChangeNotifier {
B() {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......@@ -43,7 +43,7 @@ class B extends A with ChangeNotifier {
class Counter with ChangeNotifier {
Counter() {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
......@@ -638,7 +638,7 @@ class RenderSliverMultiBoxAdaptorAlt extends RenderSliver with
class LeakCheckerHandle with ChangeNotifier {
LeakCheckerHandle() {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
......@@ -340,7 +340,7 @@ class SimpleRouterDelegate extends RouterDelegate<RouteInformation> with ChangeN
this.reportConfiguration = false,
}) {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
......@@ -92,7 +92,7 @@ class _TestRouteInformationParser extends RouteInformationParser<String> {
class _TestRouterDelegate extends RouterDelegate<String> with ChangeNotifier {
_TestRouterDelegate() {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......@@ -136,7 +136,7 @@ class _TestRouterDelegate extends RouterDelegate<String> with ChangeNotifier {
class _TestRouteInformationProvider extends RouteInformationProvider with ChangeNotifier {
_TestRouteInformationProvider() {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
......@@ -1646,7 +1646,7 @@ class SimpleRouterDelegate extends RouterDelegate<RouteInformation> with ChangeN
this.reportConfiguration = false,
}) {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......@@ -1734,7 +1734,7 @@ class SimpleRouteInformationProvider extends RouteInformationProvider with Chang
this.onRouterReport,
}) {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......@@ -1794,7 +1794,7 @@ class SimpleAsyncRouterDelegate extends RouterDelegate<RouteInformation> with Ch
required this.builder,
}) {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
maybeDispatchObjectCreation();
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment