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

Unified Diff: Source/core/dom/Document.h

Issue 18808004: Refactoring: Extract DocumentInit for capture Document construction parameter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed webkit_unit_tests 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/dom/DOMImplementation.cpp ('k') | Source/core/dom/Document.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Document.h
diff --git a/Source/core/dom/Document.h b/Source/core/dom/Document.h
index 0bfe2ed0bf463d678fb8a017102ea679066e97ab..69834205a714198ddd2bbd7ae4f53073563364f5 100644
--- a/Source/core/dom/Document.h
+++ b/Source/core/dom/Document.h
@@ -32,6 +32,7 @@
#include "core/dom/ContainerNode.h"
#include "core/dom/DOMTimeStamp.h"
#include "core/dom/DocumentEventQueue.h"
+#include "core/dom/DocumentInit.h"
#include "core/dom/DocumentTiming.h"
#include "core/dom/IconURL.h"
#include "core/dom/MutationObserver.h"
@@ -206,13 +207,13 @@ typedef unsigned char DocumentClassFlags;
class Document : public ContainerNode, public TreeScope, public ScriptExecutionContext {
public:
- static PassRefPtr<Document> create(Frame* frame, const KURL& url)
+ static PassRefPtr<Document> create(const DocumentInit& initializer = DocumentInit())
{
- return adoptRef(new Document(frame, url));
+ return adoptRef(new Document(initializer));
}
- static PassRefPtr<Document> createXHTML(Frame* frame, const KURL& url)
+ static PassRefPtr<Document> createXHTML(const DocumentInit& initializer = DocumentInit())
{
- return adoptRef(new Document(frame, url, XHTMLDocumentClass));
+ return adoptRef(new Document(initializer, XHTMLDocumentClass));
}
virtual ~Document();
@@ -914,6 +915,7 @@ public:
SVGDocumentExtensions* accessSVGExtensions();
void initSecurityContext();
+ void initSecurityContext(const DocumentInit&);
void initContentSecurityPolicy();
void updateURLForPushOrReplaceState(const KURL&);
@@ -1047,7 +1049,7 @@ public:
DocumentLifecycleNotifier* lifecycleNotifier();
protected:
- Document(Frame*, const KURL&, DocumentClassFlags = DefaultDocumentClass);
+ Document(const DocumentInit&, DocumentClassFlags = DefaultDocumentClass);
virtual void didUpdateSecurityOrigin() OVERRIDE;
@@ -1143,6 +1145,7 @@ private:
Frame* m_frame;
DOMWindow* m_domWindow;
+ HTMLImport* m_import;
RefPtr<CachedResourceLoader> m_cachedResourceLoader;
RefPtr<DocumentParser> m_parser;
@@ -1332,7 +1335,6 @@ private:
OwnPtr<TextAutosizer> m_textAutosizer;
RefPtr<CustomElementRegistrationContext> m_registrationContext;
- HTMLImport* m_import;
bool m_scheduledTasksAreSuspended;
« no previous file with comments | « Source/core/dom/DOMImplementation.cpp ('k') | Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698