Resource: helper class to prohibit {add,remove}Client() calls in scope

third_party/WebKit/Source/core/fetch/Resource.cpp

Index: third_party/WebKit/Source/core/fetch/Resource.cpp
diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp
index 2f31ccdcf511baaefd669bfbc6c789223d69428f..8bd7d64800e99597db1e03ccd947c856ab66723c 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.cpp
+++ b/third_party/WebKit/Source/core/fetch/Resource.cpp
@@ -313,6 +313,7 @@ Resource::Resource(const ResourceRequest& request,
       m_linkPreload(false),
       m_isRevalidating(false),
       m_isAlive(false),
+      m_isAddRemoveClientProhibited(false),
       m_options(options),
       m_responseTimestamp(currentTime()),
       m_cancelTimer(this, &Resource::cancelTimerFired),
@@ -687,6 +688,8 @@ void Resource::willAddClientOrObserver(PreloadReferencePolicy policy) {
 
 void Resource::addClient(ResourceClient* client,
                          PreloadReferencePolicy policy) {
+  CHECK(!m_isAddRemoveClientProhibited);
+
   willAddClientOrObserver(policy);
 
   if (m_isRevalidating) {
@@ -710,6 +713,8 @@ void Resource::addClient(ResourceClient* client,
 }
 
 void Resource::removeClient(ResourceClient* client) {
+  CHECK(!m_isAddRemoveClientProhibited);
+
   // This code may be called in a pre-finalizer, where weak members in the
   // HashCountedSet are already swept out.