Replace std::map with std::pair for (origin, engagement) tuples in RenderFrameImpl.

content/renderer/render_frame_impl.cc

 // Copyright 2013 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_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 2659 matching lines @@
 
 void RenderFrameImpl::SetEngagementLevel(const url::Origin& origin,
                                          blink::mojom::EngagementLevel level) {
   // Set the engagement level on |frame_| if its origin matches the one we have
   // been provided with.
   if (frame_ && url::Origin(frame_->getSecurityOrigin()) == origin) {
     frame_->setEngagementLevel(level);
     return;
   }
 
-  engagement_levels_[origin] = level;
+  engagement_level_ = std::make_pair(origin, level);
 }
 
 // mojom::Frame implementation -------------------------------------------------
 
 void RenderFrameImpl::GetInterfaceProvider(
     service_manager::mojom::InterfaceProviderRequest request) {
   service_manager::ServiceInfo child_info =
       ChildThreadImpl::current()->GetChildServiceInfo();
   service_manager::ServiceInfo browser_info =
       ChildThreadImpl::current()->GetBrowserServiceInfo();
@@ skipping 2093 matching lines @@
 
   const WebURLRequest& request = ds->getRequest();
   const WebURLResponse& response = ds->response();
 
   DocumentState* document_state = DocumentState::FromDataSource(ds);
   NavigationStateImpl* navigation_state =
       static_cast<NavigationStateImpl*>(document_state->navigation_state());
   InternalDocumentStateData* internal_data =
       InternalDocumentStateData::FromDocumentState(document_state);
 
-  // Set the correct engagement level on the frame.
-  EngagementLevels::iterator engagement_level =
-      engagement_levels_.find(url::Origin(frame_->getSecurityOrigin()));
-
-  if (engagement_level != engagement_levels_.end())
-    frame_->setEngagementLevel(engagement_level->second);
-  engagement_levels_.clear();
+  // Set the correct engagement level on the frame, and wipe the cached origin
+  // so this will not be reused accidentally.
+  if (url::Origin(frame_->getSecurityOrigin()) == engagement_level_.first)
+    frame_->setEngagementLevel(engagement_level_.second);
+  engagement_level_.first = url::Origin();

[nasko, 2017/01/18 22:33:37]

Should this be wiped out every time or just when we actually used it?

[dominickn, 2017/01/19 00:34:51]

Good point. Changed to wipe only when we used it, I think that makes sense.

 
   FrameHostMsg_DidCommitProvisionalLoad_Params params;
   params.http_status_code = response.httpStatusCode();
   params.url_is_unreachable = ds->hasUnreachableURL();
   params.method = "GET";
   params.intended_as_new_entry =
       navigation_state->request_params().intended_as_new_entry;
   params.did_create_new_entry = commit_type == blink::WebStandardCommit;
   params.should_replace_current_entry = ds->replacesCurrentHistoryItem();
   params.post_id = -1;
@@ skipping 1965 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content