Preload tokens even if a <meta> csp tag is found

third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.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 95 matching lines @@
         PreloadRequestStream preloads;
         ViewportDescriptionWrapper viewport;
         XSSInfoStream xssInfos;
         HTMLTokenizer::State tokenizerState;
         HTMLTreeBuilderSimulator::State treeBuilderState;
         HTMLInputCheckpoint inputCheckpoint;
         TokenPreloadScannerCheckpoint preloadScannerCheckpoint;
         bool startingScript;
         // Indices into |tokens|.
         Vector<int> likelyDocumentWriteScriptIndices;
+        // Raw pointer into the last <meta> csp tag in |tokens|. Preloads will
+        // be deferred until this token is parsed.
+        CompactHTMLToken* pendingCSPMetaTag;

[kouhei (in TOK), 2016/08/19 04:56:15]

Let's use index as in "likelyDocumentWriteScriptIndices"

[Charlie Harrison, 2016/08/19 12:33:33]

SGTM but we'll have to pull the pointer out when the chunk reaches the main
thread, unless we have some complicated logic to index into m_speculations.

[kouhei (in TOK), 2016/08/22 05:34:03]

I'm thinking of keeping a defer counter on the main thread side. Let me try that
in a separate CL.

[Charlie Harrison, 2016/08/22 14:08:05]

Do you mean a followup? I'd be happy to implement this in the current CL if
you'd like.

[kouhei (in TOK), 2016/08/23 02:18:39]

I mean a follow up. I'm not sure if its really possible (esp with conservative
check where last token wins), so let not that block you.

     };
     void notifyPendingTokenizedChunks();
     void didReceiveEncodingDataFromBackgroundParser(const DocumentEncodingData&);
 
     void appendBytes(const char* bytes, size_t length) override;
     void flush() final;
     void setDecoder(std::unique_ptr<TextResourceDecoder>) final;
 
 protected:
     void insert(const SegmentedString&) final;
@@ skipping 53 matching lines @@
 
     bool shouldUseThreading() const { return m_shouldUseThreading; }
 
     bool isParsingFragment() const;
     bool isScheduledForResume() const;
     bool inPumpSession() const { return m_pumpSessionNestingLevel > 0; }
     bool shouldDelayEnd() const { return inPumpSession() || isWaitingForScripts() || isScheduledForResume() || isExecutingScript(); }
 
     std::unique_ptr<HTMLPreloadScanner> createPreloadScanner();
 
-    int preloadInsertion(const SegmentedString& source);
+    void fetchQueuedPreloads();
+
     void evaluateAndPreloadScriptForDocumentWrite(const String& source);
 
     // Temporary enum for the ParseHTMLOnMainThread experiment. This is used to
     // annotate whether a given task should post a task or not on the main
     // thread if the lookahead parser is living on the main thread.
     enum LookaheadParserTaskSynchrony {
         Synchronous,
         Asynchronous,
     };
 
@@ skipping 28 matching lines @@
     std::unique_ptr<TokenizedChunk> m_lastChunkBeforeScript;
     Deque<std::unique_ptr<TokenizedChunk>> m_speculations;
     WeakPtrFactory<HTMLDocumentParser> m_weakFactory;
     WeakPtr<BackgroundHTMLParser> m_backgroundParser;
     Member<HTMLResourcePreloader> m_preloader;
     PreloadRequestStream m_queuedPreloads;
     Vector<String> m_queuedDocumentWriteScripts;
     RefPtr<TokenizedChunkQueue> m_tokenizedChunkQueue;
     std::unique_ptr<DocumentWriteEvaluator> m_evaluator;
 
+    CompactHTMLToken* m_pendingCSPMetaTag;
+
     bool m_shouldUseThreading;
     bool m_endWasDelayed;
     bool m_haveBackgroundParser;
     bool m_tasksWereSuspended;
     unsigned m_pumpSessionNestingLevel;
     unsigned m_pumpSpeculationsSessionNestingLevel;
     bool m_isParsingAtLineNumber;
     bool m_triedLoadingLinkHeaders;
 };
 
 } // namespace blink
 
 #endif