[chromedriver] Discard pending frames except for the frame we just navigated to.

chrome/test/chromedriver/chrome/navigation_tracker.cc

 // Copyright (c) 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 "chrome/test/chromedriver/chrome/navigation_tracker.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome/browser_info.h"
 #include "chrome/test/chromedriver/chrome/devtools_client.h"
@@ skipping 203 matching lines @@
     if (!params.GetString("frameId", &frame_id))
       return Status(kUnknownError, "missing or invalid 'frameId'");
     pending_frame_set_.insert(frame_id);
     loading_state_ = kLoading;
   } else if (method == "Page.frameStoppedLoading") {
     // Versions of Blink before revision 170248 sent a single
     // Page.frameStoppedLoading event per page, but 170248 and newer revisions
     // only send one event for each frame on the page.
     //
     // This change was rolled into the Chromium tree in revision 260203.
     // Versions of Chrome with build number 1916 and earlier do not contain this

[stgao, 2016/09/20 23:45:38]

Nit: I guess this part could be cleaned now.

[samuong, 2016/09/21 14:36:55]

Unfortunately we still need to keep this around for WebView on KitKat :(

     // change.
     bool expecting_single_stop_event = false;
 
     if (browser_info_->browser_name == "chrome") {
       // If we're talking to a version of Chrome with an old build number, we
       // are using a branched version of Blink which does not contain 170248
       // (even if blink_revision > 170248).
       expecting_single_stop_event = browser_info_->build_no <= 1916;
     } else {
       // If we're talking to a non-Chrome embedder (e.g. Content Shell, Android
@@ skipping 39 matching lines @@
     const base::Value* unused_value;
     if (!params.Get("frame.parentId", &unused_value)) {
       if (IsExpectingFrameLoadingEvents()) {
         // If the main frame just navigated, discard any pending scheduled
         // navigations. For some reasons at times the cleared event is not
         // received when navigating.
         // See crbug.com/180742.
         pending_frame_set_.clear();
         scheduled_frame_set_.clear();
       } else {
+        // Discard pending and scheduled frames, except for the frame that just

[stgao, 2016/09/20 23:44:19]

It might worth mentioning this is the root frame.

[samuong, 2016/09/21 14:36:55]

Done.

+        // navigated (which we should consider pending until we receive a
+        // Page.frameStoppedLoading event for it).
+        std::string frame_id;
+        if (!params.GetString("frame.id", &frame_id))
+          return Status(kUnknownError, "missing or invalid 'frame.id'");
+        bool frame_was_pending = pending_frame_set_.count(frame_id) > 0;
+        pending_frame_set_.clear();
+        scheduled_frame_set_.clear();
+        if (frame_was_pending)
+          pending_frame_set_.insert(frame_id);
         // If the URL indicates that the web page is unreachable (the sad tab
-        // page) then discard any pending or scheduled navigations.
+        // page) then discard all pending navigations.
         std::string frame_url;
         if (!params.GetString("frame.url", &frame_url))
           return Status(kUnknownError, "missing or invalid 'frame.url'");
-        if (frame_url == kUnreachableWebDataURL) {
+        if (frame_url == kUnreachableWebDataURL)
           pending_frame_set_.clear();
-          scheduled_frame_set_.clear();
-        }
       }
     } else {
       // If a child frame just navigated, check if it is the dummy frame that
       // was attached by IsPendingNavigation(). We don't want to track execution
       // contexts created and destroyed for this dummy frame.
       std::string name;
       if (!params.GetString("frame.name", &name))
         return Status(kUnknownError, "missing or invalid 'frame.name'");
       std::string url;
       if (!params.GetString("frame.url", &url))
@@ skipping 132 matching lines @@
   // modal dialogs. This pauses the render process so we need to be careful not
   // to issue Runtime.evaluate commands while an alert is up, otherwise the call
   // will block and timeout. For details refer to
   // https://bugs.chromium.org/p/chromedriver/issues/detail?id=1381.
   // TODO(samuong): Remove this once we stop supporting M51.
   if (browser_info_->browser_name == "chrome")
     return browser_info_->build_no >= 2743;
   else
     return browser_info_->major_version >= 52;
 }