Fix merge conflicts 2

tneotia · tneotia · commit 65e4bc3733c2 · 2021-03-04T18:13:07.000-05:00
diff --git a/lib/src/replaced_element.dart b/lib/src/replaced_element.dart
@@ -2,7 +2,6 @@ import 'dart:math';
 
 import 'package:chewie/chewie.dart';
 import 'package:chewie_audio/chewie_audio.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_html/html_parser.dart';
@@ -297,7 +296,8 @@ ReplacedElement parseReplacedElement(
           width: double.tryParse(element.attributes['width'] ?? ""),
           height: double.tryParse(element.attributes['height'] ?? ""),
           navigationDelegate: navigationDelegateForIframe,
-          node: element);
+          node: element,
+      );
     case "img":
       return ImageContentElement(
         name: "img",
diff --git a/lib/src/widgets/iframe_mobile.dart b/lib/src/widgets/iframe_mobile.dart
@@ -9,21 +9,20 @@ import 'package:html/dom.dart' as dom;
 
 /// [IframeContentElement is a [ReplacedElement] with web content.
 class IframeContentElement extends ReplacedElement {
-  final String src;
-  final double width;
-  final double height;
-  final NavigationDelegate navigationDelegate;
+  final String? src;
+  final double? width;
+  final double? height;
+  final NavigationDelegate? navigationDelegate;
   final UniqueKey key = UniqueKey();
 
   IframeContentElement({
-    String name,
-    Style style,
-    this.src,
-    this.width,
-    this.height,
-    dom.Element node,
-    this.navigationDelegate,
-  }) : super(name: name, style: style, node: node);
+    required String name,
+    required this.src,
+    required this.width,
+    required this.height,
+    required dom.Element node,
+    required this.navigationDelegate,
+  }) : super(name: name, style: Style(), node: node);
 
   @override
   Widget toWidget(RenderContext context) {
diff --git a/lib/src/widgets/iframe_unsupported.dart b/lib/src/widgets/iframe_unsupported.dart
@@ -7,21 +7,20 @@ import 'package:html/dom.dart' as dom;
 
 /// [IframeContentElement is a [ReplacedElement] with web content.
 class IframeContentElement extends ReplacedElement {
-  final String src;
-  final double width;
-  final double height;
-  final NavigationDelegate navigationDelegate;
+  final String? src;
+  final double? width;
+  final double? height;
+  final NavigationDelegate? navigationDelegate;
   final UniqueKey key = UniqueKey();
 
   IframeContentElement({
-    String name,
-    Style style,
-    this.src,
-    this.width,
-    this.height,
-    dom.Element node,
-    this.navigationDelegate,
-  }) : super(name: name, style: style, node: node);
+    required String name,
+    required this.src,
+    required this.width,
+    required this.height,
+    required dom.Element node,
+    required this.navigationDelegate,
+  }) : super(name: name, style: Style(), node: node);
 
   @override
   Widget toWidget(RenderContext context) {
diff --git a/lib/src/widgets/iframe_web.dart b/lib/src/widgets/iframe_web.dart
@@ -11,22 +11,21 @@ import 'dart:ui' as ui;
 
 /// [IframeContentElement is a [ReplacedElement] with web content.
 class IframeContentElement extends ReplacedElement {
-  final String src;
-  final double width;
-  final double height;
-  final NavigationDelegate navigationDelegate;
+  final String? src;
+  final double? width;
+  final double? height;
+  final NavigationDelegate? navigationDelegate;
   final UniqueKey key = UniqueKey();
   final String createdViewId = getRandString(10);
 
   IframeContentElement({
-    String name,
-    Style style,
-    this.src,
-    this.width,
-    this.height,
-    dom.Element node,
-    this.navigationDelegate,
-  }) : super(name: name, style: style, node: node);
+    required String name,
+    required this.src,
+    required this.width,
+    required this.height,
+    required dom.Element node,
+    required this.navigationDelegate,
+  }) : super(name: name, style: Style(), node: node);
 
   @override
   Widget toWidget(RenderContext context) {
