Fix cross-site popups to inherit their opener's sandbox flags even when popup opener is not set.

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 790 matching lines @@
 
   if (command_line.HasSwitch(switches::kDomAutomationController))
     enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION;
   if (command_line.HasSwitch(switches::kStatsCollectionController))
     enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION;
 
   GetContentClient()->renderer()->RenderViewCreated(this);
 
   // If we have an opener_frame but we weren't created by a renderer, then it's
   // the browser asking us to set our opener to another frame.
-  if (opener_frame && !was_created_by_renderer) {
+  if (opener_frame && !was_created_by_renderer)
     webview()->mainFrame()->setOpener(opener_frame);
 
-    // Ensure that sandbox flags are inherited from an opener in a different
-    // process.  In that case, the browser process will set any inherited
-    // sandbox flags in |replicated_frame_state|, so apply them here.
-    if (webview()->mainFrame()->isWebLocalFrame()) {
-      webview()->mainFrame()->toWebLocalFrame()->forceSandboxFlags(
-          params.replicated_frame_state.sandbox_flags);
-    }
+  // Ensure that sandbox flags are inherited from an opener in a different
+  // process.  In that case, the browser process will set any inherited
+  // sandbox flags in |replicated_frame_state|, so apply them here.
+  if (!was_created_by_renderer && webview()->mainFrame()->isWebLocalFrame()) {
+    webview()->mainFrame()->toWebLocalFrame()->forceSandboxFlags(
+        params.replicated_frame_state.sandbox_flags);
   }
 
   // If we are initially swapped out, navigate to kSwappedOutURL.
   // This ensures we are in a unique origin that others cannot script.
   if (is_swapped_out_ && webview()->mainFrame()->isWebLocalFrame())
     main_render_frame_->NavigateToSwappedOutURL();
 }
 
 RenderViewImpl::~RenderViewImpl() {
   DCHECK(!frame_widget_);
@@ skipping 2721 matching lines @@
   if (IsUseZoomForDSFEnabled()) {
     webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
   } else {
     webview()->setDeviceScaleFactor(device_scale_factor_);
   }
   webview()->settings()->setPreferCompositingToLCDTextEnabled(
       PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
 }
 
 }  // namespace content