Simplify parsing/loading state, attempt #2

third_party/WebKit/Source/core/html/parser/HTMLParserScheduler.h

 /*
  * Copyright (C) 2010 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 16 matching lines @@
 #define HTMLParserScheduler_h
 
 #include "core/html/parser/NestingLevelIncrementer.h"
 #include "platform/scheduler/CancellableTaskFactory.h"
 #include "wtf/Allocator.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
-class Document;
 class HTMLDocumentParser;
 class WebTaskRunner;
 
-class ActiveParserSession : public NestingLevelIncrementer {
+class PumpSession : public NestingLevelIncrementer {
     STACK_ALLOCATED();
 public:
-    ActiveParserSession(unsigned& nestingLevel, Document*);
-    ~ActiveParserSession();
-
-private:
-    RefPtrWillBeMember<Document> m_document;
-};
-
-class PumpSession : public ActiveParserSession {
-    STACK_ALLOCATED();
-public:
-    PumpSession(unsigned& nestingLevel, Document*);
+    PumpSession(unsigned& nestingLevel);
     ~PumpSession();
 };
 
-class SpeculationsPumpSession : public ActiveParserSession {
+class SpeculationsPumpSession : public NestingLevelIncrementer {
     STACK_ALLOCATED();
 public:
-    SpeculationsPumpSession(unsigned& nestingLevel, Document*);
+    SpeculationsPumpSession(unsigned& nestingLevel);
     ~SpeculationsPumpSession();
 
     double elapsedTime() const;
     void addedElementTokens(size_t count);
     size_t processedElementTokens() const { return m_processedElementTokens; }
 
 private:
     double m_startTime;
     size_t m_processedElementTokens;
 };
@@ skipping 38 matching lines @@
     RawPtrWillBeMember<HTMLDocumentParser> m_parser;
     OwnPtr<WebTaskRunner> m_loadingTaskRunner;
 
     OwnPtr<CancellableTaskFactory> m_cancellableContinueParse;
     bool m_isSuspendedWithActiveTimer;
 };
 
 } // namespace blink
 
 #endif