From 6b075880fe1fc9334b309363b82254d057ff41d9 Mon Sep 17 00:00:00 2001
From: Simon Stewart <simon.m.stewart@gmail.com>
Date: Wed, 9 Aug 2017 16:45:21 +0100
Subject: [PATCH] Add back the `conservative` page loading strategy

This waits for all resources of a page to have finished
loading, and not just for the readyState to reach
"complete".

Addresses #893.
---
 webdriver-spec.html | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/webdriver-spec.html b/webdriver-spec.html
index 1e719e6f8..44c37affa 100644
--- a/webdriver-spec.html
+++ b/webdriver-spec.html
@@ -3034,6 +3034,12 @@ <h2>Navigation</h2>
   <td><dfn data-lt="normal page loading strategy">normal</dfn>
   <td>"<code>complete</code>"
  </tr>
+
+ <tr>
+  <td>"<code>conservative</code>"
+  <td><dfn data-lt="conservative page loading strategy">conservative</dfn>
+  <td>"<code>complete</code>"
+ </tr>
 </table>
 
 <p>When asked to <dfn>deserialize as a page load strategy</dfn> with
@@ -3077,6 +3083,11 @@ <h2>Navigation</h2>
   session</a>’s <a>page loading strategy</a>, which can be found in
   the <a>table of page load strategies</a>.
 
+ <li><p>If the <a>current session</a>'s <a>page loading strategy</a>
+  is <a>conservative</a>, wait for all additional
+  remote resources to finish loading. Otherwise, continue with this
+  algorithm.
+
  <li><p>Wait for the the <a>current browsing context</a>’s
   <a>document readiness</a> state to reach
   <var>readiness target</var>, or for the
@@ -3203,12 +3214,13 @@ <h3>Go</h3>
  <p>Figure out if next paragraph is actually required:
 
  <blockquote>
-  <p>When a page contains a META tag with the "http-equiv" attribute set to "refresh",
-   a response MUST be returned if the timeout is greater than 1 second
-   and the other criteria for determining whether a page is loaded are met.
-   When the refresh period is 1 second or less
-   and the page loading strategy is "normal" or "conservative"
-   implementations MUST wait for the refresh to complete before responding.
+  <p>When a page contains a META tag with the "http-equiv" attribute
+   set to "refresh", a response MUST be returned if the timeout is
+   greater than 1 second and the other criteria for determining
+   whether a page is loaded are met.  When the refresh period is 1
+   second or less and the page loading strategy is "<a>normal</a>" or
+   "<a>conservative</a>" implementations MUST wait for the refresh to
+   complete before responding.
  </blockquote>
 </div>