1 files changed, 16 insertions, 10 deletions

diff --git a/chromium/third_party/blink/renderer/core/html/html_frame_set_element.cc b/chromium/third_party/blink/renderer/core/html/html_frame_set_element.cc
index 9d4cb87fd93..5239ea86169 100644
--- a/chromium/third_party/blink/renderer/core/html/html_frame_set_element.cc
+++ b/chromium/third_party/blink/renderer/core/html/html_frame_set_element.cc
@@ -86,12 +86,12 @@ void HTMLFrameSetElement::ParseAttribute(
     }
   } else if (name == html_names::kFrameborderAttr) {
     if (!value.IsNull()) {
-      if (DeprecatedEqualIgnoringCase(value, "no") ||
-          DeprecatedEqualIgnoringCase(value, "0")) {
+      if (EqualIgnoringASCIICase(value, "no") ||
+          EqualIgnoringASCIICase(value, "0")) {
         frameborder_ = false;
         frameborder_set_ = true;
-      } else if (DeprecatedEqualIgnoringCase(value, "yes") ||
-                 DeprecatedEqualIgnoringCase(value, "1")) {
+      } else if (EqualIgnoringASCIICase(value, "yes") ||
+                 EqualIgnoringASCIICase(value, "1")) {
         frameborder_set_ = true;
       }
     } else {
@@ -202,11 +202,16 @@ void HTMLFrameSetElement::ParseAttribute(
     GetDocument().SetWindowAttributeEventListener(
         event_type_names::kLanguagechange,
         CreateAttributeEventListener(GetDocument().GetFrame(), name, value));
-  } else if (RuntimeEnabledFeatures::PortalsEnabled() &&
+  } else if (RuntimeEnabledFeatures::PortalsEnabled(&GetDocument()) &&
              name == html_names::kOnportalactivateAttr) {
     GetDocument().SetWindowAttributeEventListener(
         event_type_names::kPortalactivate,
         CreateAttributeEventListener(GetDocument().GetFrame(), name, value));
+  } else if (RuntimeEnabledFeatures::TimeZoneChangeEventEnabled() &&
+             name == html_names::kOntimezonechangeAttr) {
+    GetDocument().SetWindowAttributeEventListener(
+        event_type_names::kTimezonechange,
+        CreateAttributeEventListener(GetDocument().GetFrame(), name, value));
   } else {
     HTMLElement::ParseAttribute(params);
   }
@@ -221,9 +226,9 @@ bool HTMLFrameSetElement::LayoutObjectIsNeeded(
 LayoutObject* HTMLFrameSetElement::CreateLayoutObject(
     const ComputedStyle& style,
     LegacyLayout legacy) {
-  if (style.HasContent())
-    return LayoutObject::CreateObject(this, style, legacy);
-  return new LayoutFrameSet(this);
+  if (style.ContentBehavesAsNormal())
+    return new LayoutFrameSet(this);
+  return LayoutObject::CreateObject(this, style, legacy);
 }
 
 void HTMLFrameSetElement::AttachLayoutTree(AttachContext& context) {
@@ -247,9 +252,10 @@ void HTMLFrameSetElement::AttachLayoutTree(AttachContext& context) {
 }
 
 void HTMLFrameSetElement::DefaultEventHandler(Event& evt) {
-  if (evt.IsMouseEvent() && !noresize_ && GetLayoutObject() &&
+  auto* mouse_event = DynamicTo<MouseEvent>(evt);
+  if (mouse_event && !noresize_ && GetLayoutObject() &&
       GetLayoutObject()->IsFrameSet()) {
-    if (ToLayoutFrameSet(GetLayoutObject())->UserResize(ToMouseEvent(evt))) {
+    if (ToLayoutFrameSet(GetLayoutObject())->UserResize(*mouse_event)) {
       evt.SetDefaultHandled();
       return;
     }