Make UseCounter take a LocaFrame instead of any Frame

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 157 matching lines @@
 bool Frame::CanNavigate(const Frame& target_frame) {
   String error_reason;
   const bool is_allowed_navigation =
       CanNavigateWithoutFramebusting(target_frame, error_reason);
   const bool sandboxed =
       GetSecurityContext()->GetSandboxFlags() != kSandboxNone;
   const bool has_user_gesture =
       IsLocalFrame() ? ToLocalFrame(this)->HasReceivedUserGesture() : false;
 
   // Top navigation in sandbox with or w/o 'allow-top-navigation'.
-  if (target_frame != this && sandboxed && target_frame == Tree().Top()) {
-    UseCounter::Count(&target_frame, UseCounter::kTopNavInSandbox);
+  if (IsLocalFrame() && target_frame != this && sandboxed &&

[dcheng, 2017/05/12 22:15:18]

I think this can actually only be called on a local frame. We should probably
move this function.

(May be easier to add a DCHECK(IsLocalFrame() and move in a followup)

[Rick Byers, 2017/05/25 15:32:31]

Good catch, and looks like it wasn't too hard to move so I just did it in this
CL - hope that's OK.  Code is simpler now (though harder to diff, sorry).

+      target_frame == Tree().Top()) {
+    UseCounter::Count(ToLocalFrame(this), UseCounter::kTopNavInSandbox);
     if (!has_user_gesture) {
-      UseCounter::Count(&target_frame,
+      UseCounter::Count(ToLocalFrame(this),
                         UseCounter::kTopNavInSandboxWithoutGesture);
     }
   }
 
   // Top navigation w/o sandbox or in sandbox with 'allow-top-navigation'.
   if (target_frame != this &&
       !GetSecurityContext()->IsSandboxed(kSandboxTopNavigation) &&
       target_frame == Tree().Top()) {
     DEFINE_STATIC_LOCAL(EnumerationHistogram, framebust_histogram,
                         ("WebCore.Framebust", 4));
     const unsigned kUserGestureBit = 0x1;
     const unsigned kAllowedBit = 0x2;
     unsigned framebust_params = 0;
-    UseCounter::Count(&target_frame, UseCounter::kTopNavigationFromSubFrame);
 
     if (has_user_gesture)
       framebust_params |= kUserGestureBit;
-    if (sandboxed) {  // Sandboxed with 'allow-top-navigation'.
-      UseCounter::Count(&target_frame, UseCounter::kTopNavInSandboxWithPerm);
-      if (!has_user_gesture) {
-        UseCounter::Count(&target_frame,
-                          UseCounter::kTopNavInSandboxWithPermButNoGesture);
+
+    if (IsLocalFrame()) {
+      UseCounter::Count(ToLocalFrame(this),
+                        UseCounter::kTopNavigationFromSubFrame);
+      if (sandboxed) {  // Sandboxed with 'allow-top-navigation'.
+        UseCounter::Count(ToLocalFrame(this),
+                          UseCounter::kTopNavInSandboxWithPerm);
+        if (!has_user_gesture) {
+          UseCounter::Count(ToLocalFrame(this),
+                            UseCounter::kTopNavInSandboxWithPermButNoGesture);
+        }
       }
     }
 
     if (is_allowed_navigation)
       framebust_params |= kAllowedBit;
     framebust_histogram.Count(framebust_params);
     if (has_user_gesture || is_allowed_navigation)
       return true;
     // Frame-busting used to be generally allowed in most situations, but may
     // now blocked if the document initiating the navigation has never received
@@ skipping 216 matching lines @@
       is_loading_(false) {
   InstanceCounters::IncrementCounter(InstanceCounters::kFrameCounter);
 
   if (owner_)
     owner_->SetContentFrame(*this);
   else
     page_->SetMainFrame(this);
 }
 
 }  // namespace blink