3 files changed, 11 insertions, 1 deletions
diff --git a/ios/web/net/request_tracker_impl.mm b/ios/web/net/request_tracker_impl.mm
index 0732538..4854fda 100644
--- a/ios/web/net/request_tracker_impl.mm
+++ b/ios/web/net/request_tracker_impl.mm
@@ -314,6 +314,9 @@ struct TrackerCounts {
       case web::SECURITY_STYLE_AUTHENTICATION_BROKEN:
         sslInfo = @"Not secure ";
         break;
+      case web::SECURITY_STYLE_WARNING:
+        sslInfo = @"Security warning";
+        break;
       case web::SECURITY_STYLE_AUTHENTICATED:
         if (status_.content_status ==
             web::SSLStatus::DISPLAYED_INSECURE_CONTENT)
diff --git a/ios/web/public/security_style.h b/ios/web/public/security_style.h
index a2fbf84..a72396c 100644
--- a/ios/web/public/security_style.h
+++ b/ios/web/public/security_style.h
@@ -28,6 +28,11 @@ enum SecurityStyle {
   // this object in an authenticated manner but were unable to do so.
   SECURITY_STYLE_AUTHENTICATION_BROKEN,
 
+  // SECURITY_STYLE_WARNING means that the object was retrieved in an
+  // authenticated manner, but there were security issues with the retrieval or
+  // the object interacted with less secure objects.
+  SECURITY_STYLE_WARNING,
+
   // SECURITY_STYLE_AUTHENTICATED indicates that we successfully retrieved this
   // object over an authenticated protocol, such as HTTPS.
   SECURITY_STYLE_AUTHENTICATED,
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index cc0e66a5..da8309f 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -3382,9 +3382,11 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
   if (!scrollState.IsValid())
     return;
   base::WeakNSObject<CRWWebController> weakSelf(self);
+  web::PageScrollState scrollStateCopy = scrollState;
   [self queryUserScalableProperty:^(BOOL isUserScalable) {
     base::scoped_nsobject<CRWWebController> strongSelf([weakSelf retain]);
-    [strongSelf applyPageScrollState:scrollState userScalable:isUserScalable];
+    [strongSelf applyPageScrollState:scrollStateCopy
+                        userScalable:isUserScalable];
   }];
 }