Add UserCounter for Top Navigation in sandbox

third_party/WebKit/Source/core/frame/Frame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
@@ skipping 145 matching lines @@
     // be doing something more general instead?
     if (isLocalActiveOrigin && ancestorSecurityOrigin->isLocal())
       return true;
   }
 
   return false;
 }
 
 bool Frame::canNavigate(const Frame& targetFrame) {
   String errorReason;
-  bool isAllowedNavigation =
+  const bool isAllowedNavigation =
       canNavigateWithoutFramebusting(targetFrame, errorReason);
+  const bool sandboxed = securityContext()->getSandboxFlags() != SandboxNone;
+  const bool hasUserGesture =
+      isLocalFrame() ? toLocalFrame(this)->document()->hasReceivedUserGesture()
+                     : false;
 
+  // Top navigation in sandbox with or w/o 'allow-top-navigation'.
+  if (targetFrame != this && sandboxed && targetFrame == tree().top()) {
+    UseCounter::count(&targetFrame, UseCounter::TopNavInSandbox);
+    if (!hasUserGesture) {
+      UseCounter::count(&targetFrame,
+                        UseCounter::TopNavInSandboxWithoutGesture);
+    }
+  }
+
+  // Top navigation w/o sandbox or in sandbox with 'allow-top-navigation'.
   if (targetFrame != this &&
       !securityContext()->isSandboxed(SandboxTopNavigation) &&
       targetFrame == tree().top()) {
     DEFINE_STATIC_LOCAL(EnumerationHistogram, framebustHistogram,
                         ("WebCore.Framebust", 4));
     const unsigned userGestureBit = 0x1;
     const unsigned allowedBit = 0x2;
     unsigned framebustParams = 0;
     UseCounter::count(&targetFrame, UseCounter::TopNavigationFromSubFrame);
-    bool hasUserGesture =
-        isLocalFrame()
-            ? toLocalFrame(this)->document()->hasReceivedUserGesture()
-            : false;
+
     if (hasUserGesture)
       framebustParams |= userGestureBit;
+    if (sandboxed) {  // Sandboxed with 'allow-top-navigation'.
+      UseCounter::count(&targetFrame, UseCounter::TopNavInSandboxWithPerm);
+      if (!hasUserGesture) {
+        UseCounter::count(&targetFrame,
+                          UseCounter::TopNavInSandboxWithPermButNoGesture);
+      }
+    }
+
     if (isAllowedNavigation)
       framebustParams |= allowedBit;
     framebustHistogram.count(framebustParams);
     // Frame-busting used to be generally allowed in most situations, but may
     // now blocked if there is no user gesture.
     if (!RuntimeEnabledFeatures::
             framebustingNeedsSameOriginOrUserGestureEnabled())
       return true;
     if (hasUserGesture || isAllowedNavigation)
       return true;
@@ skipping 151 matching lines @@
 
   ASSERT(page());
 
   if (m_owner)
     m_owner->setContentFrame(*this);
   else
     page()->setMainFrame(this);
 }
 
 }  // namespace blink