Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(929)

Unified Diff: Source/core/html/HTMLImportsController.h

Issue 19940002: [HTML Import] Respect Content Security Policy Model (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix Mac build failure Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLImport.cpp ('k') | Source/core/html/HTMLImportsController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLImportsController.h
diff --git a/Source/core/html/HTMLImportsController.h b/Source/core/html/HTMLImportsController.h
index 92b2a239fbafd339c04822804cb8fe18ad38582b..030763b88fae348fdaad2eee9452aad3d43d09ad 100644
--- a/Source/core/html/HTMLImportsController.h
+++ b/Source/core/html/HTMLImportsController.h
@@ -75,6 +75,7 @@ class HTMLImportLoader : public RefCounted<HTMLImportLoader>, public HTMLImport,
public:
enum State {
StateLoading,
+ StateWritten,
StateError,
StateReady
};
@@ -93,6 +94,7 @@ public:
virtual HTMLImport* parent() OVERRIDE;
virtual Document* document() OVERRIDE;
virtual void wasDetachedFromDocument() OVERRIDE;
+ virtual void didFinishParsing() OVERRIDE;
private:
HTMLImportLoader(HTMLImport*, const KURL&, const CachedResourceHandle<CachedScript>&);
@@ -102,8 +104,10 @@ private:
virtual void dataReceived(CachedResource*, const char* data, int length) OVERRIDE;
virtual void notifyFinished(CachedResource*) OVERRIDE;
- State startParsing(const ResourceResponse&);
- State finish();
+ State startWritingAndParsing(const ResourceResponse&);
+ State finishWriting();
+ State finishParsing();
+
void setState(State);
void dispose();
@@ -128,6 +132,7 @@ public:
virtual HTMLImport* parent() OVERRIDE;
virtual Document* document() OVERRIDE;
virtual void wasDetachedFromDocument() OVERRIDE;
+ virtual void didFinishParsing() OVERRIDE;
void addImport(PassRefPtr<HTMLImportLoader>);
void showSecurityErrorMessage(const String&);
« no previous file with comments | « Source/core/html/HTMLImport.cpp ('k') | Source/core/html/HTMLImportsController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698